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

fix schedule wrong for standby tenant

Browse Source
This commit is contained in:
obdev 2023-02-13 12:12:17 +00:00 committed by ob-robot
parent f13943fc42
commit 331b873fb3
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/storage/compaction/ob_medium_compaction_func.cpp
View File

@ -830,6 +830,7 @@ int ObMediumCompactionScheduleFunc::schedule_tablet_medium_merge(
LOG_DEBUG("schedule_tablet_medium_merge", K(schedule_scn), K(major_frozen_snapshot), K(schedule_with_memtable), K(ls_id), K(tablet_id));
if (0 == schedule_scn
&& 0 == tablet.get_medium_compaction_info_list().size() // serialized medium list is empty
&& schedule_with_memtable
&& OB_FAIL(get_schedule_medium_from_memtable(tablet, major_frozen_snapshot, schedule_scn, compaction_type))) {
LOG_WARN("failed to get schedule medium scn from memtables", K(ret));

21
src/storage/compaction/ob_medium_compaction_mgr.cpp
View File

@ -467,17 +467,16 @@ int ObMediumCompactionInfoList::get_specified_scn_info(
} else if (OB_UNLIKELY(snapshot <= 0)) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid argument", K(ret), K(snapshot));
} else if (snapshot <= get_max_medium_snapshot()) {
const ObMediumCompactionInfo *cur_info = nullptr;
DLIST_FOREACH_X(info, medium_info_list_, OB_SUCC(ret)) {
cur_info = static_cast<const ObMediumCompactionInfo *>(info);
if (OB_UNLIKELY(!info->is_valid())) {
ret = OB_ERR_UNEXPECTED;
LOG_ERROR("invalid medium info", K(ret), KPC(info));
} else if (snapshot == cur_info->medium_snapshot_) {
ret_info = cur_info;
break;
}
} else if (snapshot <= get_max_medium_snapshot() && medium_info_list_.get_size() > 0) {
const ObMediumCompactionInfo *first_info = static_cast<const ObMediumCompactionInfo *>(medium_info_list_.get_first());
if (OB_UNLIKELY(!first_info->is_valid())) {
ret = OB_ERR_UNEXPECTED;
LOG_ERROR("invalid medium info", K(ret), KPC(first_info));
} else if (OB_UNLIKELY(first_info->medium_snapshot_ < snapshot)) {
ret = OB_ERR_UNEXPECTED;
LOG_ERROR("exist medium info which may not scheduled", K(ret), KPC(first_info), K(snapshot));
} else if (first_info->medium_snapshot_ == snapshot) {
ret_info = first_info;
}
}
if (OB_SUCC(ret) && nullptr == ret_info) {