GH-2581: Fix OOO Commits with Rebalance #2586
Merged
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
Resolves spring-projects#2581 If a rebalance occurred while pending out of order commits were present, the pending commits were correctly purged, however, the `consumerPaused` boolean remained true. This prevented the consumer from being paused again while the next batch of records is being processed and subsequent polls returned more records. Reset the `consumerPaused` boolean when all pending commits are purged. Also, with a cooperative assignor, ensure that any newly assigned partitions are paused if pending commits are present. Add tests to verify the correct behavior with a legacy and cooperative assignor. Also tested with the reporter's reproducer. **cherry-pick to 2.9.x**
artembilan
requested changes
Feb 15, 2023
...ng-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java
Outdated
Show resolved
Hide resolved
|
|
||
| @SuppressWarnings({ "unchecked", "rawtypes" }) | ||
| @Test | ||
| void pruneRevokedPartitionsFromPendingOutOfOrderCommitsLegacyAssignor() throws InterruptedException { |
There was a problem hiding this comment.
Gary, I don't see any Assignor settings in the test code.
How does it work, please?
There was a problem hiding this comment.
It's simulated.
With a legacy assignor, all current assignments are revoked and all (or a subset) are re-assigned. With a coop assignor, only a subset are revoked and (possibly) previously unassigned partitions might be assigned.
See the case 1: poll phases in both tests - that is where the simulation is. In the coop case, I test that consumer.pause() is called twice (once for the original assignments and once for the newly assigned partition).
Co-authored-by: Artem Bilan <abilan@vmware.com>
artembilan
reviewed
Feb 15, 2023
...ng-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java
Outdated
Show resolved
Hide resolved
|
Cherry-picked as c8088ef after some conflict fixes. |
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.
Resolves #2581
If a rebalance occurred while pending out of order commits were present, the pending commits were correctly purged, however, the
consumerPausedboolean remained true.This prevented the consumer from being paused again while the next batch of records is being processed and subsequent polls returned more records.
Reset the
consumerPausedboolean when all pending commits are purged.Also, with a cooperative assignor, ensure that any newly assigned partitions are paused if pending commits are present.
Add tests to verify the correct behavior with a legacy and cooperative assignor.
Also tested with the reporter's reproducer.
cherry-pick to 2.9.x