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

fix rs progress & table_ids defense when 4013

Browse Source
This commit is contained in:
obdev
2024-02-09 05:35:27 +00:00
committed by ob-robot
parent b58a0a8d0c
commit ee9eb195ba
11 changed files with 50 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/rootserver/freeze/ob_major_merge_progress_checker.cpp
View File

@ -412,8 +412,13 @@ void ObMajorMergeProgressChecker::deal_with_unfinish_table_ids(
}
}
if (OB_FAIL(ret)) {
} else if (assgin_flag && OB_FAIL(table_ids_.assign(unfinish_table_id_array))) {
LOG_WARN("failed to assign table ids", KR(ret), K(unfinish_table_id_array));
} else if (assgin_flag) {
int64_t retry_times = 0;
do {
if (OB_FAIL(table_ids_.assign(unfinish_table_id_array))) {
LOG_WARN("failed to assign table ids", KR(ret), K(unfinish_table_id_array));
}
} while (OB_ALLOCATE_MEMORY_FAILED == ret && (++retry_times < ASSGIN_FAILURE_RETRY_TIMES));
}
}
@ -470,7 +475,7 @@ int ObMajorMergeProgressChecker::check_index_and_rest_table()
LOG_WARN("deal with rest data table", KR(ret), K_(compaction_scn));
} else if (progress_.is_merge_finished()) {
LOG_INFO("progress is check finished", KR(ret), K_(progress));
} else if (progress_.only_remain_special_table_to_verified()) {
} else if (progress_.only_remain_special_table_to_verified() || table_ids_.empty()) {
bool finish_validate = false;
#ifdef ERRSIM
ret = OB_E(EventTable::EN_RS_CHECK_SPECIAL_TABLE) ret;
@ -485,10 +490,6 @@ int ObMajorMergeProgressChecker::check_index_and_rest_table()
} else if (finish_validate) {
progress_.deal_with_special_tablet();
}
} else if (table_ids_.empty()) {
// DEBUG LOG
ret = OB_ERR_UNEXPECTED;
LOG_WARN("cnt in progress is not equal to table_ids", KR(ret), K(table_ids_), K(progress_));
}
(void) ckm_validator_.batch_update_report_scn();
(void) ckm_validator_.batch_write_tablet_ckm();

1
src/rootserver/freeze/ob_major_merge_progress_checker.h
View File

@ -125,6 +125,7 @@ private:
static const int64_t PRINT_LOG_INTERVAL = 2 * 60 * 1000 * 1000; // 2m
static const int64_t DEAL_REST_TABLE_CNT_THRESHOLD = 100;
static const int64_t DEAL_REST_TABLE_INTERVAL = 10 * 60 * 1000 * 1000L; // 10m
static const int64_t ASSGIN_FAILURE_RETRY_TIMES = 10;
private:
bool is_inited_;
bool first_loop_in_cur_round_;