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

[CP] Fix das retry hang when tenant has been deleted

Browse Source
This commit is contained in:
Naynahs
2024-01-22 06:43:05 +00:00
committed by ob-robot
parent 73048f5e21
commit 2dd53c8cef
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/storage/tx_storage/ob_access_service.cpp
View File

@ -540,6 +540,19 @@ int ObAccessService::check_read_allowed_(
} }
} }
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
if (OB_LS_NOT_EXIST == ret) {
int tmp_ret = OB_SUCCESS;
bool is_dropped = false;
schema::ObMultiVersionSchemaService *schema_service = GCTX.schema_service_;
if (OB_ISNULL(schema_service)) {
tmp_ret = OB_ERR_UNEXPECTED;
LOG_WARN("schema_service is nullptr", "tmp_ret", tmp_ret);
} else if (OB_SUCCESS != (tmp_ret = schema_service->check_if_tenant_has_been_dropped(tenant_id_, is_dropped))) {
LOG_WARN("check if tenant has been dropped fail", "tmp_ret", tmp_ret);
} else {
ret = is_dropped ? OB_TENANT_HAS_BEEN_DROPPED : ret;
}
}
} else if (OB_FAIL(construct_store_ctx_other_variables_(*ls, tablet_id, scan_param.timeout_, } else if (OB_FAIL(construct_store_ctx_other_variables_(*ls, tablet_id, scan_param.timeout_,
ctx.mvcc_acc_ctx_.get_snapshot_version(), tablet_handle, ctx_guard))) { ctx.mvcc_acc_ctx_.get_snapshot_version(), tablet_handle, ctx_guard))) {
if (OB_SNAPSHOT_DISCARDED == ret && scan_param.fb_snapshot_.is_valid()) { if (OB_SNAPSHOT_DISCARDED == ret && scan_param.fb_snapshot_.is_valid()) {