Merge branch 'pierresetteskog-feature/always-recover-all-consumers' into 6.x

michaelklishin · michaelklishin · commit 74bb0907ae6d · 2021-05-31T18:53:45.000+03:00
diff --git a/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.cs b/projects/RabbitMQ.Client/client/impl/AutorecoveringConnection.cs
@@ -896,6 +896,12 @@ private void EnsureIsOpen()
         private void HandleTopologyRecoveryException(TopologyRecoveryException e)
         {
             ESLog.Error("Topology recovery exception", e);
+            if (e.InnerException is AlreadyClosedException || e.InnerException is OperationInterruptedException || e.InnerException is TimeoutException)
+            {
+                throw e;
+            }
+            ESLog.Info($"Will not retry recovery because of {e.InnerException?.GetType().FullName}: it's not a known problem with connectivty, ignoring it", e);
+
         }
 
         private void PropagateQueueNameChangeToBindings(string oldName, string newName)

Original file line number	Diff line number	Diff line change
`@@ -896,6 +896,12 @@ private void EnsureIsOpen()`
`896`	`896`	`private void HandleTopologyRecoveryException(TopologyRecoveryException e)`
`897`	`897`	`{`
`898`	`898`	`ESLog.Error("Topology recovery exception", e);`
	`899`	`+ if (e.InnerException is AlreadyClosedException \|\| e.InnerException is OperationInterruptedException \|\| e.InnerException is TimeoutException)`
	`900`	`+ {`
	`901`	`+ throw e;`
	`902`	`+ }`
	`903`	`+ ESLog.Info($"Will not retry recovery because of {e.InnerException?.GetType().FullName}: it's not a known problem with connectivty, ignoring it", e);`
	`904`	`+`
`899`	`905`	`}`
`900`	`906`
`901`	`907`	`private void PropagateQueueNameChangeToBindings(string oldName, string newName)`