hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[CP] 修复因为租户队列积压导致switchover超时

Browse Source
This commit is contained in:
maosy
2023-12-07 07:46:48 +00:00
committed by ob-robot
parent ff9d9e7d54
commit 2c2346010b
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/rootserver/ob_tenant_role_transition_service.cpp
View File

@ -636,6 +636,7 @@ int ObTenantRoleTransitionService::do_switch_access_mode_to_raw_rw(
LOG_WARN("fail to execute get_all_ls_status_and_change_access_mode_", KR(ret), K(tenant_info), LOG_WARN("fail to execute get_all_ls_status_and_change_access_mode_", KR(ret), K(tenant_info),
K(target_access_mode), K(sys_ls_sync_scn)); K(target_access_mode), K(sys_ls_sync_scn));
} }
DEBUG_SYNC(AFTER_CHANGE_ACCESS_MODE);
return ret; return ret;
} }

1
src/share/ob_debug_sync_point.h
View File

@ -553,6 +553,7 @@ class ObString;
ACT(BEFORE_TRANSFER_START_COMMIT,)\ ACT(BEFORE_TRANSFER_START_COMMIT,)\
ACT(STOP_PRIMARY_LS_THREAD,)\ ACT(STOP_PRIMARY_LS_THREAD,)\
ACT(TRANSFER_GET_BACKFILL_TABLETS_BEFORE,)\ ACT(TRANSFER_GET_BACKFILL_TABLETS_BEFORE,)\
ACT(AFTER_CHANGE_ACCESS_MODE,)\
ACT(STOP_LS_RECOVERY_THREAD,)\ ACT(STOP_LS_RECOVERY_THREAD,)\
ACT(BEFORE_FINISH_PRIMARY_ZONE,)\ ACT(BEFORE_FINISH_PRIMARY_ZONE,)\
ACT(BEFORE_FINISH_UNIT_NUM,)\ ACT(BEFORE_FINISH_UNIT_NUM,)\

3
src/share/ob_primary_standby_service.cpp
View File

@ -26,6 +26,7 @@
#include "share/schema/ob_multi_version_schema_service.h" // for GSCHEMASERVICE #include "share/schema/ob_multi_version_schema_service.h" // for GSCHEMASERVICE
#include "share/ob_standby_upgrade.h" // ObStandbyUpgrade #include "share/ob_standby_upgrade.h" // ObStandbyUpgrade
#include "share/ob_global_stat_proxy.h"//ObGlobalStatProxy #include "share/ob_global_stat_proxy.h"//ObGlobalStatProxy
//#include "share/resource_manager/ob_group_list.h"//group id
#include "share/backup/ob_backup_config.h" // ObBackupConfigParserMgr #include "share/backup/ob_backup_config.h" // ObBackupConfigParserMgr
#include "observer/ob_inner_sql_connection.h"//ObInnerSQLConnection #include "observer/ob_inner_sql_connection.h"//ObInnerSQLConnection
#include "storage/tx/ob_trans_service.h" //ObTransService #include "storage/tx/ob_trans_service.h" //ObTransService
@ -447,7 +448,7 @@ int ObPrimaryStandbyService::switch_to_standby(
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
ObAllTenantInfo tenant_info; ObAllTenantInfo tenant_info;
const int32_t group_id = 0; const int32_t group_id = share::OBCG_DBA_COMMAND;
if (OB_FAIL(check_inner_stat_())) { if (OB_FAIL(check_inner_stat_())) {
LOG_WARN("inner stat error", KR(ret), K_(inited)); LOG_WARN("inner stat error", KR(ret), K_(inited));