MINOR: Introduce OffsetAndEpoch in LeaderEndpoint interface return values #13268
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
junrao
reviewed
Feb 17, 2023
|
|
||
| package kafka.server | ||
|
|
||
| case class OffsetAndEpoch(offset: Long, leaderEpoch: Int) { |
There was a problem hiding this comment.
Could we add this in the server-common module in java?
kowshik
force-pushed
the
cleanup_leaderendpoint_OffsetAndEpoch
branch
2 times, most recently
from
02b0518 to
99cafb8
Compare
|
@junrao Thanks for the review! I've addressed the comments, the PR is ready for another pass. |
Hangleton
reviewed
Feb 21, 2023
| warn(s"Reset fetch offset for partition $topicPartition from $replicaEndOffset to current " + | ||
| s"leader's start offset $leaderStartOffset") | ||
| val offsetToFetch = | ||
| if (leaderStartOffset > replicaEndOffset) { | ||
| // Only truncate log when current leader's log start offset (local log start offset if >= 3.4 version incaseof | ||
| // OffsetMovedToTieredStorage error) is greater than follower's log end offset. | ||
| // truncateAndBuild returns offset value from which it needs to start fetching. | ||
| truncateAndBuild(epoch, leaderStartOffset) | ||
| truncateAndBuild(offsetAndEpoch.leaderEpoch, leaderStartOffset) |
There was a problem hiding this comment.
Minor - maybe the argument of truncateAndBuild could be the offsetAndEpoch itself?
There was a problem hiding this comment.
Done in 3da1e63. Good point!
|
@Hangleton Thanks for the review. I have addressed the comment, the PR is ready for another pass. |
kowshik
force-pushed
the
cleanup_leaderendpoint_OffsetAndEpoch
branch
from
3da1e63 to
484eef1
Compare
|
@junrao Thanks for the review. I have rebased the PR and brought in the latest commits from AK trunk. PR is ready for a pass. |
|
Thanks! |
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.
Some of the
LeaderEndpointinterface methods used a tuple of(Int, Long)as return value to represent epoch & offset. In this PR, I have replaced those occcurences with the existingOffsetAndEpochtype. This should hopefully improve code readability, and eliminate the chances of developer confusing offset with epoch (or vice versa) at the call site or return site.Tests:
Rely on existing tests