Merge 803830a into 543218e

iddqdex · web-flow · commit 6f744a090456 · 2024-07-13T15:46:21.000+03:00
diff --git 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() * 1800;
 
         case NKikimrKqp::QUERY_TYPE_SQL_GENERIC_SCRIPT:
             return queryServiceConfig.GetScriptOperationTimeoutDefaultSeconds() 
diff --git a/ydb/core/protos/config.proto b/ydb/core/protos/config.proto
@@ -1014,6 +1014,7 @@ message TQueryServiceConfig {
     optional NYql.TGenericGatewayConfig Generic = 11;
     optional TFinalizeScriptServiceConfig FinalizeScriptServiceConfig = 12;
     optional uint64 ProgressStatsPeriodMs = 14 [default = 0]; // 0 = disabled
+    optional uint32 QueryTimeoutDefaultSeconds = 15 [default = 1800];
 }
 
 // Config describes immediate controls and allows

Original file line number	Diff line number	Diff line change
`@@ -1014,6 +1014,7 @@ message TQueryServiceConfig {`
`1014`	`1014`	`optional NYql.TGenericGatewayConfig Generic = 11;`
`1015`	`1015`	`optional TFinalizeScriptServiceConfig FinalizeScriptServiceConfig = 12;`
`1016`	`1016`	`optional uint64 ProgressStatsPeriodMs = 14 [default = 0]; // 0 = disabled`
	`1017`	`+ optional uint32 QueryTimeoutDefaultSeconds = 15 [default = 1800];`
`1017`	`1018`	`}`
`1018`	`1019`
`1019`	`1020`	`// Config describes immediate controls and allows`