Fix consumer loop #772
Merged
Fix consumer loop #772
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Closed
danielmarbach
commented
Mar 24, 2020
| @@ -45,7 +45,7 @@ class WorkPool | |||
| readonly ModelBase _model; | |||
| CancellationTokenRegistration _tokenRegistration; | |||
| volatile TaskCompletionSource<bool> _syncSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously); | |||
| private Task _task; | |||
| private Task _worker; | |||
There was a problem hiding this comment.
this should be kept in case we want to gracefully shutdown
michaelklishin
requested changes
Mar 24, 2020
There was a problem hiding this comment.
No matter what I try, I get test failures on this branch which are not present in master.
With a running local RabbitMQ node under the same umbrella, I run
dotnet test projects/client/Unit --filter "FullyQualifiedName~RabbitMQ.Client.Unit.TestConsumer"
and the failures are:
X TestConsumerCancelEvent [5s 126ms]
Error Message:
Expected: True
But was: False
Stack Trace:
at RabbitMQ.Client.Unit.TestConsumerCancelNotify.TestConsumerCancel(String queue, Boolean EventMode, Boolean& notified) in /Users/antares/Development/RabbitMQ/umbrella.git/deps/rabbitmq_dotnet_client/projects/client/Unit/src/unit/TestConsumerCancelNotify.cs:line 108
at RabbitMQ.Client.Unit.TestConsumerCancelNotify.TestConsumerCancelEvent() in /Users/antares/Development/RabbitMQ/umbrella.git/deps/rabbitmq_dotnet_client/projects/client/Unit/src/unit/TestConsumerCancelNotify.cs:line 67
X TestConsumerCancelNotification [5s 28ms]
Error Message:
Expected: True
But was: False
Stack Trace:
at RabbitMQ.Client.Unit.TestConsumerCancelNotify.TestConsumerCancel(String queue, Boolean EventMode, Boolean& notified) in /Users/antares/Development/RabbitMQ/umbrella.git/deps/rabbitmq_dotnet_client/projects/client/Unit/src/unit/TestConsumerCancelNotify.cs:line 108
at RabbitMQ.Client.Unit.TestConsumerCancelNotify.TestConsumerCancelNotification() in /Users/antares/Development/RabbitMQ/umbrella.git/deps/rabbitmq_dotnet_client/projects/client/Unit/src/unit/TestConsumerCancelNotify.cs:line 61
X TestCorrectConsumerTag [5s 33ms]
Error Message:
Expected: "amq.ctag-kf7-j7-mTrVQ6jfi4ocoGw"
But was: null
Stack Trace:
at RabbitMQ.Client.Unit.TestConsumerCancelNotify.TestCorrectConsumerTag() in /Users/antares/Development/RabbitMQ/umbrella.git/deps/rabbitmq_dotnet_client/projects/client/Unit/src/unit/TestConsumerCancelNotify.cs:line 95
X TestCancelNotificationExceptionHandling [5s 20ms]
Error Message:
Expected: True
But was: False
Stack Trace:
at RabbitMQ.Client.Unit.TestConsumerExceptions.TestExceptionHandlingWith(IBasicConsumer consumer, Action`4 action) in /Users/antares/Development/RabbitMQ/umbrella.git/deps/rabbitmq_dotnet_client/projects/client/Unit/src/unit/TestConsumerExceptions.cs:line 135
at RabbitMQ.Client.Unit.TestConsumerExceptions.TestCancelNotificationExceptionHandling() in /Users/antares/Development/RabbitMQ/umbrella.git/deps/rabbitmq_dotnet_client/projects/client/Unit/src/unit/TestConsumerExceptions.cs:line 142
X TestConsumerCancelOkExceptionHandling [5s 23ms]
Error Message:
Expected: True
But was: False
Stack Trace:
at RabbitMQ.Client.Unit.TestConsumerExceptions.TestExceptionHandlingWith(IBasicConsumer consumer, Action`4 action) in /Users/antares/Development/RabbitMQ/umbrella.git/deps/rabbitmq_dotnet_client/projects/client/Unit/src/unit/TestConsumerExceptions.cs:line 135
at RabbitMQ.Client.Unit.TestConsumerExceptions.TestConsumerCancelOkExceptionHandling() in /Users/antares/Development/RabbitMQ/umbrella.git/deps/rabbitmq_dotnet_client/projects/client/Unit/src/unit/TestConsumerExceptions.cs:line 149
X TestConsumerConsumeOkExceptionHandling [5s 16ms]
Error Message:
Expected: True
But was: False
Stack Trace:
at RabbitMQ.Client.Unit.TestConsumerExceptions.TestExceptionHandlingWith(IBasicConsumer consumer, Action`4 action) in /Users/antares/Development/RabbitMQ/umbrella.git/deps/rabbitmq_dotnet_client/projects/client/Unit/src/unit/TestConsumerExceptions.cs:line 135
at RabbitMQ.Client.Unit.TestConsumerExceptions.TestConsumerConsumeOkExceptionHandling() in /Users/antares/Development/RabbitMQ/umbrella.git/deps/rabbitmq_dotnet_client/projects/client/Unit/src/unit/TestConsumerExceptions.cs:line 156
|
I really need to crash. I split out the async changes into #775 Let's see what gives. I don't have more time for today given that it is really bed time here |
|
@danielmarbach sure, thank you for your help as always ❤️ |
lukebakken
force-pushed
the
fix-consumer-loop
branch
from
1383415 to
9e1ce33
Compare
|
@michaelklishin I know what's causing that. Testing a fix now then I'll push to this branch. |
lukebakken
approved these changes
Mar 25, 2020
There was a problem hiding this comment.
I rebased this on master and addressed one small bug. I think it's good to go ... @michaelklishin ?
michaelklishin
approved these changes
Mar 25, 2020
danielmarbach
commented
Mar 25, 2020
| @@ -77,7 +77,7 @@ async Task Loop() | |||
| // Swallowing the task cancellation exception for the semaphore in case we are stopping. | |||
| } | |||
|
|
|||
| while (_tokenSource.IsCancellationRequested && _actions.TryDequeue(out Action action)) | |||
| while (_tokenSource.IsCancellationRequested == false && _actions.TryDequeue(out Action action)) | |||
There was a problem hiding this comment.
Nice catch. That's what happens when I code late hours...
|
Awesome to get these reviews/fixes from you @danielmarbach. So many nuances that can be forgotten in a big change like this. Thanks :) |
lukebakken
pushed a commit
that referenced
this pull request
Mar 25, 2020
Fix consumer loop (cherry picked from commit 0edb5ed)
7 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Replaces #771 by restoring a safer consumer work pool shutdown behavior where it would dequeue and process all pending operations before shutting down.