Skip to content

use sepecific timeout for generic queues #6653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 14, 2024
Merged

use sepecific timeout for generic queues #6653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
803830a
use sepecific timeout for generic queues
iddqdex Jul 13, 2024
8978f4e
fix
iddqdex Jul 13, 2024
32cd47b
fix number
iddqdex Jul 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ydb/core/kqp/common/kqp_timeouts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
1 change: 1 addition & 0 deletions ydb/core/protos/config.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 19 [default = 1800];
}

// Config describes immediate controls and allows
Expand Down