Add a bufferred timeout in transport initiator.

Azure · Apr 10, 2023 · 8cc962e · 8cc962e
1 parent 83dcc6d
commit 8cc962e
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/Microsoft.Azure.Amqp/Amqp/Transport/AmqpTransportInitiator.cs b/Microsoft.Azure.Amqp/Amqp/Transport/AmqpTransportInitiator.cs
@@ -254,12 +254,14 @@ void Complete(TransportAsyncCallbackArgs args)
 
         sealed class ConnectAsyncResult : TimeoutAsyncResult<string>
         {
+            // Inner initiator may also have a timer, so don't compete with them.
+            const int BufferedTimeInTicks = 5000 * 10000;
             static Action<TransportAsyncCallbackArgs> onConnect = OnConnect;
             readonly AmqpTransportInitiator initiator;
             readonly TransportAsyncCallbackArgs args;
 
             public ConnectAsyncResult(AmqpTransportInitiator initiator, TimeSpan timeout, CancellationToken cancellationToken, AsyncCallback callback, object state)
-                : base(timeout, cancellationToken, callback, state)
+                : base(GetBufferedTimeout(timeout), cancellationToken, callback, state)
             {
                 this.initiator = initiator;
                 this.args = new TransportAsyncCallbackArgs();
@@ -302,6 +304,16 @@ protected override void CompleteOnTimer()
                 base.CompleteOnTimer();
             }
 
+            static TimeSpan GetBufferedTimeout(TimeSpan timeout)
+            {
+                if (timeout.Ticks < TimeSpan.MaxValue.Ticks - BufferedTimeInTicks)
+                {
+                    return TimeSpan.FromTicks(timeout.Ticks + BufferedTimeInTicks);
+                }
+
+                return TimeSpan.MaxValue;
+            }
+
             static void OnConnect(TransportAsyncCallbackArgs args)
             {
                 ConnectAsyncResult thisPtr = (ConnectAsyncResult)args.UserToken;