[FIXED] Don't decrement pending count twice after ack #6343
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
Signed-off-by: Maurice van Veen <[email protected]>
MauriceVanVeen
force-pushed
the
maurice/dont-decrement-pending-twice
branch
from
405c4dd to
dd27b48
Compare
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.
Reverts the change made in #6297. The change did (somewhat) improve the reliability of the drifting tests if the
o.npc--was done as a result of contention, but resulted in a regression ifo.npc--was done twice when a message was acked that did not move the ack floor up for WorkQueue/Interest retention.This PR fixes what would otherwise have been a regression.
We really should try to fix the race condition itself though (outside of this PR). Without fixing it the pending count can be incorrect with no way to be resolved unless all messages are consumed, or we'd need to manually recalculate.
Signed-off-by: Maurice van Veen [email protected]