commit

Author: KirillKurdyukov

CHANGELOG.md

@@ -1,5 +1,3 @@
-- CommandTimeout is set to 30 seconds by default (as NpgsqlCommand).
-
 ## v0.15.3
 
 - Added SeqNo to `Ydb.Sdk.Services.Topic.Reader.Message`.

src/Ydb.Sdk/src/Ado/YdbCommand.cs

@@ -106,7 +106,7 @@ public override int CommandTimeout
         }
     }
 
-    private int _timeout = 30;
+    private int _timeout;
 
     public override CommandType CommandType { get; set; } = CommandType.Text;
     public override UpdateRowSource UpdatedRowSource { get; set; }

src/Ydb.Sdk/src/DriverConfig.cs

@@ -9,6 +9,8 @@ public class DriverConfig
     public string Database { get; }
     public ICredentialsProvider Credentials { get; }
 
+    public TimeSpan KeepAlivePingDelay { get; set; } = TimeSpan.FromSeconds(10);
+    
     internal X509Certificate2Collection CustomServerCertificates { get; } = new();
     internal TimeSpan EndpointDiscoveryInterval = TimeSpan.FromMinutes(1);
     internal TimeSpan EndpointDiscoveryTimeout = TimeSpan.FromSeconds(10);

src/Ydb.Sdk/src/Pool/ChannelPool.cs

@@ -77,13 +77,15 @@ internal class GrpcChannelFactory : IChannelFactory<GrpcChannel>
 {
     private readonly ILoggerFactory _loggerFactory;
     private readonly ILogger<GrpcChannelFactory> _logger;
-    private readonly X509Certificate2Collection _x509Certificate2Collection;
+    private readonly DriverConfig _config;
+
+    private X509Certificate2Collection ServerCertificates => _config.CustomServerCertificates;
 
     internal GrpcChannelFactory(ILoggerFactory loggerFactory, DriverConfig config)
     {
         _loggerFactory = loggerFactory;
         _logger = loggerFactory.CreateLogger<GrpcChannelFactory>();
-        _x509Certificate2Collection = config.CustomServerCertificates;
+        _config = config;
     }
 
     public GrpcChannel CreateChannel(string endpoint)
@@ -95,15 +97,18 @@ public GrpcChannel CreateChannel(string endpoint)
             LoggerFactory = _loggerFactory
         };
 
-        var httpHandler = new SocketsHttpHandler();
+        var httpHandler = new SocketsHttpHandler
+        {
+            KeepAlivePingDelay = _config.KeepAlivePingDelay
+        };
 
         // https://github.com/grpc/grpc-dotnet/issues/2312#issuecomment-1790661801
         httpHandler.Properties["__GrpcLoadBalancingDisabled"] = true;
 
         channelOptions.HttpHandler = httpHandler;
         channelOptions.DisposeHttpClient = true;
 
-        if (_x509Certificate2Collection.Count == 0)
+        if (ServerCertificates.Count == 0)
         {
             return GrpcChannel.ForAddress(endpoint, channelOptions);
         }
@@ -124,11 +129,11 @@ public GrpcChannel CreateChannel(string endpoint)
                 try
                 {
                     chain.ChainPolicy.VerificationFlags = X509VerificationFlags.AllowUnknownCertificateAuthority;
-                    chain.ChainPolicy.ExtraStore.AddRange(_x509Certificate2Collection);
+                    chain.ChainPolicy.ExtraStore.AddRange(ServerCertificates);
 
-                    return chain.Build(new X509Certificate2(certificate)) && chain.ChainElements.Any(chainElement =>
-                        _x509Certificate2Collection.Any(trustedCert =>
-                            chainElement.Certificate.Thumbprint == trustedCert.Thumbprint));
+                    return chain.Build(new X509Certificate2(certificate))
+                           && chain.ChainElements.Any(chainElement => ServerCertificates.Any(trustedCert =>
+                               chainElement.Certificate.Thumbprint == trustedCert.Thumbprint));
                 }
                 catch (Exception e)
                 {