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

[CP] [OCBDC] Fix obcdc not exit if query data_dict_info failed

Browse Source
This commit is contained in:
SanmuWangZJU
2024-02-07 21:46:12 +00:00
committed by ob-robot
parent bd42abb1c9
commit 29bd0b5ee8
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/logservice/libobcdc/src/ob_log_instance.cpp
View File

@ -1228,7 +1228,7 @@ int ObLogInstance::start_tenant_service_()
LOG_ERROR("update_data_start_schema_on_split_mode_ fail", KR(ret)); 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; return ret;
} }

3
src/logservice/libobcdc/src/ob_log_meta_data_service.cpp
View File

@ -381,7 +381,8 @@ int ObLogMetaDataService::get_data_dict_in_log_info_(
if (OB_SUCC(ret) || done) { if (OB_SUCC(ret) || done) {
} else if (OB_ENTRY_NOT_EXIST == ret) { } else if (OB_ENTRY_NOT_EXIST == ret) {
done = true; 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 { } else {
const static int64_t RETRY_FUNC_PRINT_INTERVAL = 10 * _SEC_; const static int64_t RETRY_FUNC_PRINT_INTERVAL = 10 * _SEC_;
const int64_t sleep_usec_on_error = 100 * _MSEC_; const int64_t sleep_usec_on_error = 100 * _MSEC_;

2
src/logservice/libobcdc/src/ob_log_systable_helper.cpp
View File

@ -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)); 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, } 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)); LOG_ERROR("build_sql_statement failed for query all_tenant_info", KR(ret), K(pos), KCSTRING(sql_buf));
} }

2
src/logservice/libobcdc/src/ob_log_tenant_mgr.cpp
View File

@ -611,7 +611,7 @@ int ObLogTenantMgr::add_tenant(
ObDictTenantInfoGuard dict_tenant_info_guard; ObDictTenantInfoGuard dict_tenant_info_guard;
ObDictTenantInfo *tenant_info = nullptr; 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)); 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())) { } else if (OB_ISNULL(tenant_info = dict_tenant_info_guard.get_tenant_info())) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;