Added UnitTest that exposes hanging dispose on a blocked connection

Added TimeOut to Abort call to prevent waiting forever in Dispose Upped timeout to 15 seconds to prevent false positives
rabbitmq · Feb 25, 2022 · 23f6613 · 23f6613
1 parent 39a9f2b
commit 23f6613
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.cs b/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.cs
@@ -216,7 +216,7 @@ public void Dispose()
 
             try
             {
-                this.Abort();
+                this.Abort(TimeSpan.FromSeconds(15));
             }
             catch (Exception)
             {

diff --git a/projects/RabbitMQ.Client/client/impl/Connection.cs b/projects/RabbitMQ.Client/client/impl/Connection.cs
@@ -42,7 +42,7 @@
 
 namespace RabbitMQ.Client.Framing.Impl
 {
-    #nullable enable
+#nullable enable
     internal sealed partial class Connection : IConnection
     {
         private bool _disposed;
@@ -410,7 +410,7 @@ public void Dispose()
 
             try
             {
-                this.Abort();
+                this.Abort(TimeSpan.FromSeconds(15));
                 _mainLoopTask.Wait();
             }
             catch (OperationInterruptedException)

diff --git a/projects/Unit/TestConnectionBlocked.cs b/projects/Unit/TestConnectionBlocked.cs
@@ -31,7 +31,7 @@
 
 using System;
 using System.Threading;
-
+using System.Threading.Tasks;
 using RabbitMQ.Client.Events;
 
 using Xunit;
@@ -42,6 +42,7 @@ namespace RabbitMQ.Client.Unit
     [Collection("NoParallelization")]
     public class TestConnectionBlocked : IntegrationFixture
     {
+        private readonly ManualResetEventSlim _connDisposed = new ManualResetEventSlim(false);
         private readonly object _lockObject = new object();
         private bool _notified;
 
@@ -68,6 +69,7 @@ protected override void ReleaseResources()
         [Fact]
         public void TestConnectionBlockedNotification()
         {
+            _notified = false;
             _conn.ConnectionBlocked += HandleBlocked;
             _conn.ConnectionUnblocked += HandleUnblocked;
 
@@ -85,5 +87,25 @@ public void TestConnectionBlockedNotification()
                 Assert.True(false, "Unblock notification not received.");
             }
         }
+
+        [Fact]
+        public void TestDisposeOnBlockedConnectionDoesNotHang()
+        {
+            _notified = false;
+            Block();
+            Task.Factory.StartNew(DisposeConnection);
+
+            if (!_connDisposed.Wait(TimeSpan.FromSeconds(20)))
+            {
+                Unblock();
+                Assert.True(false, "Dispose must have finished within 20 seconds after starting");
+            }
+        }
+
+        private void DisposeConnection()
+        {
+            _conn.Dispose();
+            _connDisposed.Set();
+        }
     }
 }