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

try schedule more tablet

Browse Source
This commit is contained in:
chaser-ch
2023-07-17 11:41:57 +00:00
committed by ob-robot
parent 4110ecf75b
commit a0b5491f27
2 changed files with 52 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,7 @@ int ObTabletMergeChecker::check_need_merge(const ObMergeType merge_type, const O
} else if (!need_merge) {
ret = OB_NO_NEED_MERGE;
LOG_INFO("tablet has no need to merge", K(ret), K(ls_id), K(tablet_id),
"merge_type", merge_type_to_str(merge_type));
"merge_type", merge_type_to_str(merge_type), K(is_empty_shell));
}
}

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

@ -1148,18 +1148,20 @@ int ObTenantTabletScheduler::schedule_ls_medium_merge(
} else if (OB_FAIL(ObTabletMergeChecker::check_need_merge(ObMergeType::MEDIUM_MERGE, *tablet))) {
if (OB_NO_NEED_MERGE != ret) {
LOG_WARN("failed to check need merge", K(ret));
} else {
ret = OB_SUCCESS;
}
} else if (FALSE_IT(tablet_id = tablet->get_tablet_meta().tablet_id_)) {
} else if (tablet_id.is_special_merge_tablet()) { // data tablet
// do nothing
} else if (OB_TMP_FAIL(tablet->fetch_table_store(table_store_wrapper))) {
LOG_WARN("fail to fetch table store", K(tmp_ret));
} else {
++schedule_tablet_cnt; // inc tablet cnt
ObMediumCompactionScheduleFunc func(ls, tablet_handle, weak_read_ts);
ObITable *latest_major = nullptr;
if (OB_FAIL(tablet->fetch_table_store(table_store_wrapper))) {
LOG_WARN("fail to fetch table store", K(ret));
} else if (FALSE_IT(latest_major =
if (FALSE_IT(latest_major =
table_store_wrapper.get_member()->get_major_sstables().get_boundary_table(true/*last*/))) {
} else if (OB_NOT_NULL(latest_major) && latest_major->get_snapshot_version() >= merge_version) {
tablet_merge_finish = true;
@ -1173,6 +1175,8 @@ int ObTenantTabletScheduler::schedule_ls_medium_merge(
}
}
}
if (OB_SUCCESS != tmp_ret) {
} else {
ObArenaAllocator allocator;
const compaction::ObMediumCompactionInfoList *medium_list = nullptr;
LOG_DEBUG("schedule tablet medium", K(ret), K(ls_id), K(tablet_id), K(tablet_merge_finish),
@ -1183,8 +1187,8 @@ int ObTenantTabletScheduler::schedule_ls_medium_merge(
if (!is_leader || OB_ISNULL(latest_major)) {
// follower or no major: do nothing
could_schedule_next_medium = false;
} else if (OB_FAIL(tablet_handle.get_obj()->read_medium_info_list(allocator, medium_list))) {
LOG_WARN("failed to read medium info list", K(ret), K(tablet_id));
} else if (OB_TMP_FAIL(tablet_handle.get_obj()->read_medium_info_list(allocator, medium_list))) {
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));
@ -1225,6 +1229,7 @@ int ObTenantTabletScheduler::schedule_ls_medium_merge(
}
medium_ls_tablet_iter_.update_merge_finish(tablet_merge_finish);
}
}
} // end of while
} // end of RLock allow_schedule_medium_lock_
} // else