Merge pull request #1161 from rabbitmq/rabbitmq-dotnet-client-1145-main

Port PR #1145 to main, manually

Author: michaelklishin

projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.Recovery.cs

@@ -166,6 +166,23 @@ private bool TryPerformAutomaticRecovery()
             catch (Exception e)
             {
                 ESLog.Error("Exception when recovering connection. Will try again after retry interval.", e);
+                try
+                {
+                    /*
+                     * To prevent connection leaks on the next recovery loop,
+                     * we abort the delegated connection if it is still open.
+                     * We do not want to block the abort forever (potentially deadlocking recovery),
+                     * so we specify the same configured timeout used for connection.
+                     */
+                    if (_innerConnection?.IsOpen == true)
+                    {
+                        _innerConnection.Abort(Constants.InternalError, "FailedAutoRecovery", _factory.RequestedConnectionTimeout);
+                    }
+                }
+                catch (Exception e2)
+                {
+                    ESLog.Warn("Exception when aborting previous auto recovery connection.", e2);
+                }
             }
 
             return false;

projects/RabbitMQ.Client/client/impl/Connection.cs

@@ -81,7 +81,16 @@ public Connection(IConnectionFactory factory, IFrameHandler frameHandler, string
             };
 
             _mainLoopTask = Task.Factory.StartNew(MainLoop, TaskCreationOptions.LongRunning);
-            Open();
+            try
+            {
+                Open();
+            }
+            catch
+            {
+                var ea = new ShutdownEventArgs(ShutdownInitiator.Library, Constants.InternalError, "FailedOpen");
+                Close(ea, true, TimeSpan.FromSeconds(5));
+                throw;
+            }
         }
 
         public Guid Id => _id;

projects/RabbitMQ.Client/client/impl/SocketFrameHandler.cs

@@ -203,17 +203,18 @@ public void Close()
                     try
                     {
                         _channelWriter.Complete();
-                        _writerTask.GetAwaiter().GetResult();
+                        _writerTask?.GetAwaiter().GetResult();
                     }
-                    catch (Exception)
+                    catch
                     {
+                        // ignore, we are closing anyway
                     }
 
                     try
                     {
                         _socket.Close();
                     }
-                    catch (Exception)
+                    catch
                     {
                         // ignore, we are closing anyway
                     }