From d502913e4b8d1a87ed3ab3eabd0cd48d25f00cbf Mon Sep 17 00:00:00 2001
From: fkuner <784819644@qq.com>
Date: Thu, 20 Jun 2024 13:26:31 +0000
Subject: [PATCH] [CP] [OBCDC] fix create column family failed when adding
 tenant timeout and retry

---
 src/logservice/libobcdc/src/ob_log_tenant.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/logservice/libobcdc/src/ob_log_tenant.cpp b/src/logservice/libobcdc/src/ob_log_tenant.cpp
index 3660737b38..552e03e00b 100644
--- a/src/logservice/libobcdc/src/ob_log_tenant.cpp
+++ b/src/logservice/libobcdc/src/ob_log_tenant.cpp
@@ -96,6 +96,9 @@ int ObLogTenant::init(
     LOG_ERROR("invalid argument", K(tenant_id), K(tenant_name), K(start_tstamp_ns), K(start_seq),
         K(start_schema_version), K(redo_cf_handle));
     ret = OB_INVALID_ARGUMENT;
+  } else if (FALSE_IT(tenant_id_ = tenant_id)) {
+  } else if (FALSE_IT(redo_cf_handle_ = redo_cf_handle)) {
+  } else if (FALSE_IT(lob_storage_cf_handle_ = lob_storage_cf_handle)) {
   } else if (OB_ISNULL(task_queue_ = OB_NEW(ObLogTenantTaskQueue, ObModIds::OB_LOG_TENANT_TASK_QUEUE, *this))) {
     LOG_ERROR("create task queue fail", K(task_queue_));
     ret = OB_ALLOCATE_MEMORY_FAILED;
@@ -120,7 +123,6 @@ int ObLogTenant::init(
   }
 
   if (OB_SUCC(ret)) {
-    tenant_id_ = tenant_id;
     start_schema_version_ = start_schema_version;
 
     // init to NORMAL state
@@ -143,8 +145,6 @@ int ObLogTenant::init(
     committer_global_heartbeat_ = OB_INVALID_VERSION;
     committer_cur_schema_version_ = start_schema_version;
     committer_next_trans_schema_version_ = start_schema_version;
-    redo_cf_handle_ = redo_cf_handle;
-    lob_storage_cf_handle_ = lob_storage_cf_handle;
     lob_storage_clean_task_.tenant_id_ = tenant_id;
 
     inited_ = true;