Skip to content

KAFKA-7838: Log leader and follower end offsets when shrinking ISR #6168

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

Merged
junrao merged 3 commits into from
Jan 25, 2019
Merged

KAFKA-7838: Log leader and follower end offsets when shrinking ISR #6168

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2239b56
KAFKA-7838: Log leader and follower end offsets when shrinking ISR
dhruvilshah3 Jan 18, 2019
74ecbca
hwm --> highWatermark
dhruvilshah3 Jan 24, 2019
11fbfbe
Address review comment
dhruvilshah3 Jan 25, 2019
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
12 changes: 9 additions & 3 deletions core/src/main/scala/kafka/cluster/Partition.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,16 +634,22 @@ class Partition(val topicPartition: TopicPartition,
leaderReplicaIfLocal match {
case Some(leaderReplica) =>
val outOfSyncReplicas = getOutOfSyncReplicas(leaderReplica, replicaMaxLagTimeMs)
if(outOfSyncReplicas.nonEmpty) {
if (outOfSyncReplicas.nonEmpty) {
val newInSyncReplicas = inSyncReplicas -- outOfSyncReplicas
assert(newInSyncReplicas.nonEmpty)
info("Shrinking ISR from %s to %s".format(inSyncReplicas.map(_.brokerId).mkString(","),
newInSyncReplicas.map(_.brokerId).mkString(",")))
debug(s"Leader (hwm: ${leaderReplica.highWatermark.messageOffset}, endOffset: ${leaderReplica.logEndOffset.messageOffset})")

@viktorsomogyi viktorsomogyi Jan 22, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: I wouldn't use abbreviations such as hwn. I think it's good to call it "highWatermark". It seems nicer.

debug(s"Out of sync replicas: " +
s"${outOfSyncReplicas.map { replica =>
s"(brokerId: ${replica.brokerId}, endOffset: ${replica.logEndOffset.messageOffset})"
}.mkString(" ")}")

// update ISR in zk and in cache
updateIsr(newInSyncReplicas)
// we may need to increment high watermark since ISR could be down to 1

replicaManager.isrShrinkRate.mark()

// we may need to increment high watermark since ISR could be down to 1
maybeIncrementLeaderHW(leaderReplica)
} else {
false
Expand Down