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

[CP] [OBCDC] fix create column family failed when adding tenant timeout and retry

Browse Source
This commit is contained in:
fkuner
2024-06-20 13:26:31 +00:00
committed by ob-robot
parent 97f10fdb8a
commit d502913e4b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/logservice/libobcdc/src/ob_log_tenant.cpp
View File

@ -96,6 +96,9 @@ int ObLogTenant::init(
LOG_ERROR("invalid argument", K(tenant_id), K(tenant_name), K(start_tstamp_ns), K(start_seq), 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)); K(start_schema_version), K(redo_cf_handle));
ret = OB_INVALID_ARGUMENT; 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))) { } 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_)); LOG_ERROR("create task queue fail", K(task_queue_));
ret = OB_ALLOCATE_MEMORY_FAILED; ret = OB_ALLOCATE_MEMORY_FAILED;
@ -120,7 +123,6 @@ int ObLogTenant::init(
} }
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
tenant_id_ = tenant_id;
start_schema_version_ = start_schema_version; start_schema_version_ = start_schema_version;
// init to NORMAL state // init to NORMAL state
@ -143,8 +145,6 @@ int ObLogTenant::init(
committer_global_heartbeat_ = OB_INVALID_VERSION; committer_global_heartbeat_ = OB_INVALID_VERSION;
committer_cur_schema_version_ = start_schema_version; committer_cur_schema_version_ = start_schema_version;
committer_next_trans_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; lob_storage_clean_task_.tenant_id_ = tenant_id;
inited_ = true; inited_ = true;