KAFKA-10113; Specify fetch offsets correctly in LogTruncationException #8822
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -464,11 +464,11 @@ public synchronized boolean maybeValidatePositionForCurrentLeader(ApiVersions ap | |
|
|
||
| /** | ||
| * Attempt to complete validation with the end offset returned from the OffsetForLeaderEpoch request. | ||
| * @return Log truncation details if detected and no reset policy is defined. | ||
| */ | ||
| public synchronized Optional<LogTruncation> maybeCompleteValidation(TopicPartition tp, | ||
| FetchPosition requestPosition, | ||
| EpochEndOffset epochEndOffset) { | ||
| TopicPartitionState state = assignedStateOrNull(tp); | ||
| if (state == null) { | ||
| log.debug("Skipping completed validation for partition {} which is not currently assigned.", tp); | ||
|
|
@@ -480,6 +480,17 @@ public synchronized Optional<OffsetAndMetadata> maybeCompleteValidation(TopicPar | |
| log.debug("Skipping completed validation for partition {} since the current position {} " + | ||
| "no longer matches the position {} when the request was sent", | ||
| tp, currentPosition, requestPosition); | ||
| } else if (epochEndOffset.hasUndefinedEpochOrOffset()) { | ||
|
There was a problem hiding this comment. I was thinking where is the best to put the check, since previously it was before
Contributor
Author
There was a problem hiding this comment. If the fetch position has changed or we are no longer awaiting validation, we want to ignore the result. This was a bug in the previous patch which we didn't catch.
Member
There was a problem hiding this comment. Ok, so before this change, we were raising OffsetOutOfRangeException regardless of the state of the subscription which meant that a regular truncation case was being masked as a failed offset validation?
Contributor
Author
There was a problem hiding this comment. It was what @abbccdda and I had agreed in the previous PR. The problem was that we didn't have divergent offsets to include in the exception, so we just raised it as OffsetOutOfRange. After I noticed the problem with LogTruncationException here, I decided to just simplify the logic here and return the truncation exception with the divergent offsets undefined. |
||
| if (hasDefaultOffsetResetPolicy()) { | ||
| log.info("Truncation detected for partition {} at offset {}, resetting offset", | ||
| tp, currentPosition); | ||
|
|
||
| requestOffsetReset(tp); | ||
| } else { | ||
| log.warn("Truncation detected for partition {} at offset {}, but no reset policy is set", | ||
| tp, currentPosition); | ||
| return Optional.of(new LogTruncation(tp, requestPosition, Optional.empty())); | ||
| } | ||
| } else if (epochEndOffset.endOffset() < currentPosition.offset) { | ||
| if (hasDefaultOffsetResetPolicy()) { | ||
| SubscriptionState.FetchPosition newPosition = new SubscriptionState.FetchPosition( | ||
|
|
@@ -489,11 +500,12 @@ public synchronized Optional<OffsetAndMetadata> maybeCompleteValidation(TopicPar | |
| "the first offset known to diverge {}", tp, currentPosition, newPosition); | ||
| state.seekValidated(newPosition); | ||
| } else { | ||
| OffsetAndMetadata divergentOffset = new OffsetAndMetadata(epochEndOffset.endOffset(), | ||
| Optional.of(epochEndOffset.leaderEpoch()), null); | ||
| log.warn("Truncation detected for partition {} at offset {} (the end offset from the " + | ||
| "broker is {}), but no reset policy is set", | ||
| tp, currentPosition, divergentOffset); | ||
| return Optional.of(new LogTruncation(tp, requestPosition, Optional.of(divergentOffset))); | ||
| } | ||
| } else { | ||
| state.completeValidation(); | ||
|
|
@@ -1083,4 +1095,43 @@ public String toString() { | |
| '}'; | ||
| } | ||
| } | ||
|
|
||
| public static class LogTruncation { | ||
| public final TopicPartition topicPartition; | ||
| public final FetchPosition fetchPosition; | ||
| public final Optional<OffsetAndMetadata> divergentOffsetOpt; | ||
|
|
||
| public LogTruncation(TopicPartition topicPartition, | ||
| FetchPosition fetchPosition, | ||
| Optional<OffsetAndMetadata> divergentOffsetOpt) { | ||
| this.topicPartition = topicPartition; | ||
| this.fetchPosition = fetchPosition; | ||
|
There was a problem hiding this comment. Should require non-null for
Contributor
Author
There was a problem hiding this comment. Out of curiosity, why There was a problem hiding this comment. After a second thought, I don't feel strong about it. |
||
| this.divergentOffsetOpt = divergentOffsetOpt; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| StringBuilder bldr = new StringBuilder() | ||
| .append("(partition=") | ||
| .append(topicPartition) | ||
| .append(", fetchOffset=") | ||
| .append(fetchPosition.offset) | ||
| .append(", fetchEpoch=") | ||
| .append(fetchPosition.offsetEpoch); | ||
|
|
||
| if (divergentOffsetOpt.isPresent()) { | ||
| OffsetAndMetadata divergentOffset = divergentOffsetOpt.get(); | ||
| bldr.append(", divergentOffset=") | ||
| .append(divergentOffset.offset()) | ||
| .append(", divergentEpoch=") | ||
| .append(divergentOffset.leaderEpoch()); | ||
| } else { | ||
| bldr.append(", divergentOffset=unknown") | ||
| .append(", divergentEpoch=unknown"); | ||
| } | ||
|
|
||
| return bldr.append(")").toString(); | ||
|
|
||
| } | ||
| } | ||
| } | ||
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do we move this check out of
setFatalOffsetForLeaderException?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seemed inconsistent to have a method named
setFatalwhich checks for retriable exceptions.