[pulsar] branch branch-3.0 updated: [improve][broker] Make timer execute immediately after load index (#20126)

[yubiao]

This is an automated email from the ASF dual-hosted git repository.

yubiao pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/branch-3.0 by this push:
     new d08c3cbc704 [improve][broker] Make timer execute immediately after 
load index (#20126)
d08c3cbc704 is described below

commit d08c3cbc70468011430bd7482431d34014c90ed5
Author: Cong Zhao <zhaoc...@apache.org>
AuthorDate: Wed Apr 19 16:44:12 2023 +0800

    [improve][broker] Make timer execute immediately after load index (#20126)
    
    (cherry picked from commit 9b723022436cc1a150af765103e8d343679f92ce)
---
 .../broker/delayed/bucket/BucketDelayedDeliveryTracker.java       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 f57248acbb7..b4d1745e22f 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 @@ public class BucketDelayedDeliveryTracker extends 
AbstractDelayedDeliveryTracker
 
     @Override
     public synchronized NavigableSet<PositionImpl> getScheduledMessages(int 
maxMessages) {
-        if (!checkPendingOpDone()) {
+        if (!checkPendingLoadDone()) {
             if (log.isDebugEnabled()) {
                 log.debug("[{}] Skip getScheduledMessages to wait for bucket 
snapshot load finish.",
                         dispatcher.getName());
@@ -628,11 +628,11 @@ public class BucketDelayedDeliveryTracker extends 
AbstractDelayedDeliveryTracker
                         if (timeout != null) {
                             timeout.cancel();
                         }
-                        timeout = timer.newTimeout(this, tickTimeMillis, 
TimeUnit.MILLISECONDS);
+                        timeout = timer.newTimeout(this, 0, 
TimeUnit.MILLISECONDS);
                     }
                 });
 
-                if (!checkPendingOpDone() || 
loadFuture.isCompletedExceptionally()) {
+                if (!checkPendingLoadDone() || 
loadFuture.isCompletedExceptionally()) {
                     break;
                 }
             }
@@ -651,7 +651,7 @@ public class BucketDelayedDeliveryTracker extends 
AbstractDelayedDeliveryTracker
         return positions;
     }
 
-    private synchronized boolean checkPendingOpDone() {
+    private synchronized boolean checkPendingLoadDone() {
         if (pendingLoad == null || pendingLoad.isDone()) {
             pendingLoad = null;
             return true;