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

BugFix about finish_create_tenant_snapshot failed (OB_TIMEOUT)

Browse Source
This commit is contained in:
lalalafeier
2024-01-11 02:12:27 +00:00
committed by ob-robot
parent 9091ffd7a1
commit caeb63f45f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/rootserver/tenant_snapshot/ob_tenant_snapshot_scheduler.cpp
View File

@ -571,7 +571,7 @@ int ObTenantSnapshotScheduler::process_create_tenant_snapshot_(
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid argument", KR(ret), K(create_job)); LOG_WARN("invalid argument", KR(ret), K(create_job));
} else if (cur_time > create_job.get_create_expire_ts()) { } else if (cur_time > create_job.get_create_expire_ts()) {
ret = OB_TIMEOUT; ret = OB_TENANT_SNAPSHOT_TIMEOUT;
LOG_WARN("create tenant snapshot timeout", KR(ret), K(create_job), K(cur_time)); LOG_WARN("create tenant snapshot timeout", KR(ret), K(create_job), K(cur_time));
} else if (OB_ISNULL(sql_proxy_)) { } else if (OB_ISNULL(sql_proxy_)) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
@ -618,7 +618,7 @@ int ObTenantSnapshotScheduler::process_create_tenant_snapshot_(
} }
} }
if (OB_FAIL(ret) && OB_REPLICA_NUM_NOT_ENOUGH != ret) { if (OB_FAIL(ret) && OB_REPLICA_NUM_NOT_ENOUGH != ret && OB_TIMEOUT != ret) {
int tmp_ret = OB_SUCCESS; int tmp_ret = OB_SUCCESS;
// if create_job is not valid, we should not delete the tenant snapshot // if create_job is not valid, we should not delete the tenant snapshot
// because we don't know whether the tenant_snapshot_id it contains is valid // because we don't know whether the tenant_snapshot_id it contains is valid