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

[CP] fix cancel recover table hang after aux tenant has been dropped

Browse Source
This commit is contained in:
wxhwang
2024-02-09 03:45:07 +00:00
committed by ob-robot
parent b06ffa075e
commit fd83ae3db9
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/rootserver/restore/ob_import_table_job_scheduler.cpp
View File

@ -121,7 +121,10 @@ int ObImportTableJobScheduler::check_compatible_() const
int ObImportTableJobScheduler::process_(share::ObImportTableJob &job) int ObImportTableJobScheduler::process_(share::ObImportTableJob &job)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
if (OB_FAIL(wait_src_tenant_schema_refreshed_(job.get_src_tenant_id()))) { bool is_dropped = false;
if (OB_FAIL(schema_service_->check_if_tenant_has_been_dropped(job.get_src_tenant_id(), is_dropped))) {
LOG_WARN("failed to check if tenant has been dropped", K(ret), "tenant_id", job.get_src_tenant_id());
} else if (!is_dropped && OB_FAIL(wait_src_tenant_schema_refreshed_(job.get_src_tenant_id()))) {
if (OB_SCHEMA_EAGAIN != ret) { if (OB_SCHEMA_EAGAIN != ret) {
LOG_WARN("failed to wait src tenant schema refreshed", K(ret), K(job)); LOG_WARN("failed to wait src tenant schema refreshed", K(ret), K(job));
} }