提交 aa849cc0 编写于 作者: O obdev 提交者: wangzelin.wzl

Fix migration copy tablet check tablet meta error

上级 c322a723
...@@ -2106,13 +2106,11 @@ int ObTabletMigrationDag::inner_reset_status_for_retry() ...@@ -2106,13 +2106,11 @@ int ObTabletMigrationDag::inner_reset_status_for_retry()
"ls_id", ctx->arg_.ls_id_.id(), "ls_id", ctx->arg_.ls_id_.id(),
"tablet_id", copy_tablet_ctx_.tablet_id_, "tablet_id", copy_tablet_ctx_.tablet_id_,
"result", result, "retry_count", retry_count); "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_FAIL(ctx->ha_table_info_mgr_.remove_tablet_table_info(copy_tablet_ctx_.tablet_id_))) { if (OB_HASH_NOT_EXIST == ret) {
if (OB_HASH_NOT_EXIST == ret) { ret = OB_SUCCESS;
ret = OB_SUCCESS; } else {
} else { LOG_WARN("failed to remove tablet info", K(ret), KPC(ctx), K(copy_tablet_ctx_));
LOG_WARN("failed to remove tablet info", K(ret), KPC(ctx), K(copy_tablet_ctx_));
}
} }
} }
......
...@@ -1459,8 +1459,8 @@ int ObStorageHATableInfoMgr::check_tablet_table_info_exist( ...@@ -1459,8 +1459,8 @@ int ObStorageHATableInfoMgr::check_tablet_table_info_exist(
} else { } else {
LOG_WARN("failed to get tablet table info mgr", K(ret), K(tablet_id)); LOG_WARN("failed to get tablet table info mgr", K(ret), K(tablet_id));
} }
} else { } else if (OB_FAIL(tablet_table_info_mgr->check_copy_tablet_exist(is_exist))) {
is_exist = true; LOG_WARN("failed to check copy tablet exist", K(ret), K(tablet_id));
} }
} }
return ret; return ret;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册