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

[OBCDC] Modify the print log level and optimize create table DDL processing

Browse Source
This commit is contained in:
obdev
2023-06-27 08:42:11 +00:00
committed by ob-robot
parent 6a6deadb47
commit 4c212e743e
6 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/logservice/libobcdc/src/ob_cdc_multi_data_source_info.h
View File

@ -101,6 +101,10 @@ public:
&& (0 == dict_database_metas_.count())
&& (0 == dict_table_metas_.count());
}
bool is_contains_multiple_table_metas() const
{
return dict_table_metas_.count() > 1;
}
int get_new_tenant_scehma_info(
const uint64_t tenant_id,

12
src/logservice/libobcdc/src/ob_log_part_trans_task.cpp
View File

@ -2703,8 +2703,16 @@ int PartTransTask::check_for_ddl_trans(
} else {
op_type = static_cast<ObSchemaOperationType>(ddl_stmt->get_operation_type());
if (OB_DDL_CREATE_TABLE == op_type
|| OB_DDL_TRUNCATE_TABLE == op_type) {
// TODO It refer to the create table DDL as a barrer because the Online DDL may cause the incremental
// data dictionary information containing two tables (such as: the hidden table and original table),
// resulting in incorrect replay of the incremental data dictionary.
if (OB_DDL_CREATE_TABLE == op_type) {
if (get_multi_data_source_info().is_contains_multiple_table_metas()) {
is_not_barrier = false;
} else {
is_not_barrier = true;
}
} else if (OB_DDL_TRUNCATE_TABLE == op_type) {
is_not_barrier = true;
} else {
++other_ddl_count;

21
src/logservice/libobcdc/src/ob_log_schema_incremental_replay.cpp
View File

@ -82,19 +82,19 @@ int ObLogSchemaIncReplay::replay(
K(tenant_count), K(database_count), K(table_count));
if (OB_SUCC(ret) && tenant_count > 0) {
if (OB_FAIL(replay_tenant_metas_(tenant_metas, tenant_info))) {
if (OB_FAIL(replay_tenant_metas_(trans_id, tenant_metas, tenant_info))) {
LOG_ERROR("replay_tenant_metas_ failed", KR(ret), K(tenant_metas), K(tenant_info));
}
}
if (OB_SUCC(ret) && database_count > 0) {
if (OB_FAIL(replay_database_metas_(database_metas, tenant_info))) {
if (OB_FAIL(replay_database_metas_(trans_id, database_metas, tenant_info))) {
LOG_ERROR("replay_database_metas_ failed", KR(ret), K(database_metas), K(tenant_info));
}
}
if (OB_SUCC(ret) && table_count > 0) {
if (OB_FAIL(replay_table_metas_(table_metas, tenant_info))) {
if (OB_FAIL(replay_table_metas_(trans_id, table_metas, tenant_info))) {
LOG_ERROR("replay_table_metas_ failed", KR(ret), K(table_metas), K(tenant_info));
}
}
@ -106,6 +106,7 @@ int ObLogSchemaIncReplay::replay(
}
int ObLogSchemaIncReplay::replay_tenant_metas_(
const transaction::ObTransID &trans_id,
const ObIArray<const datadict::ObDictTenantMeta*> &tenant_metas,
ObDictTenantInfo &tenant_info)
{
@ -115,7 +116,9 @@ int ObLogSchemaIncReplay::replay_tenant_metas_(
ret = OB_NOT_INIT;
LOG_ERROR("ObLogSchemaIncReplay is not initialized", KR(ret));
} else {
ISTAT("replay_tenant_metas begin", "tenant_count", tenant_metas.count(), K(tenant_metas));
const uint64_t tenant_id = tenant_info.get_tenant_id();
ISTAT("replay_tenant_metas begin", K(tenant_id), K(trans_id),
"tenant_count", tenant_metas.count(), K(tenant_metas));
ARRAY_FOREACH_N(tenant_metas, idx, count) {
datadict::ObDictTenantMeta *tenant_meta = const_cast<datadict::ObDictTenantMeta *>(tenant_metas.at(idx));
@ -139,6 +142,7 @@ int ObLogSchemaIncReplay::replay_tenant_metas_(
}
int ObLogSchemaIncReplay::replay_database_metas_(
const transaction::ObTransID &trans_id,
const ObIArray<const datadict::ObDictDatabaseMeta*> &database_metas,
ObDictTenantInfo &tenant_info)
{
@ -148,7 +152,9 @@ int ObLogSchemaIncReplay::replay_database_metas_(
ret = OB_NOT_INIT;
LOG_ERROR("ObLogSchemaIncReplay is not initialized", KR(ret));
} else {
ISTAT("replay_database_metas begin", "database_count", database_metas.count(), K(database_metas));
const uint64_t tenant_id = tenant_info.get_tenant_id();
ISTAT("replay_database_metas begin", K(tenant_id), K(trans_id),
"database_count", database_metas.count(), K(database_metas));
ARRAY_FOREACH_N(database_metas, idx, count) {
const datadict::ObDictDatabaseMeta *database_meta = database_metas.at(idx);
@ -172,6 +178,7 @@ int ObLogSchemaIncReplay::replay_database_metas_(
}
int ObLogSchemaIncReplay::replay_table_metas_(
const transaction::ObTransID &trans_id,
const ObIArray<const datadict::ObDictTableMeta*> &table_metas,
ObDictTenantInfo &tenant_info)
{
@ -181,7 +188,9 @@ int ObLogSchemaIncReplay::replay_table_metas_(
ret = OB_NOT_INIT;
LOG_ERROR("ObLogSchemaIncReplay is not initialized", KR(ret));
} else {
ISTAT("replay_table_metas begin", "table_count", table_metas.count(), K(table_metas));
const uint64_t tenant_id = tenant_info.get_tenant_id();
ISTAT("replay_table_metas begin", K(tenant_id), K(trans_id),
"table_count", table_metas.count(), K(table_metas));
ARRAY_FOREACH_N(table_metas, idx, count) {
const datadict::ObDictTableMeta *table_meta = table_metas.at(idx);

3
src/logservice/libobcdc/src/ob_log_schema_incremental_replay.h
View File

@ -55,14 +55,17 @@ public:
private:
// Replays all the incremental tenant metas information
int replay_tenant_metas_(
const transaction::ObTransID &trans_id,
const ObIArray<const datadict::ObDictTenantMeta*> &tenant_metas,
ObDictTenantInfo &tenant_info);
// Replays all the incremental database metas information
int replay_database_metas_(
const transaction::ObTransID &trans_id,
const ObIArray<const datadict::ObDictDatabaseMeta*> &database_metas,
ObDictTenantInfo &tenant_info);
// Replays all the incremental table metas information
int replay_table_metas_(
const transaction::ObTransID &trans_id,
const ObIArray<const datadict::ObDictTableMeta*> &table_metas,
ObDictTenantInfo &tenant_info);

2
src/logservice/logrouteservice/ob_log_all_svr_cache.cpp
View File

@ -530,7 +530,7 @@ int ObLogAllSvrCache::update_unit_info_cache_()
LOG_WARN("query the GV$OB_UNITS failed, need retry", KR(ret));
ret = OB_SUCCESS;
} else {
LOG_ERROR("query the GV$OB_UNITS failed", KR(ret));
LOG_WARN("query the GV$OB_UNITS failed, will be retried later", KR(ret));
}
} else {
int64_t next_version = cur_version_ + 1;

2
src/logservice/logrouteservice/ob_log_route_service.cpp
View File

@ -1000,7 +1000,7 @@ int ObLogRouteService::query_units_info_and_update_(
LOG_WARN("query the GV$OB_UNITS failed, need retry", KR(ret));
ret = OB_SUCCESS;
} else {
LOG_ERROR("query the GV$OB_UNITS failed", KR(ret));
LOG_WARN("query the GV$OB_UNITS failed, will be retried later", KR(ret));
}
} else {
ObUnitsRecordInfo::ObUnitsRecordArray &units_record_array = units_record_info.get_units_record_array();