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

Fix migration copy tablet check tablet meta error

Browse Source
This commit is contained in:
obdev
2022-10-31 04:05:13 +00:00
committed by wangzelin.wzl
parent c322a723e6
commit aa849cc001
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/storage/high_availability/ob_ls_migration.cpp
View File

@ -2106,13 +2106,11 @@ int ObTabletMigrationDag::inner_reset_status_for_retry()
"ls_id", ctx->arg_.ls_id_.id(),
"tablet_id", copy_tablet_ctx_.tablet_id_,
"result", result, "retry_count", retry_count);
if (OB_SSTABLE_NOT_EXIST == result) {
if (OB_FAIL(ctx->ha_table_info_mgr_.remove_tablet_table_info(copy_tablet_ctx_.tablet_id_))) {
if (OB_HASH_NOT_EXIST == ret) {
ret = OB_SUCCESS;
} else {
LOG_WARN("failed to remove tablet info", K(ret), KPC(ctx), K(copy_tablet_ctx_));
}
if (OB_FAIL(ctx->ha_table_info_mgr_.remove_tablet_table_info(copy_tablet_ctx_.tablet_id_))) {
if (OB_HASH_NOT_EXIST == ret) {
ret = OB_SUCCESS;
} else {
LOG_WARN("failed to remove tablet info", K(ret), KPC(ctx), K(copy_tablet_ctx_));
}
}

4
src/storage/high_availability/ob_storage_ha_tablet_builder.cpp
View File

@ -1459,8 +1459,8 @@ int ObStorageHATableInfoMgr::check_tablet_table_info_exist(
} else {
LOG_WARN("failed to get tablet table info mgr", K(ret), K(tablet_id));
}
} else {
is_exist = true;
} else if (OB_FAIL(tablet_table_info_mgr->check_copy_tablet_exist(is_exist))) {
LOG_WARN("failed to check copy tablet exist", K(ret), K(tablet_id));
}
}
return ret;