From f7fdef36e3e28047daee83a4e6dd56d707214b56 Mon Sep 17 00:00:00 2001 From: renju96 Date: Thu, 25 Jan 2024 03:12:09 +0000 Subject: [PATCH] set innel_sql query timeout when abort_redef_table --- src/storage/ddl/ob_ddl_server_client.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/storage/ddl/ob_ddl_server_client.cpp b/src/storage/ddl/ob_ddl_server_client.cpp index 521f0e524..f2658debb 100644 --- a/src/storage/ddl/ob_ddl_server_client.cpp +++ b/src/storage/ddl/ob_ddl_server_client.cpp @@ -278,6 +278,9 @@ int ObDDLServerClient::abort_redef_table(const obrpc::ObAbortRedefTableArg &arg, ret = OB_SUCCESS; } if (OB_SUCC(ret)) { + const int64_t origin_timeout_ts = THIS_WORKER.get_timeout_ts(); + int64_t MAX_ABORT_WAIT_TIMEOUT = 60 * 1000 * 1000; //60s + THIS_WORKER.set_timeout_ts(ObTimeUtility::current_time() + MAX_ABORT_WAIT_TIMEOUT); if (OB_FAIL(sql::ObDDLExecutorUtil::wait_ddl_finish(arg.tenant_id_, arg.task_id_, session, common_rpc_proxy))) { if (OB_CANCELED == ret) { ret = OB_SUCCESS; @@ -286,6 +289,7 @@ int ObDDLServerClient::abort_redef_table(const obrpc::ObAbortRedefTableArg &arg, LOG_WARN("wait ddl finish failed", K(ret), K(arg.tenant_id_), K(arg.task_id_)); } } + THIS_WORKER.set_timeout_ts(origin_timeout_ts); } int tmp_ret = OB_SUCCESS; if (OB_TMP_FAIL(heart_beat_clear(arg.task_id_, tenant_id))) {