GH-1866: Fix Pause/Resume #1868
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#1866 The new retryable topic feature pauses/resumes individual partitions. This broke normal container pause/resume by incorrectly resuming partitions that were paused by the container pause operation. Similarly, if individual partitions were paused and then the container was paused and resumed, the container resumed all partitions. Decouple the functionality to prevent this cross-talk. Do not resume any individually paused partitions when the container is in a paused state. Do not resume any individually paused partitions when the container is resumed. Also Use a `ConcurrentHashMap.newKeySet()` instead of synchronization on partition pause requests. Use `getAssignedPartitions()` to allow the retry topic feature to work with manual assignments. Add tests to verify no cross-talk between pausing individual partitions and the container.
|
LGTM @garyrussell! |
|
@garyrussell , let me know if we need to cherry-pick this to |
|
Yes, please; sorry - I keep forgetting main is now 2.8.x. |
|
It might not cherry-pick cleanly; If so, I can back port. |
|
Cherry-picked to |
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.
Resolves #1866
The new retryable topic feature pauses/resumes individual partitions.
This broke normal container pause/resume by incorrectly resuming partitions
that were paused by the container pause operation.
Similarly, if individual partitions were paused and then the container was
paused and resumed, the container resumed all partitions.
Decouple the functionality to prevent this cross-talk.
Do not resume any individually paused partitions when the container is in a paused state.
Do not resume any individually paused partitions when the container is resumed.
Also
Use a
ConcurrentHashMap.newKeySet()instead of synchronization on partition pause requests.Use
getAssignedPartitions()to allow the retry topic feature to work with manual assignments.Add tests to verify no cross-talk between pausing individual partitions and the container.