From d2c91b1e1a8fc2fb233eb2856ddb6f53511ba201 Mon Sep 17 00:00:00 2001
From: Lari Hotari <lhotari@users.noreply.github.com>
Date: Tue, 1 Oct 2024 22:54:32 +0300
Subject: [PATCH] [fix][broker] Cancel possible pending replay read in
 cancelPendingRead (#23384)

---
 .../persistent/PersistentDispatcherMultipleConsumers.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherMultipleConsumers.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherMultipleConsumers.java
index 73ad2cf0a3dee..d479d8f384ee9 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherMultipleConsumers.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherMultipleConsumers.java
@@ -650,8 +650,9 @@ public synchronized CompletableFuture<Void> disconnectAllConsumers(
 
     @Override
     protected void cancelPendingRead() {
-        if (havePendingRead && cursor.cancelPendingReadRequest()) {
+        if ((havePendingRead || havePendingReplayRead) && cursor.cancelPendingReadRequest()) {
             havePendingRead = false;
+            havePendingReplayRead = false;
         }
     }