* Hold the _channelsSemaphore for a shorter period of time.

Author: lukebakken

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

@@ -46,7 +46,7 @@ internal sealed partial class AutorecoveringConnection
         private readonly Dictionary<string, RecordedQueue> _recordedQueues = new Dictionary<string, RecordedQueue>();
         private readonly HashSet<RecordedBinding> _recordedBindings = new HashSet<RecordedBinding>();
         private readonly Dictionary<string, RecordedConsumer> _recordedConsumers = new Dictionary<string, RecordedConsumer>();
-        private List<AutorecoveringChannel> _channels = new List<AutorecoveringChannel>();
+        private readonly List<AutorecoveringChannel> _channels = new List<AutorecoveringChannel>();
 
         internal int RecordedExchangesCount => _recordedExchanges.Count;
 

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

@@ -584,28 +584,43 @@ private async ValueTask RecoverChannelsAndItsConsumersAsync(bool recordedEntitie
                 throw new InvalidOperationException("recordedEntitiesSemaphore must be held");
             }
 
-            var recoveredChannels = new List<AutorecoveringChannel>();
+            var channelsToRecover = new List<AutorecoveringChannel>();
             await _channelsSemaphore.WaitAsync(cancellationToken)
                 .ConfigureAwait(false);
             try
             {
-                foreach (AutorecoveringChannel channel in _channels)
+                channelsToRecover.AddRange(_channels);
+            }
+            finally
+            {
+                _channelsSemaphore.Release();
+            }
+
+            var notRecoveredChannels = new List<AutorecoveringChannel>();
+            foreach (AutorecoveringChannel channel in channelsToRecover)
+            {
+                bool recovered = await channel.AutomaticallyRecoverAsync(this, _config.TopologyRecoveryEnabled,
+                    recordedEntitiesSemaphoreHeld: recordedEntitiesSemaphoreHeld,
+                    cancellationToken: cancellationToken)
+                    .ConfigureAwait(false);
+
+                if (false == recovered)
                 {
-                    bool recovered = await channel.AutomaticallyRecoverAsync(this, _config.TopologyRecoveryEnabled,
-                        recordedEntitiesSemaphoreHeld: recordedEntitiesSemaphoreHeld,
-                        cancellationToken: cancellationToken)
-                        .ConfigureAwait(false);
+                    notRecoveredChannels.Add(channel);
+                }
+            }
 
-                    if (recovered)
-                    {
-                        recoveredChannels.Add(channel);
-                    }
+            await _channelsSemaphore.WaitAsync(cancellationToken)
+                .ConfigureAwait(false);
+            try
+            {
+                foreach (AutorecoveringChannel channel in notRecoveredChannels)
+                {
+                    _channels.Remove(channel);
                 }
             }
             finally
             {
-                _channels.Clear();
-                _channels = recoveredChannels;
                 _channelsSemaphore.Release();
             }
         }