You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by yu...@apache.org on 2026/03/09 14:07:36 UTC
(pulsar) branch master updated: [fix][build] Fix compilation issues for PR #25219 changes after merging conflicting PR #25278 (#25300)
This is an automated email from the ASF dual-hosted git repository.
yubiao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new c70f2637611 [fix][build] Fix compilation issues for PR #25219 changes after merging conflicting PR #25278 (#25300)
c70f2637611 is described below
commit c70f2637611addf9e487bade7cf85a1625624030
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Mon Mar 9 16:07:29 2026 +0200
[fix][build] Fix compilation issues for PR #25219 changes after merging conflicting PR #25278 (#25300)
---
.../pulsar/metadata/coordination/impl/MigrationCoordinator.java | 9 ++++++---
.../java/org/apache/pulsar/metadata/impl/DualMetadataStore.java | 9 ++++++---
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/coordination/impl/MigrationCoordinator.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/coordination/impl/MigrationCoordinator.java
index 28f6184c397..e5d017eaf4d 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/coordination/impl/MigrationCoordinator.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/coordination/impl/MigrationCoordinator.java
@@ -21,6 +21,7 @@ package org.apache.pulsar.metadata.coordination.impl;
import io.oxia.client.api.AsyncOxiaClient;
import io.oxia.client.api.options.defs.OptionOverrideModificationsCount;
import io.oxia.client.api.options.defs.OptionOverrideVersionId;
+import java.time.Duration;
import java.util.EnumSet;
import java.util.List;
import java.util.Optional;
@@ -123,8 +124,10 @@ public class MigrationCoordinator {
log.info("Waiting for all participants to prepare...");
long startTime = System.currentTimeMillis();
- Backoff backoff = new Backoff(100, TimeUnit.MILLISECONDS, 60, TimeUnit.SECONDS, 60,
- TimeUnit.SECONDS);
+ Backoff backoff = Backoff.builder()
+ .initialDelay(Duration.ofMillis(100))
+ .mandatoryStop(Duration.ofSeconds(60))
+ .maxBackoff(Duration.ofSeconds(60)).build();
while (System.currentTimeMillis() - startTime < 60_000) {
List<String> pending = sourceStore.getChildren(MigrationState.PARTICIPANTS_PATH).get();
if (pending.isEmpty()) {
@@ -133,7 +136,7 @@ public class MigrationCoordinator {
}
log.info("Waiting for participants to prepare. pending: {}", pending);
- Thread.sleep(backoff.next());
+ Thread.sleep(backoff.next().toMillis());
}
log.error("Failed to wait for all participants to prepare. pending participants: {}",
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/DualMetadataStore.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/DualMetadataStore.java
index 972864a0321..5360d480868 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/DualMetadataStore.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/DualMetadataStore.java
@@ -20,6 +20,7 @@ package org.apache.pulsar.metadata.impl;
import com.fasterxml.jackson.core.type.TypeReference;
import io.netty.util.concurrent.DefaultThreadFactory;
+import java.time.Duration;
import java.util.EnumSet;
import java.util.List;
import java.util.Optional;
@@ -166,15 +167,17 @@ public class DualMetadataStore implements MetadataStoreExtended {
log.info("Target metadata store URL: {}", migrationState.getTargetUrl());
long startTime = System.currentTimeMillis();
- Backoff backoff = new Backoff(100, TimeUnit.MILLISECONDS, 60, TimeUnit.SECONDS, 60,
- TimeUnit.SECONDS);
+ Backoff backoff = Backoff.builder()
+ .initialDelay(Duration.ofMillis(100))
+ .mandatoryStop(Duration.ofSeconds(60))
+ .maxBackoff(Duration.ofSeconds(60)).build();
while (System.currentTimeMillis() - startTime < 60_000) {
int pending = pendingSourceWrites.get();
if (pending == 0) {
break;
} else {
log.info("Waiting for {} pending source writes to complete", pendingSourceWrites.get());
- Thread.sleep(backoff.next());
+ Thread.sleep(backoff.next().toMillis());
}
}