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

fix ddl rpc timeout bug

Browse Source
This commit is contained in:
obdev
2023-02-10 09:40:58 +00:00
committed by ob-robot
parent d65939897e
commit 58875bd2b7
13 changed files with 255 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/rootserver/ddl_task/ob_ddl_redefinition_task.cpp
View File

@ -224,6 +224,8 @@ int ObDDLRedefinitionTask::prepare(const ObDDLTaskStatus next_task_status)
int ObDDLRedefinitionTask::lock_table(const ObDDLTaskStatus next_task_status)
{
int ret = OB_SUCCESS;
int64_t rpc_timeout = 0;
int64_t target_rpc_timeout = 0;
ObSchemaGetterGuard schema_guard;
const ObTableSchema *data_table_schema = nullptr;
const ObTableSchema *dest_table_schema = nullptr;
@ -246,8 +248,10 @@ int ObDDLRedefinitionTask::lock_table(const ObDDLTaskStatus next_task_status)
LOG_WARN("table type is different", K(ret), K(data_table_schema->is_tmp_table()), K(dest_table_schema->is_tmp_table()));
} else if (data_table_schema->is_tmp_table()) {
// no need to lock table and unlock table.
} else if (OB_FAIL(ObDDLUtil::get_ddl_rpc_timeout(tenant_id_, object_id_, rpc_timeout))) {
LOG_WARN("get ddl rpc timeout fail", K(ret));
} else if (OB_FAIL(ObTableLockRpcClient::get_instance().lock_table(object_id_,
EXCLUSIVE, schema_version_, 0, tenant_id_))) {
EXCLUSIVE, schema_version_, rpc_timeout, tenant_id_))) {
if (!ObDDLUtil::is_table_lock_retry_ret_code(ret)) {
LOG_WARN("lock source table failed", K(ret), K(object_id_));
} else {
@ -256,8 +260,10 @@ int ObDDLRedefinitionTask::lock_table(const ObDDLTaskStatus next_task_status)
LOG_INFO("cannot lock source table", K(ret), K(object_id_));
}
}
} else if (OB_FAIL(ObDDLUtil::get_ddl_rpc_timeout(tenant_id_, target_object_id_, target_rpc_timeout))) {
LOG_WARN("get ddl rpc timeout fail", K(ret));
} else if (OB_FAIL(ObTableLockRpcClient::get_instance().lock_table(target_object_id_,
EXCLUSIVE, schema_version_, 0, tenant_id_))) {
EXCLUSIVE, schema_version_, target_rpc_timeout, tenant_id_))) {
if (!ObDDLUtil::is_table_lock_retry_ret_code(ret)) {
LOG_WARN("lock dest table failed", K(ret), K(target_object_id_));
} else {
@ -1207,6 +1213,8 @@ int ObDDLRedefinitionTask::finish()
ObSchemaGetterGuard schema_guard;
const ObTableSchema *data_table_schema = nullptr;
ObSArray<uint64_t> objs;
int64_t rpc_timeout = 0;
int64_t all_orig_index_tablet_count = 0;
alter_table_arg_.ddl_task_type_ = share::CLEANUP_GARBAGE_TASK;
alter_table_arg_.table_id_ = object_id_;
alter_table_arg_.hidden_table_id_ = target_object_id_;
@ -1225,8 +1233,12 @@ int ObDDLRedefinitionTask::finish()
LOG_WARN("get schema guard failed", K(ret), K(tenant_id_));
} else if (OB_FAIL(schema_guard.get_table_schema(tenant_id_, object_id_, data_table_schema))) {
LOG_WARN("get data table schema failed", K(ret), K(tenant_id_), K(object_id_));
} else if (OB_FAIL(get_orig_all_index_tablet_count(schema_guard, all_orig_index_tablet_count))) {
LOG_WARN("get orig all tablet count failed", K(ret));
} else if (OB_FAIL(ObDDLUtil::get_ddl_rpc_timeout(max(all_orig_index_tablet_count, data_table_schema->get_all_part_num()), rpc_timeout))) {
LOG_WARN("get ddl rpc timeout failed", K(ret));
} else if (nullptr != data_table_schema && data_table_schema->get_association_table_id() != OB_INVALID_ID &&
OB_FAIL(root_service->get_ddl_service().get_common_rpc()->to(obrpc::ObRpcProxy::myaddr_).timeout(ObDDLUtil::get_ddl_rpc_timeout()).
OB_FAIL(root_service->get_ddl_service().get_common_rpc()->to(obrpc::ObRpcProxy::myaddr_).timeout(rpc_timeout).
execute_ddl_task(alter_table_arg_, objs))) {
LOG_WARN("cleanup garbage failed", K(ret));
} else if (OB_FAIL(cleanup())) {
@ -1366,6 +1378,31 @@ int ObDDLRedefinitionTask::get_estimated_timeout(const ObTableSchema *dst_table_
return ret;
}
int ObDDLRedefinitionTask::get_orig_all_index_tablet_count(ObSchemaGetterGuard &schema_guard, int64_t &all_tablet_count)
{
int ret = OB_SUCCESS;
const ObTableSchema *orig_table_schema = nullptr;
all_tablet_count = 0;
if (OB_FAIL(schema_guard.get_table_schema(tenant_id_, object_id_, orig_table_schema))) {
LOG_WARN("get table schema failed", K(ret), K(tenant_id_), K(object_id_));
} else if (OB_ISNULL(orig_table_schema)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("error unexpected, table schema must not be nullptr", K(ret), K(object_id_));
} else {
const common::ObIArray<ObAuxTableMetaInfo> &orig_index_infos = orig_table_schema->get_simple_index_infos();
for (int64_t i = 0; OB_SUCC(ret) && i < orig_index_infos.count(); i++) {
int64_t tablet_count = 0;
int64_t table_id = orig_index_infos.at(i).table_id_;
if (OB_FAIL(ObDDLUtil::get_tablet_count(tenant_id_, table_id, tablet_count))) {
LOG_WARN("get tablet count fail", K(ret));
} else {
all_tablet_count += tablet_count;
}
}
}
return ret;
}
int ObDDLRedefinitionTask::sync_stats_info()
{
int ret = OB_SUCCESS;
@ -1839,7 +1876,7 @@ int ObDDLRedefinitionTask::check_need_rebuild_constraint(const ObTableSchema &ta
}
}
return ret;
}
}
int ObDDLRedefinitionTask::check_need_check_table_empty(bool &need_check_table_empty)
{
@ -2005,8 +2042,9 @@ template<typename P, typename A>
int ObSyncTabletAutoincSeqCtx::call_and_process_all_tablet_autoinc_seqs(P &proxy, A &arg, const bool is_get)
{
int ret = OB_SUCCESS;
const int64_t rpc_timeout = ObDDLUtil::get_ddl_rpc_timeout();
int64_t rpc_timeout = 0;
const bool force_renew = false;
const int64_t tablet_count = src_tablet_ids_.count();
share::ObLocationService *location_service = nullptr;
ObHashMap<ObLSID, ObSEArray<ObMigrateTabletAutoincSeqParam, 1>> ls_to_tablet_map;
if (OB_ISNULL(location_service = GCTX.location_service_)) {
@ -2014,6 +2052,8 @@ int ObSyncTabletAutoincSeqCtx::call_and_process_all_tablet_autoinc_seqs(P &proxy
LOG_WARN("location_cache is null", K(ret));
} else if (OB_FAIL(ls_to_tablet_map.create(MAP_BUCKET_NUM, "DDLRedefTmp"))) {
LOG_WARN("failed to create map", K(ret));
} else if (OB_FAIL(ObDDLUtil::get_ddl_rpc_timeout(tablet_count, rpc_timeout))) {
LOG_WARN("failed to get ddl rpc timeout", K(ret));
} else {
if (is_get) {
ObSEArray<ObMigrateTabletAutoincSeqParam, 1> tmp_autoinc_params;