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

fix prepare tenant during stop archive

Browse Source
This commit is contained in:
wxhwang
2021-11-04 18:00:57 +08:00
committed by LINxiansheng
parent afae65547b
commit fa9b5fdfc0
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
deps/oblib/src/lib/utility/ob_tracepoint.h vendored
View File

@ -445,6 +445,7 @@ public:
EN_BACKUP_UPDATE_START_REPLAY_LOG_TS = 183, EN_BACKUP_UPDATE_START_REPLAY_LOG_TS = 183,
EN_BACKUP_BACKUPSET_DO_SCHEDULE = 184, EN_BACKUP_BACKUPSET_DO_SCHEDULE = 184,
EN_BACKUP_CHECK_BACKUP_POINT_EXIST = 185, EN_BACKUP_CHECK_BACKUP_POINT_EXIST = 185,
EN_STOP_TENANT_LOG_ARCHIVE_BACKUP = 186,
// 下面请从201开始 // 下面请从201开始
EN_CHECK_STANDBY_CLUSTER_SCHEMA_CONDITION = 201, EN_CHECK_STANDBY_CLUSTER_SCHEMA_CONDITION = 201,
EN_ALLOCATE_LOB_BUF_FAILED = 202, EN_ALLOCATE_LOB_BUF_FAILED = 202,

15
src/rootserver/ob_log_archive_scheduler.cpp
View File

@ -1379,6 +1379,12 @@ int ObLogArchiveScheduler::prepare_new_tenant_info_(const share::ObLogArchiveBac
LOG_ERROR("not inited", K(ret)); LOG_ERROR("not inited", K(ret));
} else if (ObLogArchiveStatus::STOP == sys_info.status_.status_) { } else if (ObLogArchiveStatus::STOP == sys_info.status_.status_) {
// do nothing for stop status // do nothing for stop status
} else if (ObLogArchiveStatus::STOPPING == sys_info.status_.status_) {
// do nothing for stopping status
LOG_INFO("no need to prepare new tenant when sys tenant in STOPPING state",
K(sys_info),
K(non_frozen_piece),
K(tenant_ids));
} else { } else {
for (int64_t i = 0; OB_SUCC(ret) && i < tenant_ids.count(); ++i) { for (int64_t i = 0; OB_SUCC(ret) && i < tenant_ids.count(); ++i) {
const uint64_t tenant_id = tenant_ids.at(i); const uint64_t tenant_id = tenant_ids.at(i);
@ -2431,7 +2437,14 @@ int ObLogArchiveScheduler::do_stop_tenant_log_archive_backup_v2_(
const uint64_t tenant_id = cur_key.tenant_id_; const uint64_t tenant_id = cur_key.tenant_id_;
max_ts = -1; max_ts = -1;
if (!is_inited_) { DEBUG_SYNC(BEFROE_DO_STOP_TENANT_ARCHIVE);
#ifdef ERRSIM
ret = E(EventTable::EN_STOP_TENANT_LOG_ARCHIVE_BACKUP) OB_SUCCESS;
#endif
if (OB_FAIL(ret)) {
} else if (!is_inited_) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
LOG_ERROR("not inited", K(ret)); LOG_ERROR("not inited", K(ret));
} else if (OB_FAIL(check_can_do_work_())) { } else if (OB_FAIL(check_can_do_work_())) {

1
src/share/ob_debug_sync_point.h
View File

@ -184,6 +184,7 @@ class ObString;
ACT(BLOCK_FREEZE_INFO_UPDATE, ) \ ACT(BLOCK_FREEZE_INFO_UPDATE, ) \
ACT(BEFROE_DO_ROOT_BACKUP, ) \ ACT(BEFROE_DO_ROOT_BACKUP, ) \
ACT(BEFROE_DO_LOG_ARCHIVE_SCHEDULER, ) \ ACT(BEFROE_DO_LOG_ARCHIVE_SCHEDULER, ) \
ACT(BEFROE_DO_STOP_TENANT_ARCHIVE, ) \
ACT(WRTIE_EXTERN_LOG_ARCHIVE_BACKUP_INFO, ) \ ACT(WRTIE_EXTERN_LOG_ARCHIVE_BACKUP_INFO, ) \
ACT(FAILED_TO_PROCESS_TO_PRIMARY, ) \ ACT(FAILED_TO_PROCESS_TO_PRIMARY, ) \
ACT(BEFORE_REFRESH_CLUSTER_ID, ) \ ACT(BEFORE_REFRESH_CLUSTER_ID, ) \