fix restore_service:create_tenant_end timeout

This commit is contained in:
maosy 2023-07-20 08:18:07 +00:00 committed by ob-robot
parent dbbf1403a7
commit ea2a1f8862

View File

@ -1441,7 +1441,7 @@ int ObRestoreService::restore_wait_tenant_finish(const share::ObPhysicalRestoreJ
LOG_WARN("tenant schema is null", K(ret), K(tenant_id));
} else if (tenant_schema->is_restore_tenant_status() || tenant_schema->is_normal()) {
if (tenant_schema->is_restore_tenant_status()) {
const int64_t DEFAULT_TIMEOUT = 10 * 1000 * 1000L;
const int64_t DEFAULT_TIMEOUT = GCONF.internal_sql_execute_timeout;
// try finish restore status
obrpc::ObCreateTenantEndArg arg;
arg.tenant_id_ = tenant_id;
@ -1450,7 +1450,7 @@ int ObRestoreService::restore_wait_tenant_finish(const share::ObPhysicalRestoreJ
LOG_WARN("restore scheduler stopped", K(ret));
} else if (OB_FAIL(rpc_proxy_->timeout(DEFAULT_TIMEOUT)
.create_tenant_end(arg))) {
LOG_WARN("fail to create tenant end", K(ret), K(arg));
LOG_WARN("fail to create tenant end", K(ret), K(arg), K(DEFAULT_TIMEOUT));
}
}
if (OB_SUCC(ret)) {