Skip to content

KAFKA-7104: Handle leader's log start offset beyond last fetched offset #5302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
apovzner wants to merge 1 commit into from
Closed

KAFKA-7104: Handle leader's log start offset beyond last fetched offset #5302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/src/main/scala/kafka/server/ReplicaAlterLogDirsThread.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,9 @@ class ReplicaAlterLogDirsThread(name: String,

partition.appendRecordsToFollowerOrFutureReplica(records, isFuture = true)
val futureReplicaHighWatermark = futureReplica.logEndOffset.messageOffset.min(partitionData.highWatermark)
val newLogStartOffset = futureReplica.logEndOffset.messageOffset.min(partitionData.logStartOffset)
futureReplica.highWatermark = new LogOffsetMetadata(futureReplicaHighWatermark)
futureReplica.maybeIncrementLogStartOffset(partitionData.logStartOffset)
futureReplica.maybeIncrementLogStartOffset(newLogStartOffset)

if (partition.maybeReplaceCurrentWithFutureReplica())
removePartitions(Set(topicPartition))
Expand Down
7 changes: 5 additions & 2 deletions core/src/main/scala/kafka/server/ReplicaFetcherThread.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,15 @@ class ReplicaFetcherThread(name: String,
trace("Follower has replica log end offset %d after appending %d bytes of messages for partition %s"
.format(replica.logEndOffset.messageOffset, records.sizeInBytes, topicPartition))
val followerHighWatermark = replica.logEndOffset.messageOffset.min(partitionData.highWatermark)
val leaderLogStartOffset = partitionData.logStartOffset
// the fetch response from the leader may contain log start offset beyond end offset of the
// fetched records, because log start offset may change on the leader while the fetch
// response is being built. We don't move log start offset beyond LEO on the follower,
val newLogStartOffset = replica.logEndOffset.messageOffset.min(partitionData.logStartOffset)
// for the follower replica, we do not need to keep
// its segment base offset the physical position,
// these values will be computed upon making the leader
replica.highWatermark = new LogOffsetMetadata(followerHighWatermark)
replica.maybeIncrementLogStartOffset(leaderLogStartOffset)
replica.maybeIncrementLogStartOffset(newLogStartOffset)
if (isTraceEnabled)
trace(s"Follower set replica high watermark for partition $topicPartition to $followerHighWatermark")

Expand Down