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

[Fix] update inner sql execute ip addr in sql write

Browse Source
This commit is contained in:
obdev
2023-01-09 08:08:10 +00:00
committed by ob-robot
parent 7995b881c2
commit 45ec90fae4
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/rootserver/ddl_task/ob_index_build_task.cpp
View File

@ -16,6 +16,7 @@
#include "share/schema/ob_multi_version_schema_service.h" #include "share/schema/ob_multi_version_schema_service.h"
#include "share/ob_ddl_checksum.h" #include "share/ob_ddl_checksum.h"
#include "share/ob_ddl_error_message_table_operator.h" #include "share/ob_ddl_error_message_table_operator.h"
#include "share/ob_ddl_common.h"
#include "rootserver/ob_root_service.h" #include "rootserver/ob_root_service.h"
#include "share/scn.h" #include "share/scn.h"
@ -314,11 +315,6 @@ int ObIndexBuildTask::init(
if (ObDDLTaskStatus::VALIDATE_CHECKSUM == task_status) { if (ObDDLTaskStatus::VALIDATE_CHECKSUM == task_status) {
sstable_complete_ts_ = ObTimeUtility::current_time(); sstable_complete_ts_ = ObTimeUtility::current_time();
} }
if (OB_FAIL(ObDDLUtil::get_sys_ls_leader_addr(GCONF.cluster_id, tenant_id_, create_index_arg_.inner_sql_exec_addr_))) {
LOG_WARN("get sys ls leader addr fail", K(ret));
ret = OB_SUCCESS; // ingore ret
}
set_sql_exec_addr(create_index_arg_.inner_sql_exec_addr_); // set to switch_status, if task cancel, we should kill session with inner_sql_exec_addr_
task_id_ = task_id; task_id_ = task_id;
parent_task_id_ = parent_task_id; parent_task_id_ = parent_task_id;
task_version_ = OB_INDEX_BUILD_TASK_VERSION; task_version_ = OB_INDEX_BUILD_TASK_VERSION;
@ -375,7 +371,6 @@ int ObIndexBuildTask::init(const ObDDLTaskRecord &task_record)
ret = OB_TABLE_NOT_EXIST; ret = OB_TABLE_NOT_EXIST;
LOG_WARN("fail to get table schema", K(ret), K(data_schema), K(index_schema)); LOG_WARN("fail to get table schema", K(ret), K(data_schema), K(index_schema));
} else { } else {
set_sql_exec_addr(create_index_arg_.inner_sql_exec_addr_); // set to switch_status, if task cancel, we should kill session with inner_sql_exec_addr_
is_global_index_ = index_schema->is_global_index_table(); is_global_index_ = index_schema->is_global_index_table();
is_unique_index_ = index_schema->is_unique_index(); is_unique_index_ = index_schema->is_unique_index();
tenant_id_ = task_record.tenant_id_; tenant_id_ = task_record.tenant_id_;
@ -684,6 +679,12 @@ int ObIndexBuildTask::send_build_single_replica_request()
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
LOG_WARN("ObIndexBuildTask has not been inited", K(ret)); LOG_WARN("ObIndexBuildTask has not been inited", K(ret));
} else { } else {
if (OB_FAIL(ObDDLUtil::get_sys_ls_leader_addr(GCONF.cluster_id, tenant_id_, create_index_arg_.inner_sql_exec_addr_))) {
LOG_WARN("get sys ls leader addr fail", K(ret), K(tenant_id_));
ret = OB_SUCCESS; // ingore ret
} else {
set_sql_exec_addr(create_index_arg_.inner_sql_exec_addr_); // set to switch_status, if task cancel, we should kill session with inner_sql_exec_addr_
}
const int64_t timeout = OB_MAX_DDL_SINGLE_REPLICA_BUILD_TIMEOUT; const int64_t timeout = OB_MAX_DDL_SINGLE_REPLICA_BUILD_TIMEOUT;
const int64_t abs_timeout_us = ObTimeUtility::current_time() + timeout; const int64_t abs_timeout_us = ObTimeUtility::current_time() + timeout;
ObIndexSSTableBuildTask task( ObIndexSSTableBuildTask task(

12
src/rootserver/ddl_task/ob_table_redefinition_task.cpp
View File

@ -56,10 +56,6 @@ int ObTableRedefinitionTask::init(const uint64_t tenant_id, const int64_t task_i
} else if (OB_FAIL(set_ddl_stmt_str(alter_table_arg_.ddl_stmt_str_))) { } else if (OB_FAIL(set_ddl_stmt_str(alter_table_arg_.ddl_stmt_str_))) {
LOG_WARN("set ddl stmt str failed", K(ret)); LOG_WARN("set ddl stmt str failed", K(ret));
} else { } else {
if (OB_FAIL(ObDDLUtil::get_sys_ls_leader_addr(GCONF.cluster_id, tenant_id, alter_table_arg_.inner_sql_exec_addr_))) {
ret = OB_SUCCESS; // ignore ret
}
set_sql_exec_addr(alter_table_arg_.inner_sql_exec_addr_); // set to switch_status, if task cancel, we should kill session with inner_sql_exec_addr_
task_type_ = ddl_type; task_type_ = ddl_type;
object_id_ = data_table_id; object_id_ = data_table_id;
target_object_id_ = dest_table_id; target_object_id_ = dest_table_id;
@ -99,7 +95,6 @@ int ObTableRedefinitionTask::init(const ObDDLTaskRecord &task_record)
} else if (OB_FAIL(set_ddl_stmt_str(task_record.ddl_stmt_str_))) { } else if (OB_FAIL(set_ddl_stmt_str(task_record.ddl_stmt_str_))) {
LOG_WARN("set ddl stmt str failed", K(ret)); LOG_WARN("set ddl stmt str failed", K(ret));
} else { } else {
set_sql_exec_addr(alter_table_arg_.inner_sql_exec_addr_); // set to ddl_task, switch_status, if task cancel, we should kill session with inner_sql_exec_addr_
task_id_ = task_record.task_id_; task_id_ = task_record.task_id_;
task_type_ = task_record.ddl_type_; task_type_ = task_record.ddl_type_;
object_id_ = data_table_id; object_id_ = data_table_id;
@ -167,6 +162,13 @@ int ObTableRedefinitionTask::send_build_replica_request()
if (!modify_autoinc) { if (!modify_autoinc) {
sql_mode = sql_mode | SMO_NO_AUTO_VALUE_ON_ZERO; sql_mode = sql_mode | SMO_NO_AUTO_VALUE_ON_ZERO;
} }
// get execute inner sql addr
if (OB_FAIL(ObDDLUtil::get_sys_ls_leader_addr(GCONF.cluster_id, tenant_id_, alter_table_arg_.inner_sql_exec_addr_))) {
LOG_WARN("get sys ls leader addr fail", K(ret), K(tenant_id_));
ret = OB_SUCCESS; // ignore ret
} else {
set_sql_exec_addr(alter_table_arg_.inner_sql_exec_addr_); // set to switch_status, if task cancel, we should kill session with inner_sql_exec_addr_
}
ObSchemaGetterGuard schema_guard; ObSchemaGetterGuard schema_guard;
const ObTableSchema *orig_table_schema = nullptr; const ObTableSchema *orig_table_schema = nullptr;
ObDDLRedefinitionSSTableBuildTask task( ObDDLRedefinitionSSTableBuildTask task(