From 2cea3df3fb58ab57e470ca705db3731e6a7515ea Mon Sep 17 00:00:00 2001 From: obdev Date: Wed, 20 Sep 2023 15:40:22 +0000 Subject: [PATCH] [CP] fix: job for other tenant cannot be execute when check_new_jobs failed --- src/observer/dbms_scheduler/ob_dbms_sched_job_master.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/observer/dbms_scheduler/ob_dbms_sched_job_master.cpp b/src/observer/dbms_scheduler/ob_dbms_sched_job_master.cpp index 32b4d22f7..f62d1fe28 100644 --- a/src/observer/dbms_scheduler/ob_dbms_sched_job_master.cpp +++ b/src/observer/dbms_scheduler/ob_dbms_sched_job_master.cpp @@ -562,7 +562,7 @@ int ObDBMSSchedJobMaster::check_all_tenants() } else if (OB_FAIL(schema_guard.get_tenant_ids(tenant_ids))) { LOG_WARN("fail to get all tenant ids", K(ret)); } else { - for (int64_t i = 0; OB_SUCC(ret) && i < tenant_ids.count(); ++i) { + for (int64_t i = 0; i < tenant_ids.count(); ++i) { const ObTenantSchema *tenant_schema = NULL; OZ (schema_guard.get_tenant_info(tenant_ids.at(i), tenant_schema)); CK (OB_NOT_NULL(tenant_schema)); @@ -577,6 +577,7 @@ int ObDBMSSchedJobMaster::check_all_tenants() } OZ (check_new_jobs(tenant_ids.at(i), tenant_schema->is_oracle_tenant())); } + ret = OB_SUCCESS; // one tenant failed should not affect other } } LOG_INFO("check all tenants", K(ret));