CalvinConfluent commented on code in PR #14053:
URL: https://github.com/apache/kafka/pull/14053#discussion_r1323907175


##########
core/src/main/scala/kafka/cluster/Partition.scala:
##########
@@ -858,7 +859,7 @@ class Partition(val topicPartition: TopicPartition,
     // No need to calculate low watermark if there is no delayed 
DeleteRecordsRequest
     val oldLeaderLW = if (delayedOperations.numDelayedDelete > 0) 
lowWatermarkIfLeader else -1L
     val prevFollowerEndOffset = replica.stateSnapshot.logEndOffset
-    replica.updateFetchState(
+    replica.updateFetchStateOrThrow(

Review Comment:
   Thanks for the advice, changing to use the read lock.



##########
core/src/main/scala/kafka/cluster/Replica.scala:
##########
@@ -98,14 +103,21 @@ class Replica(val brokerId: Int, val topicPartition: 
TopicPartition) extends Log
    * fetch request is always smaller than the leader's LEO, which can happen 
if small produce requests are received at
    * high frequency.
    */
-  def updateFetchState(
+  def updateFetchStateOrThrow(
     followerFetchOffsetMetadata: LogOffsetMetadata,
     followerStartOffset: Long,
     followerFetchTimeMs: Long,
     leaderEndOffset: Long,
     brokerEpoch: Long
   ): Unit = {
     replicaState.updateAndGet { currentReplicaState =>
+      // Fence the update if it provides a stale broker epoch.
+      val expectedBrokerEpoch = currentReplicaState.brokerEpoch.getOrElse(-1L)
+      if (brokerEpoch != -1 && brokerEpoch < expectedBrokerEpoch) {
+        throw Errors.NOT_LEADER_OR_FOLLOWER.exception(s"Received stale fetch 
state update. broker epoch=$brokerEpoch " +
+          s"vs expected=$expectedBrokerEpoch")
+      }

Review Comment:
   Thanks, updated



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to