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

fix check_table_compaction_finished and handle valid_data_table

Browse Source
This commit is contained in:
obdev
2023-01-13 03:12:05 +00:00
committed by OB-robot
parent 0083c6d39a
commit 18db557942
3 changed files with 73 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/rootserver/freeze/ob_checksum_validator.cpp
View File

@ -490,6 +490,10 @@ int ObIndexChecksumValidator::check_all_table_verification_finished(
}
} // end for loop
if (FAILEDx(check_valid_and_verified_for_data_table(table_schemas, table_compaction_map))) {
LOG_WARN("fail to check valid and verified for data table", KR(ret), K_(tenant_id), K(frozen_scn));
}
// for valid data table, if its all index table finished verification, we can handle it here
// and make it as verified
//
@ -655,7 +659,7 @@ int ObIndexChecksumValidator::check_table_compaction_finished(
}
}
if (OB_SUCC(ret) && !latest_compaction_info.is_compacted()) {
if (OB_SUCC(ret) && latest_compaction_info.is_uncompacted()) {
SMART_VAR(ObArray<ObTabletID>, tablet_ids) {
SMART_VAR(ObArray<ObTabletLSPair>, pairs) {
if (table_schema.has_tablet()) {
@ -749,5 +753,68 @@ bool ObIndexChecksumValidator::exist_in_table_array(
return exist;
}
int ObIndexChecksumValidator::check_valid_and_verified_for_data_table(
const ObIArray<const ObSimpleTableSchemaV2 *> &table_schemas,
hash::ObHashMap<uint64_t, ObTableCompactionInfo> &table_compaction_map)
{
int ret = OB_SUCCESS;
int64_t table_count = table_schemas.count();
// initialize 'is_valid_data_table_' and 'all_index_verifed_'
for (int64_t i = 0; (i < table_count) && OB_SUCC(ret); ++i) {
const ObSimpleTableSchemaV2 *simple_schema = table_schemas.at(i);
uint64_t table_id = 0;
ObTableCompactionInfo table_compaction_info;
if (OB_ISNULL(simple_schema)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected error, simple schema is null", KR(ret), K_(tenant_id));
} else if (FALSE_IT(table_id = simple_schema->get_table_id())) {
} else if (OB_FAIL(table_compaction_map.get_refactored(table_id, table_compaction_info))) {
LOG_WARN("fail to get refactored", KR(ret), K(table_id));
} else {
table_compaction_info.is_valid_data_table_ = false;
table_compaction_info.all_index_verified_ = true;
if (OB_FAIL(table_compaction_map.set_refactored(table_id, table_compaction_info, true/*overwrite*/))) {
LOG_WARN("fail to set refactored", KR(ret), K(table_id), K(table_compaction_info));
}
}
}
// check 'is_valid_data_table_' and 'all_index_verifed_' for data tables according to index tables
for (int64_t i = 0; (i < table_count) && OB_SUCC(ret); ++i) {
const ObSimpleTableSchemaV2 *simple_schema = table_schemas.at(i);
if (OB_ISNULL(simple_schema)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpected error, simple schema is null", KR(ret), K_(tenant_id));
} else if (is_index_table(*simple_schema)) {
const uint64_t index_table_id = simple_schema->get_table_id();
const uint64_t data_table_id = simple_schema->get_data_table_id();
ObTableCompactionInfo index_table_compaction_info;
ObTableCompactionInfo data_table_compaction_info;
if (OB_FAIL(table_compaction_map.get_refactored(index_table_id, index_table_compaction_info))) {
LOG_WARN("fail to get refactored", KR(ret), K(index_table_id));
} else if (OB_FAIL(table_compaction_map.get_refactored(data_table_id, data_table_compaction_info))) {
LOG_WARN("fail to get refactored", KR(ret), K(data_table_id));
} else {
bool need_update = false;
if (!data_table_compaction_info.is_valid_data_table_) {
need_update = true;
data_table_compaction_info.is_valid_data_table_ = true;
}
if (!index_table_compaction_info.is_verified()
&& data_table_compaction_info.all_index_verified_) {
need_update = true;
data_table_compaction_info.all_index_verified_ = false;
}
if (need_update) {
if (OB_FAIL(table_compaction_map.set_refactored(data_table_id, data_table_compaction_info,
true/*overwrite*/))) {
LOG_WARN("fail to set refactored", KR(ret), K(data_table_id), K(data_table_compaction_info));
}
}
}
}
}
return ret;
}
} // end namespace rootserver
} // end namespace oceanbase

3
src/rootserver/freeze/ob_checksum_validator.h
View File

@ -137,6 +137,9 @@ private:
hash::ObHashMap<uint64_t, share::ObTableCompactionInfo> &table_compaction_map);
bool is_index_table(const share::schema::ObSimpleTableSchemaV2 &simple_schema);
bool exist_in_table_array(const uint64_t table_id, const common::ObIArray<uint64_t> &table_ids);
// check 'is_valid_data_table_' and 'all_index_verified_' for all data tables
int check_valid_and_verified_for_data_table(const common::ObIArray<const share::schema::ObSimpleTableSchemaV2 *> &table_schemas,
hash::ObHashMap<uint64_t, share::ObTableCompactionInfo> &table_compaction_map);
};
} // end namespace rootserver

3
src/rootserver/freeze/ob_major_merge_scheduler.cpp
View File

@ -465,7 +465,8 @@ int ObMajorMergeScheduler::update_merge_status(const int64_t expected_epoch)
} else if (OB_FAIL(progress_checker_.check_verification(stop_, global_broadcast_scn, expected_epoch))) {
LOG_WARN("fail to check verification", KR(ret), K_(tenant_id), K(global_broadcast_scn));
int64_t time_interval = 10L * 60 * 1000 * 1000; // record every 10 minutes
if (TC_REACH_TIME_INTERVAL(time_interval)) {
// only record OB_CHECKSUM_ERROR, and thus avoid confusing DBA
if (TC_REACH_TIME_INTERVAL(time_interval) && (OB_CHECKSUM_ERROR == ret)) {
ROOTSERVICE_EVENT_ADD("daily_merge", "verification", K_(tenant_id),
"check verification fail", ret,
"global_broadcast_scn", global_broadcast_scn.get_val_for_inner_table_field(),