Skip to content

Commit eaa66fe

Browse files
authored
Propagate deadline in SDK components (#27497)
1 parent d4ba34e commit eaa66fe

File tree

62 files changed

+444
-175
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+444
-175
lines changed

ydb/apps/pgwire/pg_ydb_proxy.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class TPgYdbProxy : public TActor<TPgYdbProxy> {
7272
NYdb::TDbDriverStatePtr driverState = Connections->GetDriverState(database, {}, {}, {}, {});
7373

7474
NYdb::TRpcRequestSettings rpcSettings;
75-
rpcSettings.ClientTimeout = TDuration::Seconds(60);
75+
rpcSettings.Deadline = NYdb::TDeadline::AfterDuration(std::chrono::seconds(60));
7676

7777
NYdb::TGRpcConnectionsImpl::RunOnDiscoveryEndpoint<Ydb::Auth::V1::AuthService, Ydb::Auth::LoginRequest, Ydb::Auth::LoginResponse>(
7878
driverState,

ydb/core/fq/libs/checkpoint_storage/ydb_state_storage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@ TFuture<TStatus> TStateStorage::ListStates(const TContextPtr& context) {
699699
TExecDataQuerySettings TStateStorage::GetExecDataQuerySettings(ui64 multiplier) {
700700
return TExecDataQuerySettings()
701701
.KeepInQueryCache(true)
702-
.ClientTimeout(StorageConfig.GetClientTimeout() * multiplier)
702+
.ClientTimeout(StorageConfig.GetClientTimeout() == TDuration::Max() ? TDuration::Max() : StorageConfig.GetClientTimeout() * multiplier)
703703
.OperationTimeout(StorageConfig.GetOperationTimeout() * multiplier)
704704
.CancelAfter(StorageConfig.GetCancelAfter() * multiplier);
705705
}

ydb/core/fq/libs/ydb/ydb.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,15 @@ TExternalStorageSettings::TExternalStorageSettings(const NConfig::TYdbStorageCon
194194
, UseSsl(config.GetUseSsl())
195195
, UseLocalMetadataService(config.GetUseLocalMetadataService())
196196
, IamEndpoint(config.GetIamEndpoint())
197-
, ClientTimeout(TDuration::Seconds(config.GetClientTimeoutSec()))
198197
, OperationTimeout(TDuration::Seconds(config.GetOperationTimeoutSec()))
199198
, CancelAfter(TDuration::Seconds(config.GetCancelAfterSec()))
200199
{
201200
if (config.GetTableClientMaxActiveSessions()) {
202201
MaxActiveQuerySessions = config.GetTableClientMaxActiveSessions();
203202
}
203+
if (config.GetClientTimeoutSec()) {
204+
ClientTimeout = TDuration::Seconds(config.GetClientTimeoutSec());
205+
}
204206
}
205207

206208
TExternalStorageSettings::TExternalStorageSettings(const NKikimrConfig::TStreamingQueriesConfig::TExternalStorageConfig& config)
@@ -213,13 +215,15 @@ TExternalStorageSettings::TExternalStorageSettings(const NKikimrConfig::TStreami
213215
, UseSsl(config.GetDatabaseConnection().GetUseSsl())
214216
, UseLocalMetadataService(config.GetDatabaseConnection().GetUseLocalMetadataService())
215217
, IamEndpoint(config.GetDatabaseConnection().GetIamEndpoint())
216-
, ClientTimeout(TDuration::Seconds(config.GetQueryTimeoutSec()))
217218
, OperationTimeout(TDuration::Seconds(config.GetQueryTimeoutSec()))
218219
, CancelAfter(TDuration::Seconds(config.GetQueryTimeoutSec()))
219220
{
220221
if (config.GetMaxActiveQuerySessions()) {
221222
MaxActiveQuerySessions = config.GetMaxActiveQuerySessions();
222223
}
224+
if (config.GetQueryTimeoutSec()) {
225+
ClientTimeout = TDuration::Seconds(config.GetQueryTimeoutSec());
226+
}
223227
}
224228

225229
TYdbConnection::TYdbConnection(const TExternalStorageSettings& config,

ydb/core/fq/libs/ydb/ydb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class TExternalStorageSettings {
4242
YDB_ACCESSOR(bool, UseLocalMetadataService, false);
4343
YDB_ACCESSOR_DEF(TString, IamEndpoint);
4444
YDB_ACCESSOR(ui64, MaxActiveQuerySessions, 50); // 50 - default in TSessionPoolSettings
45-
YDB_ACCESSOR_DEF(TDuration, ClientTimeout);
45+
YDB_ACCESSOR(TDuration, ClientTimeout, TDuration::Max());
4646
YDB_ACCESSOR_DEF(TDuration, OperationTimeout);
4747
YDB_ACCESSOR_DEF(TDuration, CancelAfter);
4848
};

ydb/core/grpc_caching/request_data.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace NKikimr {
1212

1313
NYdbGrpc::TCallMeta FillCallMeta() const {
1414
NYdbGrpc::TCallMeta callMeta;
15-
callMeta.Timeout = DEFAULT_CACHED_GRPC_REQUEST_TIMEOUT;
15+
callMeta.Timeout = NYdb::TDeadline::SafeDurationCast(DEFAULT_CACHED_GRPC_REQUEST_TIMEOUT);
1616
callMeta.Aux.emplace_back(REQUEST_ID_METADATA_NAME, RequestId);
1717
return callMeta;
1818
}
@@ -30,7 +30,7 @@ namespace NKikimr {
3030

3131
NYdbGrpc::TCallMeta FillCallMeta() const {
3232
NYdbGrpc::TCallMeta callMeta;
33-
callMeta.Timeout = DEFAULT_CACHED_GRPC_REQUEST_TIMEOUT;
33+
callMeta.Timeout = NYdb::TDeadline::SafeDurationCast(DEFAULT_CACHED_GRPC_REQUEST_TIMEOUT);
3434
callMeta.Aux.emplace_back("authorization", "Bearer " + Ticket);
3535
return callMeta;
3636
}

ydb/core/health_check/health_check.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3843,7 +3843,7 @@ class TNodeCheckRequest : public TActorBootstrapped<TNodeCheckRequest<RequestTyp
38433843
}
38443844
};
38453845
NYdbGrpc::TCallMeta meta;
3846-
meta.Timeout = Timeout;
3846+
meta.Timeout = Timeout ? NYdb::TDeadline::SafeDurationCast(Timeout) : NYdb::TDeadline::Duration::max();
38473847
auto service = GRpcClientLow->CreateGRpcServiceConnection<::Ydb::Monitoring::V1::MonitoringService>(config);
38483848
service->DoRequest(request, std::move(responseCb), &Ydb::Monitoring::V1::MonitoringService::Stub::AsyncNodeCheck, meta);
38493849
}

ydb/core/http_proxy/discovery_actor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ namespace NKikimr::NHttpProxy {
9898

9999
void TDiscoveryActor::MakeGRpcRequest(const TActorContext& ctx) {
100100
NYdbGrpc::TCallMeta callMeta;
101-
callMeta.Timeout = TDuration::Seconds(30);
101+
callMeta.Timeout = std::chrono::seconds(30);
102102
callMeta.Aux.emplace_back("x-ydb-auth-ticket", CredentialsProvider->GetAuthInfo());
103103
callMeta.Aux.emplace_back("x-ydb-database", Settings.Database);
104104

ydb/library/grpc/actor_client/grpc_service_client.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class TGrpcServiceClient {
8686

8787
const TRequestType& request = ev->Get()->Request;
8888
NYdbGrpc::TCallMeta meta;
89-
meta.Timeout = Config.Timeout;
89+
meta.Timeout = Config.Timeout ? NYdb::TDeadline::SafeDurationCast(Config.Timeout) : NYdb::TDeadline::Duration::max();
9090
if (auto token = ev->Get()->Token) {
9191
if (!AsciiHasPrefixIgnoreCase(token, "Bearer "sv)) {
9292
token = "Bearer " + token;

ydb/library/yql/providers/common/token_accessor/client/token_accessor_client.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class TTokenAccessorCredentialsProvider : public NYdb::ICredentialsProvider {
7070
std::move(cb),
7171
&TokenAccessorService::Stub::AsyncGetToken,
7272
{
73-
{}, {}, RequestTimeout
73+
{}, {}, RequestTimeout ? NYdb::TDeadline::SafeDurationCast(RequestTimeout) : NYdb::TDeadline::Duration::max()
7474
},
7575
context.get()
7676
);

ydb/library/yql/providers/dq/global_worker_manager/service_node_pinger.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ class TServiceNodePinger: public TActor<TServiceNodePinger> {
288288
if (!lastPingTime || errors > 1 || oks < 2 || !result.NodeId) {
289289
// GRPC ping
290290
NYdbGrpc::TCallMeta meta;
291-
meta.Timeout = timeout;
291+
meta.Timeout = NYdb::TDeadline::SafeDurationCast(timeout);
292292
result.Connection->DoRequest<Yql::DqsProto::RegisterNodeRequest, Yql::DqsProto::RegisterNodeResponse>(
293293
req, [=] (NYdbGrpc::TGrpcStatus&& status, Yql::DqsProto::RegisterNodeResponse&& resp) {
294294
if (!status.Ok()) {

0 commit comments

Comments
 (0)