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

[CP] fix ddl_trans_control refresh_schema

Browse Source
This commit is contained in:
obdev
2023-05-30 03:11:58 +00:00
committed by ob-robot
parent 68d79be487
commit 4a22ac03af
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/rootserver/ob_ddl_service.cpp
View File

@ -16590,10 +16590,13 @@ int ObDDLService::new_truncate_table_in_trans(const ObIArray<const ObTableSchema
}
}
if (OB_INVALID_ID != task_id) {
schema_service_->get_ddl_trans_controller().remove_task(task_id);
int tmp_ret = schema_service_->get_ddl_trans_controller().remove_task(task_id);
if (OB_SUCCESS != tmp_ret) {
LOG_WARN("remove_task fail", KR(ret), KR(tmp_ret), K(tenant_id), K(table_id), K(task_id));
}
}
int64_t trans_end = ObTimeUtility::current_time();
LOG_INFO("truncate cost after truncate_in_trans finish", KR(ret), K(task_id),
LOG_INFO("truncate cost after truncate_in_trans finish", KR(ret), K(tenant_id) , K(task_id),
"trans_cost", trans_end - start_time,
"fetch_schema_cost", before_wait_task - before_fetch_schema,
"wait_task_cost", wait_task - before_wait_task,
@ -16886,7 +16889,7 @@ int ObDDLService::new_truncate_table(const obrpc::ObTruncateTableArg &arg,
KR(ret), K(arg.table_name_), K(table_id), K(orig_table_schema.get_schema_version()));
}
int64_t finish_truncate_table = ObTimeUtility::current_time();
LOG_INFO("truncate cost after finish truncate", KR(ret), "cost_ts", finish_truncate_table - start_time);
LOG_INFO("truncate cost after finish truncate", KR(ret), K(tenant_id), K(table_id), "cost_ts", finish_truncate_table - start_time);
}
return ret;
}

5
src/share/schema/ob_ddl_trans_controller.cpp
View File

@ -64,9 +64,9 @@ ObDDLTransController::~ObDDLTransController()
void ObDDLTransController::run1()
{
int ret = OB_SUCCESS;
lib::set_thread_name("DDLTransCtr");
while (!has_set_stop()) {
int ret = OB_SUCCESS;
ObArray<uint64_t> tenant_ids;
{
SpinWLockGuard guard(lock_);
@ -80,6 +80,7 @@ void ObDDLTransController::run1()
}
}
if (OB_SUCC(ret) && tenant_ids.count() > 0) {
LOG_INFO("refresh_schema tenants", K(tenant_ids));
if (OB_ISNULL(GCTX.root_service_)) {
} else {
// ignore ret continue
@ -99,7 +100,7 @@ void ObDDLTransController::run1()
LOG_WARN("fail to broadcast consensus version", KR(ret), K(tenant_id), K(schema_version));
} else {
int64_t end_time = ObTimeUtility::current_time();
LOG_INFO("refresh_schema", KR(ret), K(tenant_id), K(end_time - start_time));
LOG_INFO("refresh_schema", KR(ret), K(tenant_id), K(end_time - start_time), K(schema_version));
}
}
}