fix: delete default timeout grpc.deadline (#227)

* fix: delete default timeout grpc.deadline
* Update CHANGELOG.md
* Refactoring publish.sh

Author: KirillKurdyukov

.github/scripts/publish.sh

@@ -12,12 +12,8 @@ LAST_TAG=$(git tag | tail -n 1);
 MAJOR=$(echo $LAST_TAG | sed -E 's/v([0-9]+)\..*/\1/');
 MINOR=$(echo $LAST_TAG | sed -E 's/v[0-9]+\.([0-9]+)\..*/\1/');
 PATCH=$(echo $LAST_TAG | sed -E 's/v[0-9]+\.[0-9]+\.([0-9]+)-rc[0-9]+/\1/');
-RC=0;
+RC=$(git tag | grep "v$MAJOR.$MINOR.$PATCH-rc" | wc -l | xargs || true);
 
-if [ "$RELEASE_CANDIDATE" = true ]
-then
-  RC=$(git tag | grep "v$MAJOR.$MINOR.$PATCH-rc" | wc -l | xargs || true); 
-fi  
 if [ "$VERSION_CHANGE" = "MINOR" ] && [ $RC = 0 ]
 then
   MINOR=$((MINOR+1));

CHANGELOG.md

@@ -1,3 +1,6 @@
+- Writer client for YDB topics
+- Fix: delete default timeout grpc.deadline 
+
 ## v0.9.0-rc1
 - Topic Writer updated release candidate:
   * Do not send messages that have a timeout by cancelToken.

src/Ydb.Sdk/src/Driver.cs

@@ -123,7 +123,7 @@ private async Task<Status> DiscoverEndpoints()
             TransportTimeout = Config.EndpointDiscoveryTimeout
         };
 
-        var options = GetCallOptions(requestSettings, false);
+        var options = GetCallOptions(requestSettings);
         options.Headers.Add(Metadata.RpcSdkInfoHeader, _sdkInfo);
 
         var response = await client.ListEndpointsAsync(

src/Ydb.Sdk/src/DriverConfig.cs

@@ -9,8 +9,6 @@ public class DriverConfig
     public string Database { get; }
     public ICredentialsProvider Credentials { get; }
     public X509Certificate? CustomServerCertificate { get; }
-    public TimeSpan DefaultTransportTimeout { get; }
-    public TimeSpan DefaultStreamingTransportTimeout { get; }
 
     internal TimeSpan EndpointDiscoveryInterval = TimeSpan.FromMinutes(1);
     internal TimeSpan EndpointDiscoveryTimeout = TimeSpan.FromSeconds(10);
@@ -19,15 +17,11 @@ public DriverConfig(
         string endpoint,
         string database,
         ICredentialsProvider? credentials = null,
-        TimeSpan? defaultTransportTimeout = null,
-        TimeSpan? defaultStreamingTransportTimeout = null,
         X509Certificate? customServerCertificate = null)
     {
         Endpoint = FormatEndpoint(endpoint);
         Database = database;
         Credentials = credentials ?? new AnonymousProvider();
-        DefaultTransportTimeout = defaultTransportTimeout ?? TimeSpan.FromMinutes(1);
-        DefaultStreamingTransportTimeout = defaultStreamingTransportTimeout ?? TimeSpan.FromMinutes(10);
         CustomServerCertificate = customServerCertificate;
     }
 

src/Ydb.Sdk/src/GrpcRequestSettings.cs

@@ -9,7 +9,7 @@ public class GrpcRequestSettings
     internal static readonly GrpcRequestSettings DefaultInstance = new();
 
     public string TraceId { get; set; } = string.Empty;
-    public TimeSpan? TransportTimeout { get; set; }
+    public TimeSpan TransportTimeout { get; set; } = TimeSpan.Zero;
     public ImmutableArray<string> CustomClientHeaders { get; } = new();
 
     internal long NodeId { get; set; }

src/Ydb.Sdk/src/IDriver.cs

@@ -69,7 +69,7 @@ public async Task<TResponse> UnaryCall<TRequest, TResponse>(
             using var call = callInvoker.AsyncUnaryCall(
                 method: method,
                 host: null,
-                options: GetCallOptions(settings, false),
+                options: GetCallOptions(settings),
                 request: request
             );
 
@@ -98,7 +98,7 @@ public ServerStream<TResponse> ServerStreamCall<TRequest, TResponse>(
         var call = callInvoker.AsyncServerStreamingCall(
             method: method,
             host: null,
-            options: GetCallOptions(settings, true),
+            options: GetCallOptions(settings),
             request: request);
 
         return new ServerStream<TResponse>(call, e => { OnRpcError(endpoint, e); });
@@ -116,7 +116,7 @@ public IBidirectionalStream<TRequest, TResponse> BidirectionalStreamCall<TReques
         var call = callInvoker.AsyncDuplexStreamingCall(
             method: method,
             host: null,
-            options: GetCallOptions(settings, true));
+            options: GetCallOptions(settings));
 
         return new BidirectionalStream<TRequest, TResponse>(call, e => { OnRpcError(endpoint, e); });
     }
@@ -125,7 +125,7 @@ public IBidirectionalStream<TRequest, TResponse> BidirectionalStreamCall<TReques
 
     protected abstract void OnRpcError(string endpoint, RpcException e);
 
-    protected CallOptions GetCallOptions(GrpcRequestSettings settings, bool streaming)
+    protected CallOptions GetCallOptions(GrpcRequestSettings settings)
     {
         var meta = new Grpc.Core.Metadata
         {
@@ -143,22 +143,13 @@ protected CallOptions GetCallOptions(GrpcRequestSettings settings, bool streamin
             meta.Add(Metadata.RpcTraceIdHeader, settings.TraceId);
         }
 
-        var transportTimeout = streaming
-            ? Config.DefaultStreamingTransportTimeout
-            : Config.DefaultTransportTimeout;
-
-        if (settings.TransportTimeout != null)
-        {
-            transportTimeout = settings.TransportTimeout.Value;
-        }
-
         var options = new CallOptions(
             headers: meta
         );
 
-        if (transportTimeout != TimeSpan.Zero)
+        if (settings.TransportTimeout != TimeSpan.Zero)
         {
-            options = options.WithDeadline(DateTime.UtcNow + transportTimeout);
+            options = options.WithDeadline(DateTime.UtcNow + settings.TransportTimeout);
         }
 
         return options;