HOTFIX: move rebalanceInProgress check to skip commit during handleCorrupted#10444
Merged
ableegoldman merged 2 commits intoapache:trunkfrom Mar 31, 2021
Merged
Conversation
ableegoldman
commented
Mar 30, 2021
Comment on lines
+1042
to
+1044
| if (rebalanceInProgress) { | ||
| return -1; | ||
| } |
Member
Author
There was a problem hiding this comment.
This is the only logical change, I moved this check from TaskManager#commit to this method. And added a bunch of comments/docs so we don't forget this again
mjsax
approved these changes
Mar 31, 2021
Member
Author
|
Two unrelated test failures: |
Member
Author
|
Merged to trunk and cherrypicked to 2.8 cc @vvcephei |
ableegoldman
added a commit
that referenced
this pull request
Mar 31, 2021
…rrupted (#10444) Minor followup to #10407 -- we need to extract the rebalanceInProgress check down into the commitAndFillInConsumedOffsetsAndMetadataPerTaskMap method which is invoked during handleCorrupted, otherwise we may attempt to commit during a a rebalance which will fail Reviewers: Matthias J. Sax <mjsax@confluent.io>
Terrdi
pushed a commit
to Terrdi/kafka
that referenced
this pull request
Apr 1, 2021
…rrupted (apache#10444) Minor followup to apache#10407 -- we need to extract the rebalanceInProgress check down into the commitAndFillInConsumedOffsetsAndMetadataPerTaskMap method which is invoked during handleCorrupted, otherwise we may attempt to commit during a a rebalance which will fail Reviewers: Matthias J. Sax <mjsax@confluent.io>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Minor followup to #10407 -- we need to extract the
rebalanceInProgresscheck down into thecommitAndFillInConsumedOffsetsAndMetadataPerTaskMapmethod which is invoked duringhandleCorrupted, otherwise we may attempt to commit during a a rebalance which will fail