From 29bd0b5ee85ebceee8a33c47be847bba6a055ec6 Mon Sep 17 00:00:00 2001
From: SanmuWangZJU <sanmuwang.ws@gmail.com>
Date: Wed, 7 Feb 2024 21:46:12 +0000
Subject: [PATCH] [CP] [OCBDC] Fix obcdc not exit if query data_dict_info
 failed

---
 src/logservice/libobcdc/src/ob_log_instance.cpp          | 2 +-
 src/logservice/libobcdc/src/ob_log_meta_data_service.cpp | 3 ++-
 src/logservice/libobcdc/src/ob_log_systable_helper.cpp   | 2 +-
 src/logservice/libobcdc/src/ob_log_tenant_mgr.cpp        | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/logservice/libobcdc/src/ob_log_instance.cpp b/src/logservice/libobcdc/src/ob_log_instance.cpp
index b79c5fbdd2..bccb887aef 100644
--- a/src/logservice/libobcdc/src/ob_log_instance.cpp
+++ b/src/logservice/libobcdc/src/ob_log_instance.cpp
@@ -1228,7 +1228,7 @@ int ObLogInstance::start_tenant_service_()
       LOG_ERROR("update_data_start_schema_on_split_mode_ fail", KR(ret));
     }
   }
-  LOG_INFO("start_tenant_service_ success", K_(start_tstamp_ns), K_(sys_start_schema_version));
+  LOG_INFO("start_tenant_service_ done", KR(ret), K_(start_tstamp_ns), K_(sys_start_schema_version));
   return ret;
 }
 
diff --git a/src/logservice/libobcdc/src/ob_log_meta_data_service.cpp b/src/logservice/libobcdc/src/ob_log_meta_data_service.cpp
index fa89cb4b40..fd15696326 100644
--- a/src/logservice/libobcdc/src/ob_log_meta_data_service.cpp
+++ b/src/logservice/libobcdc/src/ob_log_meta_data_service.cpp
@@ -381,7 +381,8 @@ int ObLogMetaDataService::get_data_dict_in_log_info_(
       if (OB_SUCC(ret) || done) {
       } else if (OB_ENTRY_NOT_EXIST == ret) {
         done = true;
-        LOG_ERROR("[FATAL][DATA_DICT] Can't find suitable data_dict to launch OBCDC", KR(ret), K(start_timestamp_ns));
+        LOG_ERROR("[FATAL][DATA_DICT] Can't find suitable data_dict to launch OBCDC, please try use online schema(refresh_mode=online && skip_ob_version_compat_check=1)",
+            KR(ret), K(tenant_id), K(start_timestamp_ns));
       } else {
         const static int64_t RETRY_FUNC_PRINT_INTERVAL = 10 * _SEC_;
         const int64_t sleep_usec_on_error = 100 * _MSEC_;
diff --git a/src/logservice/libobcdc/src/ob_log_systable_helper.cpp b/src/logservice/libobcdc/src/ob_log_systable_helper.cpp
index 59fcb65fff..61b4187b89 100644
--- a/src/logservice/libobcdc/src/ob_log_systable_helper.cpp
+++ b/src/logservice/libobcdc/src/ob_log_systable_helper.cpp
@@ -196,7 +196,7 @@ int QueryAllTenantStrategy::build_sql_statement(
       LOG_ERROR("build_sql_statement failed for query all_tenant_info in tenant_sync_mode", KR(ret), K(pos), KCSTRING(sql_buf));
     }
   } else if (OB_FAIL(databuff_printf(sql_buf, mul_statement_buf_len, pos,
-      "SELECT DISTINCT TENANT_ID, TENANT_NAME FROM %s WHERE TENANT_TYPE != 'META'", OB_DBA_OB_TENANTS_TNAME))) {
+      "SELECT DISTINCT TENANT_ID, TENANT_NAME FROM %s WHERE TENANT_TYPE != 'META' AND STATUS = 'NORMAL'", OB_DBA_OB_TENANTS_TNAME))) {
     LOG_ERROR("build_sql_statement failed for query all_tenant_info", KR(ret), K(pos), KCSTRING(sql_buf));
   }
 
diff --git a/src/logservice/libobcdc/src/ob_log_tenant_mgr.cpp b/src/logservice/libobcdc/src/ob_log_tenant_mgr.cpp
index 73a31b1901..b24e05b527 100644
--- a/src/logservice/libobcdc/src/ob_log_tenant_mgr.cpp
+++ b/src/logservice/libobcdc/src/ob_log_tenant_mgr.cpp
@@ -611,7 +611,7 @@ int ObLogTenantMgr::add_tenant(
         ObDictTenantInfoGuard dict_tenant_info_guard;
         ObDictTenantInfo *tenant_info = nullptr;
 
-        if (OB_FAIL(GLOGMETADATASERVICE.get_tenant_info_guard(tenant_id, dict_tenant_info_guard))) {
+        if (FAILEDx(GLOGMETADATASERVICE.get_tenant_info_guard(tenant_id, dict_tenant_info_guard))) {
           LOG_ERROR("get_tenant_info_guard failed", KR(ret), K(tenant_id));
         } else if (OB_ISNULL(tenant_info = dict_tenant_info_guard.get_tenant_info())) {
           ret = OB_ERR_UNEXPECTED;