Merge e0977da into 7d2c257

ydb-platform · Oct 22, 2024 · a8f8989 · a8f8989
2 parents 7d2c257 + e0977da
commit a8f8989
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/ydb/core/fq/libs/compute/ydb/control_plane/compute_database_control_plane_service.cpp b/ydb/core/fq/libs/compute/ydb/control_plane/compute_database_control_plane_service.cpp
@@ -364,17 +364,21 @@ class TComputeDatabaseControlPlaneServiceActor : public NActors::TActorBootstrap
         return settings;
     }
 
-    static NGrpcActorClient::TGrpcClientSettings CreateGrpcClientSettings(const NConfig::TComputeDatabaseConfig& config) {
+    static NGrpcActorClient::TGrpcClientSettings CreateGrpcClientSettings(const auto& connection) {
         NGrpcActorClient::TGrpcClientSettings settings;
-        const auto& connection = config.GetControlPlaneConnection();
         settings.Endpoint = connection.GetEndpoint();
         settings.EnableSsl = connection.GetUseSsl();
         if (connection.GetCertificateFile()) {
             settings.CertificateRootCA = StripString(TFileInput(connection.GetCertificateFile()).ReadAll());
         }
+        settings.RequestTimeoutMs = 20 * 1000; // todo: read from config
         return settings;
     }
 
+    static NGrpcActorClient::TGrpcClientSettings CreateGrpcClientSettings(const NConfig::TComputeDatabaseConfig& config) {
+        return CreateGrpcClientSettings(config.GetControlPlaneConnection());
+    }
+
     void CreateSingleClientActors(const NConfig::TYdbComputeControlPlane::TSingle& singleConfig) {
         auto globalLoadConfig = Config.GetYdb().GetLoadControlConfig();
         if (globalLoadConfig.GetEnable()) {

diff --git a/ydb/library/grpc/actor_client/grpc_service_client.h b/ydb/library/grpc/actor_client/grpc_service_client.h
@@ -117,7 +117,8 @@ class TGrpcServiceClient  {
     }
 
     static NYdbGrpc::TGRpcClientConfig InitGrpcConfig(const NGrpcActorClient::TGrpcClientSettings& settings) {
-        NYdbGrpc::TGRpcClientConfig config(settings.Endpoint, DEFAULT_TIMEOUT, NYdbGrpc::DEFAULT_GRPC_MESSAGE_SIZE_LIMIT, 0, settings.CertificateRootCA);
+        const TDuration effectiveTimeout = settings.RequestTimeoutMs ? TDuration::Milliseconds(settings.RequestTimeoutMs) : DEFAULT_TIMEOUT;
+        NYdbGrpc::TGRpcClientConfig config(settings.Endpoint, effectiveTimeout, NYdbGrpc::DEFAULT_GRPC_MESSAGE_SIZE_LIMIT, 0, settings.CertificateRootCA);
         config.EnableSsl = settings.EnableSsl;
         config.IntChannelParams[GRPC_ARG_KEEPALIVE_TIME_MS] = settings.GrpcKeepAliveTimeMs;
         config.IntChannelParams[GRPC_ARG_KEEPALIVE_TIMEOUT_MS] = settings.GrpcKeepAliveTimeoutMs;

diff --git a/ydb/library/grpc/actor_client/grpc_service_settings.h b/ydb/library/grpc/actor_client/grpc_service_settings.h
@@ -11,6 +11,7 @@ struct TGrpcClientSettings {
     ui32 GrpcKeepAliveTimeoutMs = 1000;
     ui32 GrpcKeepAlivePingInterval = 5000;
     bool EnableSsl = false;
+    ui64 RequestTimeoutMs = 0; // zero means 10 seconds
 };
 
 } // namespace NGrpcActorClient