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

[CP] fix pull memtables after migration

Browse Source
This commit is contained in:
obdev
2022-11-30 07:37:55 +00:00
committed by ob-robot
parent 1d2d78744e
commit c930616622
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,7 +145,7 @@ int ObPartitionMergePolicy::find_mini_merge_tables(
// can only take out all frozen memtable // can only take out all frozen memtable
ObIMemtable *memtable = nullptr; ObIMemtable *memtable = nullptr;
const ObTabletID &tablet_id = tablet.get_tablet_meta().tablet_id_; const ObTabletID &tablet_id = tablet.get_tablet_meta().tablet_id_;
bool contain_force_freeze_memtable = false; bool need_update_snapshot_version = false;
for (int64_t i = 0; OB_SUCC(ret) && i < memtable_handles.count(); ++i) { for (int64_t i = 0; OB_SUCC(ret) && i < memtable_handles.count(); ++i) {
if (OB_ISNULL(memtable = static_cast<ObIMemtable *>(memtable_handles.at(i).get_table()))) { if (OB_ISNULL(memtable = static_cast<ObIMemtable *>(memtable_handles.at(i).get_table()))) {
ret = OB_ERR_SYS; ret = OB_ERR_SYS;
@ -158,9 +158,8 @@ int ObPartitionMergePolicy::find_mini_merge_tables(
break; break;
} else if (memtable->get_end_scn() <= clog_checkpoint_scn) { } else if (memtable->get_end_scn() <= clog_checkpoint_scn) {
if (!tablet_id.is_special_merge_tablet() && if (!tablet_id.is_special_merge_tablet() &&
static_cast<ObMemtable *>(memtable)->get_is_force_freeze() &&
memtable->get_snapshot_version() > tablet.get_tablet_meta().snapshot_version_) { memtable->get_snapshot_version() > tablet.get_tablet_meta().snapshot_version_) {
contain_force_freeze_memtable = true; need_update_snapshot_version = true;
} else { } else {
LOG_DEBUG("memtable wait to release", K(param), KPC(memtable)); LOG_DEBUG("memtable wait to release", K(param), KPC(memtable));
continue; continue;
@ -199,7 +198,7 @@ int ObPartitionMergePolicy::find_mini_merge_tables(
if (result.handle_.empty()) { if (result.handle_.empty()) {
ret = OB_NO_NEED_MERGE; ret = OB_NO_NEED_MERGE;
} else if (result.scn_range_.end_scn_ <= clog_checkpoint_scn) { } else if (result.scn_range_.end_scn_ <= clog_checkpoint_scn) {
if (contain_force_freeze_memtable) { if (need_update_snapshot_version) {
result.update_tablet_directly_ = true; result.update_tablet_directly_ = true;
LOG_INFO("meet empty force freeze memtable, could update tablet directly", K(ret), K(result)); LOG_INFO("meet empty force freeze memtable, could update tablet directly", K(ret), K(result));
} else { } else {