KAFKA-17664: Added check before sending background event after ShareAcknowledge #17332
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
AndrewJSchofield
requested changes
Oct 2, 2024
clients/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumerImpl.java
Outdated
Show resolved
Hide resolved
...ts/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManager.java
Outdated
Show resolved
Hide resolved
...ache/kafka/clients/consumer/internals/events/ShareAcknowledgeCommitCallbackHandlerEvent.java
Outdated
Show resolved
Hide resolved
...ache/kafka/clients/consumer/internals/events/ShareAcknowledgeCommitCallbackHandlerEvent.java
Outdated
Show resolved
Hide resolved
...ts/src/main/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManager.java
Outdated
Show resolved
Hide resolved
...rc/test/java/org/apache/kafka/clients/consumer/internals/ShareConsumeRequestManagerTest.java
Outdated
Show resolved
Hide resolved
AndrewJSchofield
requested changes
Oct 4, 2024
| @@ -588,8 +601,7 @@ private void handleShareFetchSuccess(Node fetchTarget, | |||
| } | |||
| acks.setAcknowledgeErrorCode(Errors.forCode(partitionData.acknowledgeErrorCode())); | |||
| Map<TopicIdPartition, Acknowledgements> acksMap = Collections.singletonMap(tip, acks); | |||
| ShareAcknowledgementCommitCallbackEvent event = new ShareAcknowledgementCommitCallbackEvent(acksMap); | |||
| backgroundEventHandler.add(event); | |||
| maybeSendShareAcknowledgeCommitCallBackEvent(acksMap); | |||
There was a problem hiding this comment.
Nit. "Callback" not "CallBack"
| acknowledgementCommitCallbackHandler = new AcknowledgementCommitCallbackHandler(callback); | ||
| } else { | ||
| if (acknowledgementCommitCallbackHandler != null) { | ||
| ShareAcknowledgementCommitCallbackRegistrationEvent event = new ShareAcknowledgementCommitCallbackRegistrationEvent(true); |
There was a problem hiding this comment.
This should be setting the flag to false I think.
There was a problem hiding this comment.
Really you should have a test that would have caught this error too.
There was a problem hiding this comment.
Yeah, thanks for catching, I have added unit tests to verify this now.
|
|
||
| public class ShareAcknowledgementCommitCallbackRegistrationEvent extends ApplicationEvent { | ||
|
|
||
| boolean isCallbackHandlerRegistered; |
There was a problem hiding this comment.
Just isCallbackRegistered I think for consistency.
AndrewJSchofield
approved these changes
Oct 4, 2024
omkreddy
approved these changes
Oct 7, 2024
tedyu
pushed a commit
to tedyu/kafka
that referenced
this pull request
Jan 6, 2025
…cknowledge (apache#17332) What Currently, we prepare a ShareAcknowledgeCommitCallback event for every ShareAcknowledgeResponse and send it over to the application thread. In cases where the acknowledgement commit callback handler is not configured by the user, this event is not used in the application thread. So we can generate this event based on whether the callback was configured. In this PR, we have a new event which the application thread sends whenever the user enables or disables the commit callback handler, thereby letting the ShareConsumeRequestManager know if it has to send the background event or not. Test We also have a unit test verifying if the ShareConsumeRequestManager sends back the event based on the boolean configured. Reviewers: Andrew Schofield <[email protected]>, Manikumar Reddy <[email protected]>
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.
What
Currently, we prepare a
ShareAcknowledgeCommitCallbackevent for everyShareAcknowledgeResponseand send it over to the application thread.In cases where the acknowledgement commit callback handler is not configured by the user, this event is not used in the application thread. So we can generate this event based on whether the callback was configured.
In this PR, we have a new event which the application thread sends whenever the user enables or disables the commit callback handler, thereby letting the
ShareConsumeRequestManagerknow if it has to send the background event or not.Test
We also have a unit test verifying if the
ShareConsumeRequestManagersends back the event based on the boolean configured.