* Create CancellationToken in internal CloseAsync method. Thanks @JanEggers

Author: lukebakken

projects/RabbitMQ.Client/IConnectionExtensions.cs

@@ -59,11 +59,10 @@ public static Task CloseAsync(this IConnection connection, ushort reasonCode, st
         /// To wait infinitely for the close operations to complete use <see cref="System.Threading.Timeout.InfiniteTimeSpan"/>.
         /// </para>
         /// </remarks>
-        public static async Task CloseAsync(this IConnection connection, TimeSpan timeout)
+        public static Task CloseAsync(this IConnection connection, TimeSpan timeout)
         {
-            using var cts = new CancellationTokenSource(timeout);
-            await connection.CloseAsync(Constants.ReplySuccess, "Goodbye", timeout, false, cts.Token)
-                .ConfigureAwait(false);
+            return connection.CloseAsync(Constants.ReplySuccess, "Goodbye", timeout, false,
+                CancellationToken.None);
         }
 
         /// <summary>
@@ -83,11 +82,10 @@ await connection.CloseAsync(Constants.ReplySuccess, "Goodbye", timeout, false, c
         /// Operation timeout.
         /// </para>
         /// </remarks>
-        public static async Task CloseAsync(this IConnection connection, ushort reasonCode, string reasonText, TimeSpan timeout)
+        public static Task CloseAsync(this IConnection connection, ushort reasonCode, string reasonText, TimeSpan timeout)
         {
-            using var cts = new CancellationTokenSource(timeout);
-            await connection.CloseAsync(reasonCode, reasonText, timeout, false, cts.Token)
-                .ConfigureAwait(false);
+            return connection.CloseAsync(reasonCode, reasonText, timeout, false,
+                CancellationToken.None);
         }
 
         /// <summary>
@@ -99,12 +97,10 @@ await connection.CloseAsync(reasonCode, reasonText, timeout, false, cts.Token)
         /// <see cref="IOException"/> during closing connection.
         ///This method waits infinitely for the in-progress close operation to complete.
         /// </remarks>
-        public static async Task AbortAsync(this IConnection connection)
+        public static Task AbortAsync(this IConnection connection)
         {
-            using var cts = new CancellationTokenSource(InternalConstants.DefaultConnectionAbortTimeout);
-            await connection.CloseAsync(Constants.ReplySuccess,
-                "Connection close forced", InternalConstants.DefaultConnectionAbortTimeout, true, cts.Token)
-                .ConfigureAwait(false);
+            return connection.CloseAsync(Constants.ReplySuccess, "Connection close forced", InternalConstants.DefaultConnectionAbortTimeout, true,
+                CancellationToken.None);
         }
 
         /// <summary>
@@ -120,12 +116,10 @@ await connection.CloseAsync(Constants.ReplySuccess,
         /// A message indicating the reason for closing the connection
         /// </para>
         /// </remarks>
-        public static async Task AbortAsync(this IConnection connection, ushort reasonCode, string reasonText)
+        public static Task AbortAsync(this IConnection connection, ushort reasonCode, string reasonText)
         {
-            using var cts = new CancellationTokenSource(InternalConstants.DefaultConnectionAbortTimeout);
-            await connection.CloseAsync(reasonCode,
-                reasonText, InternalConstants.DefaultConnectionAbortTimeout, true, cts.Token)
-                .ConfigureAwait(false);
+            return connection.CloseAsync(reasonCode, reasonText, InternalConstants.DefaultConnectionAbortTimeout, true,
+                CancellationToken.None);
         }
 
         /// <summary>
@@ -141,12 +135,10 @@ await connection.CloseAsync(reasonCode,
         /// To wait infinitely for the close operations to complete use <see cref="Timeout.Infinite"/>.
         /// </para>
         /// </remarks>
-        public static async Task AbortAsync(this IConnection connection, TimeSpan timeout)
+        public static Task AbortAsync(this IConnection connection, TimeSpan timeout)
         {
-            using var cts = new CancellationTokenSource(InternalConstants.DefaultConnectionAbortTimeout);
-            await connection.CloseAsync(Constants.ReplySuccess,
-                "Connection close forced", timeout, true, cts.Token)
-                .ConfigureAwait(false);
+            return connection.CloseAsync(Constants.ReplySuccess, "Connection close forced", timeout, true,
+                CancellationToken.None);
         }
 
         /// <summary>
@@ -163,12 +155,10 @@ await connection.CloseAsync(Constants.ReplySuccess,
         /// A message indicating the reason for closing the connection.
         /// </para>
         /// </remarks>
-        public static async Task AbortAsync(this IConnection connection, ushort reasonCode, string reasonText, TimeSpan timeout)
+        public static Task AbortAsync(this IConnection connection, ushort reasonCode, string reasonText, TimeSpan timeout)
         {
-            using var cts = new CancellationTokenSource(InternalConstants.DefaultConnectionAbortTimeout);
-            await connection.CloseAsync(reasonCode,
-                reasonText, timeout, true, cts.Token)
-                .ConfigureAwait(false);
+            return connection.CloseAsync(reasonCode, reasonText, timeout, true,
+                CancellationToken.None);
         }
     }
 }

projects/RabbitMQ.Client/Impl/Connection.cs

@@ -320,6 +320,9 @@ public Task CloseAsync(ushort reasonCode, string reasonText, TimeSpan timeout, b
         ///</remarks>
         internal async Task CloseAsync(ShutdownEventArgs reason, bool abort, TimeSpan timeout, CancellationToken cancellationToken)
         {
+            using var timeoutCts = new CancellationTokenSource(timeout);
+            using var cts = CancellationTokenSource.CreateLinkedTokenSource(timeoutCts.Token, cancellationToken);
+
             if (false == SetCloseReason(reason))
             {
                 // close reason is already set
@@ -332,7 +335,7 @@ internal async Task CloseAsync(ShutdownEventArgs reason, bool abort, TimeSpan ti
             {
                 await OnShutdownAsync(reason)
                     .ConfigureAwait(false);
-                await _session0.SetSessionClosingAsync(false, cancellationToken)
+                await _session0.SetSessionClosingAsync(false, cts.Token)
                     .ConfigureAwait(false);
 
                 try
@@ -341,7 +344,7 @@ await _session0.SetSessionClosingAsync(false, cancellationToken)
                     if (false == _closed)
                     {
                         var method = new ConnectionClose(reason.ReplyCode, reason.ReplyText, 0, 0);
-                        await _session0.TransmitAsync(method, cancellationToken)
+                        await _session0.TransmitAsync(method, cts.Token)
                             .ConfigureAwait(false);
                     }
                 }
@@ -390,14 +393,14 @@ await _session0.TransmitAsync(method, cancellationToken)
 
             try
             {
-                await _mainLoopTask.WaitAsync(timeout, cancellationToken)
+                await _mainLoopTask.WaitAsync(timeout, cts.Token)
                     .ConfigureAwait(false);
             }
             catch
             {
                 try
                 {
-                    await _frameHandler.CloseAsync(cancellationToken)
+                    await _frameHandler.CloseAsync(cts.Token)
                         .ConfigureAwait(false);
                 }
                 catch