Merge pull request #1782 from rabbitmq/rabbitmq-dotnet-client-1751-2

lukebakken · web-flow · commit ef7320636725 · 2025-02-19T08:37:36.000-08:00
Fix rare deadlock, second try
diff --git a/projects/RabbitMQ.Client/ConsumerDispatching/ConsumerDispatcherChannelBase.cs b/projects/RabbitMQ.Client/ConsumerDispatching/ConsumerDispatcherChannelBase.cs
@@ -161,8 +161,14 @@ public async Task WaitForShutdownAsync()
             {
                 try
                 {
-                    await _reader.Completion
-                        .ConfigureAwait(false);
+                    /*
+                     * rabbitmq/rabbitmq-dotnet-client#1751
+                     * Awaiting the work channel reader could deadlock - no idea why.
+                     * Since we await the consumer dispatcher _worker task,
+                     * that should suffice.
+                     *
+                     * await _reader.Completion.ConfigureAwait(false);
+                     */
                     await _worker
                         .ConfigureAwait(false);
                 }

Original file line number	Diff line number	Diff line change
`@@ -161,8 +161,14 @@ public async Task WaitForShutdownAsync()`
`161`	`161`	`{`
`162`	`162`	`try`
`163`	`163`	`{`
`164`		`- await _reader.Completion`
`165`		`- .ConfigureAwait(false);`
	`164`	`+ /*`
	`165`	`+ * rabbitmq/rabbitmq-dotnet-client#1751`
	`166`	`+ * Awaiting the work channel reader could deadlock - no idea why.`
	`167`	`+ * Since we await the consumer dispatcher _worker task,`
	`168`	`+ * that should suffice.`
	`169`	`+ *`
	`170`	`+ * await _reader.Completion.ConfigureAwait(false);`
	`171`	`+ */`
`166`	`172`	`await _worker`
`167`	`173`	`.ConfigureAwait(false);`
`168`	`174`	`}`