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

fix ret re-assign when using SMART_VAR in ObIndexChecksumValidator/ObCrossClusterChecksumValidator

Browse Source
This commit is contained in:
obdev
2023-01-29 15:53:12 +08:00
committed by ob-robot
parent ab3056c41a
commit 58f42210eb
1 changed files with 201 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -425,12 +425,12 @@ int ObCrossClusterTabletChecksumValidator::check_all_table_verification_finished
} else if (stop) { } else if (stop) {
ret = OB_CANCELED; ret = OB_CANCELED;
LOG_WARN("already stop", KR(ret), K_(tenant_id)); LOG_WARN("already stop", KR(ret), K_(tenant_id));
} } else {
table_count = 0; table_count = 0;
ObSchemaGetterGuard schema_guard; ObSchemaGetterGuard schema_guard;
SMART_VARS_2((ObArray<const ObSimpleTableSchemaV2 *>, table_schemas), SMART_VARS_2((ObArray<const ObSimpleTableSchemaV2 *>, table_schemas),
(ObArray<uint64_t>, table_ids)) { (ObArray<uint64_t>, table_ids)) {
if (FAILEDx(ObMultiVersionSchemaService::get_instance().get_tenant_full_schema_guard( if (OB_FAIL(ObMultiVersionSchemaService::get_instance().get_tenant_full_schema_guard(
tenant_id_, schema_guard))) { tenant_id_, schema_guard))) {
LOG_WARN("fail to get tenant schema guard", KR(ret), K_(tenant_id)); LOG_WARN("fail to get tenant schema guard", KR(ret), K_(tenant_id));
} else if (OB_FAIL(schema_guard.get_table_schemas_in_tenant(tenant_id_, table_schemas))) { } else if (OB_FAIL(schema_guard.get_table_schemas_in_tenant(tenant_id_, table_schemas))) {
@ -521,6 +521,7 @@ int ObCrossClusterTabletChecksumValidator::check_all_table_verification_finished
} }
} }
} }
}
if (OB_CHECKSUM_ERROR == check_ret) { if (OB_CHECKSUM_ERROR == check_ret) {
ret = check_ret; ret = check_ret;
@ -936,12 +937,12 @@ int ObIndexChecksumValidator::check_all_table_verification_finished(
} else if (stop) { } else if (stop) {
ret = OB_CANCELED; ret = OB_CANCELED;
LOG_WARN("already stop", KR(ret), K_(tenant_id)); LOG_WARN("already stop", KR(ret), K_(tenant_id));
} } else {
table_count = 0; table_count = 0;
ObSchemaGetterGuard schema_guard; ObSchemaGetterGuard schema_guard;
SMART_VARS_2((ObArray<const ObSimpleTableSchemaV2 *>, table_schemas), SMART_VARS_2((ObArray<const ObSimpleTableSchemaV2 *>, table_schemas),
(ObArray<uint64_t>, table_ids)) { (ObArray<uint64_t>, table_ids)) {
if (FAILEDx(ObMultiVersionSchemaService::get_instance().get_tenant_full_schema_guard(tenant_id_, schema_guard))) { if (OB_FAIL(ObMultiVersionSchemaService::get_instance().get_tenant_full_schema_guard(tenant_id_, schema_guard))) {
LOG_WARN("fail to get tenant schema guard", KR(ret), K_(tenant_id)); LOG_WARN("fail to get tenant schema guard", KR(ret), K_(tenant_id));
} else if (OB_FAIL(schema_guard.get_table_schemas_in_tenant(tenant_id_, table_schemas))) { } else if (OB_FAIL(schema_guard.get_table_schemas_in_tenant(tenant_id_, table_schemas))) {
LOG_WARN("fail to get tenant table schemas", KR(ret), K_(tenant_id)); LOG_WARN("fail to get tenant table schemas", KR(ret), K_(tenant_id));
@ -1074,6 +1075,7 @@ int ObIndexChecksumValidator::check_all_table_verification_finished(
} }
} }
} }
}
if (OB_CHECKSUM_ERROR == check_ret) { if (OB_CHECKSUM_ERROR == check_ret) {
ret = check_ret; ret = check_ret;