You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by cb...@apache.org on 2023/04/24 09:59:09 UTC
[pulsar] 03/04: Revert "[improve][broker] Make timer execute immediately after load index (#20126)"
This is an automated email from the ASF dual-hosted git repository.
cbornet pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 610c5f151436557d51b56e06a97ba422553592d7
Author: Christophe Bornet <cb...@hotmail.com>
AuthorDate: Mon Apr 24 11:49:13 2023 +0200
Revert "[improve][broker] Make timer execute immediately after load index (#20126)"
This reverts commit 49480ea558e647169e8df01bfd2e871a5386e19e.
---
.../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 b4d1745e22f..f57248acbb7 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 (!checkPendingLoadDone()) {
+ if (!checkPendingOpDone()) {
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, 0, TimeUnit.MILLISECONDS);
+ timeout = timer.newTimeout(this, tickTimeMillis, TimeUnit.MILLISECONDS);
}
});
- if (!checkPendingLoadDone() || loadFuture.isCompletedExceptionally()) {
+ if (!checkPendingOpDone() || loadFuture.isCompletedExceptionally()) {
break;
}
}
@@ -651,7 +651,7 @@ public class BucketDelayedDeliveryTracker extends AbstractDelayedDeliveryTracker
return positions;
}
- private synchronized boolean checkPendingLoadDone() {
+ private synchronized boolean checkPendingOpDone() {
if (pendingLoad == null || pendingLoad.isDone()) {
pendingLoad = null;
return true;