Skip to content

Commit 7286db0

Browse files
authored
increase grpc call timeout in TMonitoringGrpcServiceActor (#10734)
1 parent af0d9cd commit 7286db0

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

ydb/core/fq/libs/compute/ydb/control_plane/compute_database_control_plane_service.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,17 +364,21 @@ class TComputeDatabaseControlPlaneServiceActor : public NActors::TActorBootstrap
364364
return settings;
365365
}
366366

367-
static NGrpcActorClient::TGrpcClientSettings CreateGrpcClientSettings(const NConfig::TComputeDatabaseConfig& config) {
367+
static NGrpcActorClient::TGrpcClientSettings CreateGrpcClientSettings(const auto& connection) {
368368
NGrpcActorClient::TGrpcClientSettings settings;
369-
const auto& connection = config.GetControlPlaneConnection();
370369
settings.Endpoint = connection.GetEndpoint();
371370
settings.EnableSsl = connection.GetUseSsl();
372371
if (connection.GetCertificateFile()) {
373372
settings.CertificateRootCA = StripString(TFileInput(connection.GetCertificateFile()).ReadAll());
374373
}
374+
settings.RequestTimeoutMs = 20 * 1000; // todo: read from config
375375
return settings;
376376
}
377377

378+
static NGrpcActorClient::TGrpcClientSettings CreateGrpcClientSettings(const NConfig::TComputeDatabaseConfig& config) {
379+
return CreateGrpcClientSettings(config.GetControlPlaneConnection());
380+
}
381+
378382
void CreateSingleClientActors(const NConfig::TYdbComputeControlPlane::TSingle& singleConfig) {
379383
auto globalLoadConfig = Config.GetYdb().GetLoadControlConfig();
380384
if (globalLoadConfig.GetEnable()) {

ydb/library/grpc/actor_client/grpc_service_client.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ class TGrpcServiceClient {
6363
return mask;
6464
}
6565

66-
static constexpr TDuration DEFAULT_TIMEOUT = TDuration::Seconds(10);
67-
6866
struct TGrpcRequest {
6967
static const google::protobuf::Message& Obfuscate(const google::protobuf::Message& p) {
7068
return p;
@@ -117,7 +115,8 @@ class TGrpcServiceClient {
117115
}
118116

119117
static NYdbGrpc::TGRpcClientConfig InitGrpcConfig(const NGrpcActorClient::TGrpcClientSettings& settings) {
120-
NYdbGrpc::TGRpcClientConfig config(settings.Endpoint, DEFAULT_TIMEOUT, NYdbGrpc::DEFAULT_GRPC_MESSAGE_SIZE_LIMIT, 0, settings.CertificateRootCA);
118+
const TDuration requestTimeout = TDuration::MilliSeconds(settings.RequestTimeoutMs);
119+
NYdbGrpc::TGRpcClientConfig config(settings.Endpoint, requestTimeout, NYdbGrpc::DEFAULT_GRPC_MESSAGE_SIZE_LIMIT, 0, settings.CertificateRootCA);
121120
config.EnableSsl = settings.EnableSsl;
122121
config.IntChannelParams[GRPC_ARG_KEEPALIVE_TIME_MS] = settings.GrpcKeepAliveTimeMs;
123122
config.IntChannelParams[GRPC_ARG_KEEPALIVE_TIMEOUT_MS] = settings.GrpcKeepAliveTimeoutMs;

ydb/library/grpc/actor_client/grpc_service_settings.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ struct TGrpcClientSettings {
1111
ui32 GrpcKeepAliveTimeoutMs = 1000;
1212
ui32 GrpcKeepAlivePingInterval = 5000;
1313
bool EnableSsl = false;
14+
ui64 RequestTimeoutMs = 10000; // 10 seconds
1415
};
1516

1617
} // namespace NGrpcActorClient

0 commit comments

Comments
 (0)