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

fix inaccurate defense when save multi source data

Browse Source
This commit is contained in:
obdev
2023-02-07 11:00:30 +08:00
committed by ob-robot
parent bc4490783f
commit a00aaf9999
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -253,6 +253,7 @@ int ObMediumCompactionScheduleFunc::schedule_next_medium_primary_cluster(
if (OB_FAIL(get_status_from_inner_table(ret_info))) {
LOG_WARN("failed to get status from inner tablet", K(ret), KPC(this));
} else if (ret_info.could_schedule_next_round(last_major->get_snapshot_version())) {
LOG_INFO("success to check RS major checksum validation finished", K(ret), KPC(this), K(ret_info));
ret = decide_medium_snapshot(is_major);
}
} else {

25
src/storage/memtable/ob_multi_source_data.h
View File

@ -193,20 +193,21 @@ int ObMultiSourceData::save_multi_source_data_unit_in_list(const T *const src, b
T *dst = nullptr;
const int64_t list_pos = get_unit_list_array_idx((int64_t)src->type());
if (!is_callback) { // first save
if (unit_list_array_[list_pos].get_size() > 0
&& OB_UNLIKELY(src->get_version() < unit_list_array_[list_pos].get_last()->get_version())) {
ret = OB_ERR_UNEXPECTED;
TRANS_LOG(WARN, "unexpected order", K(ret), K(list_pos), K(units_[list_pos]), KPC(dst));
} else {
if (OB_FAIL(deep_copy_data_unit(src, dst, allocator_))) {
TRANS_LOG(WARN, "failed to deep copy unit", K(ret), K(list_pos), KPC(src));
} else if (!unit_list_array_[list_pos].add_last(dst)) {
ret = common::OB_ERR_UNEXPECTED;
TRANS_LOG(WARN, "failed to add last", K(ret), K(list_pos), K(unit_list_array_[list_pos]));
} else if (src->is_save_last() && src->is_sync_finish()) {
(void)inner_release_rest_unit_data(list_pos, src->get_version());
if (unit_list_array_[list_pos].get_size() > 0) {
const ObIMultiSourceDataUnit *last_data_unit = unit_list_array_[list_pos].get_last();
if (OB_UNLIKELY(last_data_unit->is_sync_finish() && src->get_version() < last_data_unit->get_version())) {
ret = OB_ERR_UNEXPECTED;
TRANS_LOG(WARN, "unexpected order", K(ret), K(list_pos), KPC(last_data_unit), KPC(src));
}
}
if (FAILEDx(deep_copy_data_unit(src, dst, allocator_))) {
TRANS_LOG(WARN, "failed to deep copy unit", K(ret), K(list_pos), KPC(src));
} else if (!unit_list_array_[list_pos].add_last(dst)) {
ret = common::OB_ERR_UNEXPECTED;
TRANS_LOG(WARN, "failed to add last", K(ret), K(list_pos), K(unit_list_array_[list_pos]));
} else if (src->is_save_last() && src->is_sync_finish()) {
(void)inner_release_rest_unit_data(list_pos, src->get_version());
}
} else if (src->is_sync_finish()
&& OB_FAIL(inner_mark_unit_sync_finish(list_pos, src->get_version(), src->is_save_last()))) { // mark finish
TRANS_LOG(WARN, "failed to makr unit sync finish", K(ret), K(list_pos), KPC(src));