From b8786dbb30b6eb373e45d9a261840b5845b5670a Mon Sep 17 00:00:00 2001 From: Hongqin-Li Date: Thu, 12 Jan 2023 03:42:03 +0000 Subject: [PATCH] Fix inner sql transmit timeout --- src/observer/ob_inner_sql_connection.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/observer/ob_inner_sql_connection.cpp b/src/observer/ob_inner_sql_connection.cpp index 0bfa1a0399..7412aea99a 100644 --- a/src/observer/ob_inner_sql_connection.cpp +++ b/src/observer/ob_inner_sql_connection.cpp @@ -1293,9 +1293,8 @@ int ObInnerSQLConnection::forward_request_(const uint64_t tenant_id, ret = OB_ERR_UNEXPECTED; LOG_WARN("resource_conn_id or resource_svr is invalid", K(ret), K(tenant_id), K(get_resource_conn_id()), K(get_resource_svr())); - } else if (OB_FAIL(get_session().get_query_timeout(query_timeout)) - || OB_FAIL(get_session().get_tx_timeout(trx_timeout))) { - LOG_WARN("get conn timeout failed", KR(ret), K(get_session())); + } else if (OB_FAIL(get_session_timeout_for_rpc(query_timeout, trx_timeout))) { + LOG_WARN("fail to get_session_timeout_for_rpc", K(ret), K(query_timeout), K(trx_timeout)); } else { ObInnerSQLTransmitArg arg(MYADDR, get_resource_svr(), tenant_id, get_resource_conn_id(), sql, (ObInnerSQLTransmitArg::InnerSQLOperationType)op_type,