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

fix remote scan inner sql timeout.

Browse Source
This commit is contained in:
obdev
2023-09-09 13:12:43 +00:00
committed by ob-robot
parent 576917492e
commit 2718e8df84
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/storage/ddl/ob_complement_data_task.cpp
View File

@ -2162,10 +2162,11 @@ int ObRemoteScan::prepare_iter(const ObSqlString &sql_string, common::ObCommonSq
session_param.ddl_info_.set_is_ddl(true); session_param.ddl_info_.set_is_ddl(true);
session_param.ddl_info_.set_source_table_hidden(false); session_param.ddl_info_.set_source_table_hidden(false);
session_param.ddl_info_.set_dest_table_hidden(false); session_param.ddl_info_.set_dest_table_hidden(false);
const int64_t sql_total_timeout = max(7 * 24 * 60 * 60 * 1000 * 1000L, GCONF._ob_ddl_timeout);
if (OB_ISNULL(sql_proxy)) { if (OB_ISNULL(sql_proxy)) {
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid arg", K(ret)); LOG_WARN("invalid arg", K(ret));
} else if (OB_FAIL(sql_proxy->read(res_, tenant_id_, sql_string.ptr(), &session_param))) { } else if (OB_FAIL(sql_proxy->read(res_, tenant_id_, sql_string.ptr(), &session_param, sql_total_timeout))) {
LOG_WARN("fail to execute sql", K(ret), K_(tenant_id), K(sql_string)); LOG_WARN("fail to execute sql", K(ret), K_(tenant_id), K(sql_string));
} else if (OB_ISNULL(result_ = res_.get_result())) { } else if (OB_ISNULL(result_ = res_.get_result())) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;