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

fix ObSSTableDumpErrorInfo memleak when checksum error

Browse Source
This commit is contained in:
lx0
2022-03-21 14:35:30 +08:00
committed by LINxiansheng
parent 17fabd983a
commit ea76dae8e4
4 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/share/parameter/ob_parameter_seed.ipp
View File

@ -950,6 +950,10 @@ DEF_INT(minor_freeze_times, OB_CLUSTER_PARAMETER, "100", "[0, 65535]",
ObParameterAttr(Section::TENANT, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
DEF_INT(minor_compact_trigger, OB_CLUSTER_PARAMETER, "2", "[0,16]", "minor_compact_trigger, Range: [0,16] in integer",
ObParameterAttr(Section::TENANT, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
DEF_BOOL(_enable_compaction_diagnose, OB_CLUSTER_PARAMETER, "False",
"enable compaction diagnose function"
"Value: True:turned on; False: turned off",
ObParameterAttr(Section::OBSERVER, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
DEF_CAP(_private_buffer_size, OB_CLUSTER_PARAMETER, "2M",
"[0B,)"
"the trigger remaining data size within transaction for immediate logging, 0B represents not trigger immediate "

4
src/storage/compaction/ob_partition_merge_util.cpp
View File

@ -1726,7 +1726,9 @@ int ObPartitionMergeUtil::merge_partition(memtable::ObIMemtableCtxFactory* memct
K(ret),
K(partition_fuser->get_compact_type()),
K(*partition_fuser->get_result_row()));
ObTableDumper::print_error_info(ret, ctx, macro_row_iters);
if (GCONF._enable_compaction_diagnose) {
ObTableDumper::print_error_info(ret, ctx, macro_row_iters);
}
} else if (OB_FAIL(partition_fuser->calc_column_checksum(false))) {
LOG_WARN("Failed to calculate column checksum", K(ret));
}

2
src/storage/ob_partition_storage.cpp
View File

@ -7691,7 +7691,7 @@ int ObPartitionStorage::validate_sstables(
} else if (OB_FAIL(validate_sstable(row_count, index_table, column_checksum_map))) {
if (OB_ERR_PRIMARY_KEY_DUPLICATE == ret) {
handle_error_index_table(*index_table, index_stats, ret);
if (OB_ERR_PRIMARY_KEY_DUPLICATE == ret) {
if (OB_ERR_PRIMARY_KEY_DUPLICATE == ret && GCONF._enable_compaction_diagnose) {
dump_error_info(*main_sstable, *index_table);
}
} else {

10
src/storage/ob_sstable_dump_error_info.cpp
View File

@ -228,8 +228,18 @@ int ObSSTableDumpErrorInfo::find_extra_row(
STORAGE_LOG(WARN, "failed to check row", K(ret));
}
++iter_row_cnt;
if (nullptr != getter) {
allocator_.free(getter);
getter = nullptr;
}
} // end of while
}
if (nullptr != scanner) {
allocator_.free(scanner);
scanner = nullptr;
}
if (OB_SUCC(ret)) {
if (found_row_cnt + sstable2.get_meta().row_count_ != sstable1.get_meta().row_count_) {
ret = OB_ERR_UNEXPECTED;