diff --git a/src/rootserver/ddl_task/ob_index_build_task.cpp b/src/rootserver/ddl_task/ob_index_build_task.cpp index 7c9064fd31..f98d8f0bbc 100755 --- a/src/rootserver/ddl_task/ob_index_build_task.cpp +++ b/src/rootserver/ddl_task/ob_index_build_task.cpp @@ -1238,7 +1238,8 @@ int ObIndexBuildTask::update_index_status_in_schema(const ObTableSchema &index_s } DEBUG_SYNC(BEFORE_UPDATE_GLOBAL_INDEX_STATUS); - if (OB_FAIL(ObDDLUtil::get_ddl_rpc_timeout(index_schema.get_all_part_num(), ddl_rpc_timeout))) { + if (OB_FAIL(ret)) { + } else if (OB_FAIL(ObDDLUtil::get_ddl_rpc_timeout(index_schema.get_all_part_num(), ddl_rpc_timeout))) { LOG_WARN("get ddl rpc timeout fail", K(ret)); } else if (OB_FAIL(ObDDLUtil::get_ddl_rpc_timeout(tenant_id_, index_schema.get_data_table_id(), tmp_timeout))) { LOG_WARN("get ddl rpc timeout fail", K(ret)); diff --git a/src/rootserver/ob_ddl_service.cpp b/src/rootserver/ob_ddl_service.cpp index dfdaea7c04..c4ad2a3c66 100755 --- a/src/rootserver/ob_ddl_service.cpp +++ b/src/rootserver/ob_ddl_service.cpp @@ -17380,9 +17380,6 @@ int ObDDLService::make_recover_restore_tables_visible(obrpc::ObAlterTableArg &al } else if (OB_FAIL(check_and_replace_dup_constraint_name_on_demand(is_oracle_mode, *dst_tenant_schema_guard, tmp_schema, allocator, ddl_operator, trans))) { LOG_WARN("check dup and replace cst name failed", K(ret)); - } else if (OB_FAIL(rebuild_hidden_table_foreign_key(alter_table_arg, - *orig_table_schema, *hidden_table_schema, true/*rebuild_child_table_fk*/, *src_tenant_schema_guard, *dst_tenant_schema_guard, trans, unused_cst_ids))) { - LOG_WARN("failed to rebuild hidden table fk", K(ret)); } else if (OB_FAIL(rebuild_triggers_on_hidden_table(*orig_table_schema, *hidden_table_schema, *src_tenant_schema_guard, *dst_tenant_schema_guard, ddl_operator, trans))) { LOG_WARN("rebuild triggers failed", K(ret));