commit 610c5f151436557d51b56e06a97ba422553592d7
author Christophe Bornet <cbornet@hotmail.com> Mon Apr 24 11:49:13 2023 +0200
committer Christophe Bornet <cbornet@hotmail.com> Mon Apr 24 11:49:13 2023 +0200
tree 1b37deb0023b86db241835835b4f26f0dab40483
parent f3572574b132dfb6d5a67011f7fb68096e69e1c7

Revert "[improve][broker] Make timer execute immediately after load index (#20126)"

This reverts commit 49480ea558e647169e8df01bfd2e871a5386e19e.

pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/BucketDelayedDeliveryTracker.java

diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/BucketDelayedDeliveryTracker.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/BucketDelayedDeliveryTracker.java
index b4d1745..f57248a 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/BucketDelayedDeliveryTracker.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/BucketDelayedDeliveryTracker.java
@@ -541,7 +541,7 @@
 
     @Override
     public synchronized NavigableSet<PositionImpl> getScheduledMessages(int maxMessages) {
-        if (!checkPendingLoadDone()) {
+        if (!checkPendingOpDone()) {
             if (log.isDebugEnabled()) {
                 log.debug("[{}] Skip getScheduledMessages to wait for bucket snapshot load finish.",
                         dispatcher.getName());
@@ -628,11 +628,11 @@
                         if (timeout != null) {
                             timeout.cancel();
                         }
-                        timeout = timer.newTimeout(this, 0, TimeUnit.MILLISECONDS);
+                        timeout = timer.newTimeout(this, tickTimeMillis, TimeUnit.MILLISECONDS);
                     }
                 });
 
-                if (!checkPendingLoadDone() || loadFuture.isCompletedExceptionally()) {
+                if (!checkPendingOpDone() || loadFuture.isCompletedExceptionally()) {
                     break;
                 }
             }
@@ -651,7 +651,7 @@
         return positions;
     }
 
-    private synchronized boolean checkPendingLoadDone() {
+    private synchronized boolean checkPendingOpDone() {
         if (pendingLoad == null || pendingLoad.isDone()) {
             pendingLoad = null;
             return true;