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

fix defense for release force freeze empty memtable

Browse Source
This commit is contained in:
yangqise7en
2023-06-28 04:42:12 +00:00
committed by ob-robot
parent 0939933e62
commit 57295e2ebc
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/storage/compaction/ob_tablet_merge_ctx.cpp
View File

@ -870,14 +870,14 @@ int ObTabletMergeCtx::update_tablet_or_release_memtable(const ObGetMergeTablesRe
LOG_WARN("storage schema is unexpected null", K(ret), KPC(this));
} else if (OB_FAIL(old_tablet->load_storage_schema(temp_allocator, schema_on_tablet))) {
LOG_WARN("failed to load storage schema", K(ret), KPC(old_tablet));
} else if (OB_UNLIKELY(schema_on_tablet->compare_schema_newer(*schema_ctx_.storage_schema_))) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("schema on memtable is newer", K(ret), K(schema_ctx_.storage_schema_), KPC(schema_on_tablet));
} else if (OB_UNLIKELY(get_merge_table_result.scn_range_.end_scn_ > old_tablet->get_tablet_meta().clog_checkpoint_scn_)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("can't have larger end_log_ts", K(ret), K(get_merge_table_result), K(old_tablet->get_tablet_meta()));
} else if (get_merge_table_result.version_range_.snapshot_version_ > old_tablet->get_snapshot_version()) {
} else if (get_merge_table_result.version_range_.snapshot_version_ > old_tablet->get_snapshot_version()
|| schema_on_tablet->compare_schema_newer(*schema_ctx_.storage_schema_)) {
// need write slog to update snapshot_version on tablet_meta
// if schema on memtable is newer, need update into tablet
// (written rows are rolled back on leader, no logging, end_scn won't be updated)
update_table_store_flag = true;
}

2
src/storage/memtable/ob_memtable.cpp
View File

@ -2305,7 +2305,7 @@ int ObMemtable::get_schema_info(
if (IS_NOT_INIT) {
ret = OB_NOT_INIT;
TRANS_LOG(WARN, "not inited", K(ret));
} else if (get_max_column_cnt() > input_column_cnt) {
} else if (get_max_column_cnt() >= input_column_cnt) {
TRANS_LOG(INFO, "column cnt or schema version is updated by memtable", KPC(this),
K(max_column_cnt_on_memtable), K(max_schema_version_on_memtable));
max_column_cnt_on_memtable = MAX(max_column_cnt_on_memtable, get_max_column_cnt());