[fix][broker] Revert "[fix][broker] Cancel possible pending replay re…

…ad in cancelPendingRead (#23384)" (#23855)
apache · Jan 17, 2025 · ea56ada · ea56ada
1 parent 8f04945
commit ea56ada
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/...r/src/main/java/org/apache/pulsar/broker/service/AbstractDispatcherMultipleConsumers.java b/...r/src/main/java/org/apache/pulsar/broker/service/AbstractDispatcherMultipleConsumers.java
@@ -68,6 +68,10 @@ public SubType getType() {
 
     public abstract boolean isConsumerAvailable(Consumer consumer);
 
+    /**
+     * Cancel a possible pending read that is a Managed Cursor waiting to be notified for more entries.
+     * This won't cancel any other pending reads that are currently in progress.
+     */
     protected void cancelPendingRead() {}
 
     /**

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

diff --git a/...apache/pulsar/broker/service/persistent/PersistentDispatcherMultipleConsumersClassic.java b/...apache/pulsar/broker/service/persistent/PersistentDispatcherMultipleConsumersClassic.java
@@ -600,9 +600,8 @@ public synchronized CompletableFuture<Void> disconnectAllConsumers(
 
     @Override
     protected void cancelPendingRead() {
-        if ((havePendingRead || havePendingReplayRead) && cursor.cancelPendingReadRequest()) {
+        if (havePendingRead && cursor.cancelPendingReadRequest()) {
             havePendingRead = false;
-            havePendingReplayRead = false;
         }
     }