Work on ConsumerController deadlock
#7092
Merged
Conversation
This file contains 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
Aaronontheweb
changed the title
ConsumerController.SettingsConsumerController deadlock
Arkatufus
reviewed
Feb 14, 2024
| /// When disabled, the <see cref="ConsumerController"/> will discard any <c>Retry</c> messages when it is | ||
| /// waiting for a message confirmation. | ||
| /// </summary> | ||
| public bool RetryConfirmation { get; init; } |
There was a problem hiding this comment.
Added new RetryConfirmation settings
Comment on lines
+389
to
+390
| if (!Settings.RetryConfirmation) | ||
| return; |
There was a problem hiding this comment.
Only retry the delivery if RetryConfirmation is set to true
Comment on lines
+393
to
+399
| ReceiveRetry(() => | ||
| { | ||
| _log.Debug("Retry sending SequencedMessage [{0}].", sequencedMessage.SeqNr); | ||
| CurrentState.Consumer.Tell(new Delivery<T>(sequencedMessage.Message.Message!, Context.Self, | ||
| sequencedMessage.ProducerId, sequencedMessage.SeqNr)); | ||
| Become(() => WaitingForConfirmation(sequencedMessage)); | ||
| }); |
Arkatufus
reviewed
Feb 14, 2024
| @@ -664,6 +664,8 @@ akka { | |||
| # kept in memory in the `ProducerController` until they have been | |||
| # confirmed, but the drawback is that lost messages will not be delivered. | |||
| only-flow-control = false | |||
|
|
|||
| retry-confirmation = false | |||
There was a problem hiding this comment.
RetryConfirmation is false by default
Aaronontheweb
commented
Feb 15, 2024
| @@ -664,6 +664,8 @@ akka { | |||
| # kept in memory in the `ProducerController` until they have been | |||
| # confirmed, but the drawback is that lost messages will not be delivered. | |||
| only-flow-control = false | |||
|
|
|||
| retry-confirmation = false | |||
| @@ -672,4 +673,26 @@ public async Task ConsumerController_can_process_zero_length_Chunk() | |||
| consumerController.Tell(seqMessages1.First()); | |||
| (await consumerProbe.ExpectMsgAsync<ConsumerController.Delivery<ZeroLengthSerializer.TestMsg>>()).Message.Should().Be(ZeroLengthSerializer.TestMsg.Instance); | |||
| } | |||
|
|
|||
| [Fact] | |||
| public async Task ConsumerController_must_not_resend_Delivery() | |||
| public static readonly Config Config = @" | ||
| akka.reliable-delivery.consumer-controller { | ||
| flow-control-window = 20 | ||
| resend-interval-min = 1s |
There was a problem hiding this comment.
Might want to lower this given that you're waiting for up to 1.5 seconds - just to provide a bigger window in the event of racy tests
| /// When disabled, the <see cref="ConsumerController"/> will discard any <c>Retry</c> messages when it is | ||
| /// waiting for a message confirmation. | ||
| /// </summary> | ||
| public bool RetryConfirmation { get; init; } |
| _log.Debug("Retry sending SequencedMessage [{0}].", sequencedMessage.SeqNr); | ||
| CurrentState.Consumer.Tell(new Delivery<T>(sequencedMessage.Message.Message!, Context.Self, | ||
| sequencedMessage.ProducerId, sequencedMessage.SeqNr)); | ||
| Become(() => WaitingForConfirmation(sequencedMessage)); |
There was a problem hiding this comment.
Do we need to do a Become again here? Aren't we already in this state?
There was a problem hiding this comment.
There's no harm in doing it, we might as well have the code to explicitly show which state we're transitioning to.
|
@Arkatufus merged - we'll need a separate PR to add some documentation for this to the Akka.Delivery page on the website |
Arkatufus
added a commit
to Arkatufus/akka.net
that referenced
this pull request
Feb 28, 2024
This reverts commit 1c8ffc3.
Aaronontheweb
pushed a commit
that referenced
this pull request
Feb 29, 2024
This reverts commit 1c8ffc3.
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.
Changes
Fixes #7088 - work in progress.
Checklist
For significant changes, please ensure that the following have been completed (delete if not relevant):
Latest
devBenchmarksInclude data from the relevant benchmark prior to this change here.
This PR's Benchmarks
Include data from after this change here.