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

fix report_scn_flag

Browse Source
This commit is contained in:
a1iive
2023-08-28 06:44:14 +00:00
committed by ob-robot
parent 4ae562ef25
commit ab7ee2bbd8
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/storage/compaction/ob_tenant_tablet_scheduler.cpp
View File

@ -1449,9 +1449,6 @@ int ObTenantTabletScheduler::schedule_all_tablets_medium()
}
}
if (REACH_TENANT_TIME_INTERVAL(CHECK_REPORT_SCN_INTERVAL)) {
medium_ls_tablet_iter_.set_report_scn_flag();
}
if (REACH_TENANT_TIME_INTERVAL(CHECK_LS_LOCALITY_INTERVAL)) {
if (OB_TMP_FAIL(ls_locality_cache_.refresh_ls_locality())) {
LOG_WARN("failed to refresh ls locality", K(tmp_ret));
@ -1459,9 +1456,6 @@ int ObTenantTabletScheduler::schedule_all_tablets_medium()
ObSuspectInfoType::SUSPECT_FAILED_TO_REFRESH_LS_LOCALITY, tmp_ret);
}
}
#ifdef ERRSIM
medium_ls_tablet_iter_.set_report_scn_flag();
#endif
while (OB_SUCC(ret)) {
if (OB_FAIL(medium_ls_tablet_iter_.get_next_ls(ls_handle))) {
@ -1494,6 +1488,7 @@ int ObTenantTabletScheduler::schedule_all_tablets_medium()
LOG_INFO("try to update report scn as ls leader", K(tmp_ret), "ls_id", ls->get_ls_id()); // low printing frequency
#endif
}
LOG_TRACE("finish schedule ls medium merge", K(tmp_ret), K(ret), K_(medium_ls_tablet_iter), "ls_id", ls->get_ls_id());
} // end while
if (!medium_ls_tablet_iter_.tenant_merge_finish()) { // wait major compaction
@ -1639,6 +1634,13 @@ int ObCompactionScheduleIterator::build_iter()
ls_tablet_svr_ = nullptr;
schedule_tablet_cnt_ = 0;
report_scn_flag_ = false;
// check every time start loop all tablet
if (REACH_TENANT_TIME_INTERVAL(CHECK_REPORT_SCN_INTERVAL)) {
report_scn_flag_ = true;
}
#ifdef ERRSIM
report_scn_flag_ = true;
#endif
LOG_TRACE("build iter", K(ret), KPC(this));
}
} else { // iter is invalid, no need to build, just set var to start cur batch
@ -1759,7 +1761,8 @@ int64_t ObCompactionScheduleIterator::to_string(char *buf, const int64_t buf_len
{
int64_t pos = 0;
J_OBJ_START();
J_KV(K_(ls_idx), K_(ls_ids), K_(tablet_idx), K(tablet_ids_.count()), K_(schedule_tablet_cnt), K_(max_batch_tablet_cnt));
J_KV(K_(ls_idx), K_(ls_ids), K_(tablet_idx), K(tablet_ids_.count()), K_(schedule_tablet_cnt), K_(max_batch_tablet_cnt),
K_(report_scn_flag));
if (is_valid()) {
J_COMMA();
J_KV("cur_ls", ls_ids_.at(ls_idx_));

2
src/storage/compaction/ob_tenant_tablet_scheduler.h
View File

@ -115,6 +115,7 @@ private:
static const int64_t LS_ID_ARRAY_CNT = 10;
static const int64_t TABLET_ID_ARRAY_CNT = 2000;
static const int64_t SCHEDULE_TABLET_BATCH_CNT = 50 * 1000L; // 5w
static const int64_t CHECK_REPORT_SCN_INTERVAL = 5 * 60 * 1000 * 1000L; // 600s
ObLSGetMod mod_;
bool is_major_;
@ -364,7 +365,6 @@ private:
static const int64_t SSTABLE_GC_INTERVAL = 30 * 1000 * 1000L; // 30s
static const int64_t INFO_POOL_RESIZE_INTERVAL = 30 * 1000 * 1000L; // 30s
static const int64_t DEFAULT_COMPACTION_SCHEDULE_INTERVAL = 30 * 1000 * 1000L; // 30s
static const int64_t CHECK_REPORT_SCN_INTERVAL = 5 * 60 * 1000 * 1000L; // 600s
static const int64_t ADD_LOOP_EVENT_INTERVAL = 120 * 1000 * 1000L; // 120s
static const int64_t WAIT_MEDIUM_CHECK_THRESHOLD = 10 * 60 * 1000 * 1000 * 1000L; // 10m // ns
static const int64_t PRINT_LOG_INVERVAL = 2 * 60 * 1000 * 1000L; // 2m