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

[CP] fix mini merge scheduling when sstable count is not safe in tablet

Browse Source
This commit is contained in:
Fengjingkun 2023-09-21 09:44:34 +00:00 committed by ob-robot
parent a69698b5ce
commit 03d4c3e84b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/storage/compaction/ob_partition_merge_policy.cpp
View File

@ -160,7 +160,7 @@ int ObPartitionMergePolicy::get_medium_merge_tables(
bool ObPartitionMergePolicy::is_sstable_count_not_safe(const int64_t minor_table_cnt)
{
return minor_table_cnt >= MAX_SSTABLE_CNT_IN_STORAGE;
return minor_table_cnt + 1 /*major_sstable*/ >= MAX_SSTABLE_CNT_IN_STORAGE;
}
int ObPartitionMergePolicy::get_mini_merge_tables(

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

@ -141,7 +141,7 @@ void ObTenantTabletScheduler::MediumLoopTask::runTimerTask()
int ret = OB_SUCCESS;
int64_t cost_ts = ObTimeUtility::fast_current_time();
ObCurTraceId::init(GCONF.self_addr_);
if (!ObServerCheckpointSlogHandler::get_instance().is_started()) {
if (OB_UNLIKELY(!ObServerCheckpointSlogHandler::get_instance().is_started())) {
if (REACH_TIME_INTERVAL(10 * 1000 * 1000 /* 10s */)) {
LOG_WARN("slog replay hasn't finished, this task can't start", K(ret));
}
@ -1396,7 +1396,7 @@ int ObTenantTabletScheduler::schedule_tablet_medium(
LOG_WARN("failed to read medium info list", K(tmp_ret), K(tablet_id));
} else if (medium_list->need_check_finish()) { // need check finished
if (OB_TMP_FAIL(func.check_medium_finish(ls_locality))) {
LOG_WARN("failed to check medium finish", K(tmp_ret), K(ls_id), K(tablet_id));
LOG_WARN("failed to check medium finish", K(tmp_ret), K(ls_id), K(tablet_id), KPC(medium_list));
} else if (FALSE_IT(check_medium_finish = true)) {
} else if (FALSE_IT(func.get_tablet_handle(new_handle))) {
} else if (ObTimeUtility::current_time_ns()