diff --git a/src/rootserver/ob_ddl_service.cpp b/src/rootserver/ob_ddl_service.cpp index 56369b04b7..fe2fd9a5fa 100755 --- a/src/rootserver/ob_ddl_service.cpp +++ b/src/rootserver/ob_ddl_service.cpp @@ -16693,6 +16693,8 @@ int ObDDLService::inner_drop_and_create_tablet_(const int64_t &schema_version, } if (OB_SUCC(ret)) { tenant_id = orig_table_schemas.at(0)->get_tenant_id(); + LOG_INFO("start to drop_and_create_tablet", K(tenant_id), K(schema_version), K(orig_table_schemas.at(0)->get_table_id())); + ObTabletDrop tablet_drop(tenant_id, trans, schema_version); // drop tablet if (FAILEDx(tablet_drop.init())) { @@ -25421,7 +25423,7 @@ int ObDDLService::refresh_schema(uint64_t tenant_id, int64_t *publish_schema_ver while (!stopped_) { common::ObTimeoutCtx ctx; if (OB_FAIL(schema_service_->set_timeout_ctx(ctx))) { - LOG_ERROR("fail to set timeout_ctx, refresh schema failed", K(ret)); + LOG_ERROR("fail to set timeout_ctx, refresh schema failed", KR(ret), K(tenant_id)); break; } else { ret = schema_service_->refresh_and_add_schema(tenant_ids); @@ -25439,8 +25441,8 @@ int ObDDLService::refresh_schema(uint64_t tenant_id, int64_t *publish_schema_ver break; } ++refresh_count; - LOG_WARN("refresh schema failed", KR(ret), K(refresh_count), "refresh_schema_interval", - static_cast(REFRESH_SCHEMA_INTERVAL_US)); + LOG_WARN("refresh schema failed", KR(ret), K(tenant_id), K(refresh_count), + "refresh_schema_interval", static_cast(REFRESH_SCHEMA_INTERVAL_US)); if (refresh_count > 2 && REACH_TIME_INTERVAL(10 * 60 * 1000 * 1000L)) { // 10 min LOG_DBA_ERROR(OB_ERR_REFRESH_SCHEMA_TOO_LONG, "msg", "refresh schema failed", KR(ret), K(refresh_count)); diff --git a/src/rootserver/ob_table_creator.cpp b/src/rootserver/ob_table_creator.cpp index 6e35f23acf..b4190631df 100644 --- a/src/rootserver/ob_table_creator.cpp +++ b/src/rootserver/ob_table_creator.cpp @@ -316,14 +316,17 @@ int ObTableCreator::add_create_tablets_of_tables_arg_( } } } - if (OB_SUCC(ret)) { + if (OB_SUCC(ret) && !is_sys_table(table_schema.get_table_id())) { + int64_t start_time = ObTimeUtility::current_time(); int64_t schema_version = table_schema.get_schema_version(); - if (is_sys_table(table_schema.get_table_id())) { - } else if (OB_FAIL(share::ObTabletToTableHistoryOperator::create_tablet_to_table_history( + if (OB_FAIL(share::ObTabletToTableHistoryOperator::create_tablet_to_table_history( trans_, tenant_id_, schema_version, pairs))) { LOG_WARN("fail to create tablet to table history", KR(ret), K_(tenant_id), K(schema_version)); } + int64_t end_time = ObTimeUtility::current_time(); + LOG_INFO("finish create_tablet_to_table_history", KR(ret), K(table_schema.get_tenant_id()), + K(table_schema.get_table_id()), "cost_ts", end_time - start_time); } } return ret; @@ -356,7 +359,6 @@ int ObTableCreator::generate_create_tablet_arg_( } else { data_tablet_id = data_part->get_tablet_id(); } - for (int r = 0; r < schemas.count() && OB_SUCC(ret); r++) { const share::schema::ObTableSchema *table_schema_ptr = schemas.at(r); uint64_t table_id = OB_INVALID_ID; @@ -409,4 +411,3 @@ int ObTableCreator::generate_create_tablet_arg_( } // rootserver } // oceanbase - diff --git a/src/rootserver/ob_tablet_creator.cpp b/src/rootserver/ob_tablet_creator.cpp index cfee927042..70c6541ca3 100644 --- a/src/rootserver/ob_tablet_creator.cpp +++ b/src/rootserver/ob_tablet_creator.cpp @@ -335,7 +335,7 @@ int ObTabletCreator::execute() LOG_WARN("fail to set timeout ctx", KR(ret), K(default_timeout_ts)); } else { do { - LOG_INFO("generate create arg", K(buf_len), K(batch_arg->arg_.tablets_.count()), K(batch_arg->arg_)); + int64_t start_time = ObTimeUtility::current_time(); if (ctx.is_timeouted()) { ret = OB_TIMEOUT; LOG_WARN("already timeout", KR(ret), K(ctx)); @@ -348,6 +348,9 @@ int ObTabletCreator::execute() LOG_WARN("fail to register_tx_data", KR(ret), K(batch_arg->arg_), K(buf), K(buf_len)); } } + int64_t end_time = ObTimeUtility::current_time(); + LOG_INFO("generate create arg", KR(ret), K(buf_len), K(batch_arg->arg_.tablets_.count()), + K(batch_arg->arg_), "cost_ts", end_time - start_time); } while (need_retry(ret)); } batch_arg = batch_arg->next_;