From c1f2ab9bdc52bd94b24790842417da8c80a04f05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9E=D0=BB=D0=B5=D0=B3?= <150132506+iddqdex@users.noreply.github.com> Date: Sun, 14 Jul 2024 09:07:10 +0300 Subject: [PATCH] use sepecific timeout for generic queues (#6653) --- ydb/core/kqp/common/kqp_timeouts.cpp | 3 ++- ydb/core/protos/config.proto | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ydb/core/kqp/common/kqp_timeouts.cpp b/ydb/core/kqp/common/kqp_timeouts.cpp index 4389a3e3241d..1a59fbef4d13 100644 --- a/ydb/core/kqp/common/kqp_timeouts.cpp +++ b/ydb/core/kqp/common/kqp_timeouts.cpp @@ -19,9 +19,10 @@ ui64 GetDefaultQueryTimeoutMs(NKikimrKqp::EQueryType queryType, case NKikimrKqp::QUERY_TYPE_SQL_DML: case NKikimrKqp::QUERY_TYPE_PREPARED_DML: case NKikimrKqp::QUERY_TYPE_AST_DML: + return queryLimits.GetDataQueryTimeoutMs(); case NKikimrKqp::QUERY_TYPE_SQL_GENERIC_QUERY: case NKikimrKqp::QUERY_TYPE_SQL_GENERIC_CONCURRENT_QUERY: - return queryLimits.GetDataQueryTimeoutMs(); + return queryServiceConfig.GetQueryTimeoutDefaultSeconds() * 1000; case NKikimrKqp::QUERY_TYPE_SQL_GENERIC_SCRIPT: return queryServiceConfig.GetScriptOperationTimeoutDefaultSeconds() diff --git a/ydb/core/protos/config.proto b/ydb/core/protos/config.proto index b65dc98df68a..0bc491ac5e8e 100644 --- a/ydb/core/protos/config.proto +++ b/ydb/core/protos/config.proto @@ -1024,6 +1024,7 @@ message TQueryServiceConfig { optional NYql.TGenericGatewayConfig Generic = 11; optional TFinalizeScriptServiceConfig FinalizeScriptServiceConfig = 12; optional uint64 ProgressStatsPeriodMs = 14 [default = 0]; // 0 = disabled + optional uint32 QueryTimeoutDefaultSeconds = 19 [default = 1800]; optional bool EnableMatchRecognize = 20 [default = false]; }