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

[4.0] 如果租户资源不存在，汇报任务应该转换成remove任务，而非失败

Browse Source
This commit is contained in:
obdev
2022-11-08 09:35:41 +00:00
committed by wangzelin.wzl
parent e7d1b14fca
commit 1b9815163f
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/observer/report/ob_ls_table_updater.cpp
View File

@ -314,7 +314,7 @@ int ObLSTableUpdater::batch_process_tasks(
tenant_id, tenant_id,
ls_id, ls_id,
replica))) { replica))) {
if (OB_LS_NOT_EXIST == ret) { // remove from table if not exist if (OB_LS_NOT_EXIST == ret || OB_TENANT_NOT_IN_SERVER == ret) { // remove from table if not exist
if (OB_FAIL(GCTX.lst_operator_->remove(tenant_id, ls_id, server))) { if (OB_FAIL(GCTX.lst_operator_->remove(tenant_id, ls_id, server))) {
LOG_WARN("fail to remove replica", LOG_WARN("fail to remove replica",
KR(ret), K(tenant_id), K(ls_id), "self_addr", server); KR(ret), K(tenant_id), K(ls_id), "self_addr", server);

4
src/observer/report/ob_tablet_table_updater.cpp
View File

@ -329,7 +329,9 @@ int ObTabletTableUpdater::generate_tasks_(
task->get_tablet_id(), task->get_tablet_id(),
replica, replica,
checksum_item))) { checksum_item))) {
if (OB_TABLET_NOT_EXIST == ret || OB_LS_NOT_EXIST == ret) { if (OB_TABLET_NOT_EXIST == ret
|| OB_LS_NOT_EXIST == ret
|| OB_TENANT_NOT_IN_SERVER == ret) {
ret = OB_SUCCESS; ret = OB_SUCCESS;
// fill primary keys of the replica for removing // fill primary keys of the replica for removing
if (OB_FAIL(replica.init( if (OB_FAIL(replica.init(