diff options
Diffstat (limited to 'zkfacade/src/main/java/com/yahoo/vespa/curator')
3 files changed, 7 insertions, 16 deletions
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java index 9a7dd469fa1..2781e81cd7c 100644 --- a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java +++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java @@ -173,12 +173,12 @@ public class Curator extends AbstractComponent implements AutoCloseable { }); } - public CompletionWaiter getCompletionWaiter(Path waiterPath, String id) { - return CuratorCompletionWaiter.create(this, waiterPath, id); + public CompletionWaiter getCompletionWaiter(Path waiterPath, String id, Duration waitForAll) { + return CuratorCompletionWaiter.create(this, waiterPath, id, waitForAll); } - public CompletionWaiter createCompletionWaiter(Path parentPath, String waiterNode, String id) { - return CuratorCompletionWaiter.createAndInitialize(this, parentPath, waiterNode, id); + public CompletionWaiter createCompletionWaiter(Path parentPath, String waiterNode, String id, Duration waitForAll) { + return CuratorCompletionWaiter.createAndInitialize(this, parentPath, waiterNode, id, waitForAll); } /** Creates a listenable cache which keeps in sync with changes to all the immediate children of a path */ diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/CuratorCompletionWaiter.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/CuratorCompletionWaiter.java index 8df37d1f6ce..5a3d6668231 100644 --- a/zkfacade/src/main/java/com/yahoo/vespa/curator/CuratorCompletionWaiter.java +++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/CuratorCompletionWaiter.java @@ -21,7 +21,6 @@ import java.util.logging.Level; class CuratorCompletionWaiter implements Curator.CompletionWaiter { private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(CuratorCompletionWaiter.class.getName()); - private static final Duration waitForAllDefault = Duration.ofSeconds(1); // Make this configurable? private final Curator curator; private final String barrierPath; @@ -121,18 +120,10 @@ class CuratorCompletionWaiter implements Curator.CompletionWaiter { return "'" + barrierPath + "', " + barrierMemberCount() + " members"; } - public static Curator.CompletionWaiter create(Curator curator, Path barrierPath, String id) { - return create(curator, barrierPath, id, waitForAllDefault); - } - public static Curator.CompletionWaiter create(Curator curator, Path barrierPath, String id, Duration waitForAll) { return new CuratorCompletionWaiter(curator, barrierPath.getAbsolute(), id, Clock.systemUTC(), waitForAll); } - public static Curator.CompletionWaiter createAndInitialize(Curator curator, Path parentPath, String waiterNode, String id) { - return createAndInitialize(curator, parentPath, waiterNode, id, waitForAllDefault); - } - public static Curator.CompletionWaiter createAndInitialize(Curator curator, Path parentPath, String waiterNode, String id, Duration waitForAll) { Path waiterPath = parentPath.append(waiterNode); diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/mock/MockCurator.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/mock/MockCurator.java index 5ebd33801ed..e578746d348 100644 --- a/zkfacade/src/main/java/com/yahoo/vespa/curator/mock/MockCurator.java +++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/mock/MockCurator.java @@ -6,7 +6,7 @@ import com.yahoo.path.Path; import com.yahoo.vespa.curator.Curator; import org.apache.curator.framework.recipes.atomic.DistributedAtomicLong; import org.apache.curator.framework.recipes.locks.InterProcessLock; - +import java.time.Duration; import java.util.Optional; import java.util.concurrent.ExecutorService; @@ -82,12 +82,12 @@ public class MockCurator extends Curator { } @Override - public CompletionWaiter getCompletionWaiter(Path parentPath, String id) { + public CompletionWaiter getCompletionWaiter(Path parentPath, String id, Duration waitForAll) { return mockFramework().createCompletionWaiter(); } @Override - public CompletionWaiter createCompletionWaiter(Path parentPath, String waiterNode, String id) { + public CompletionWaiter createCompletionWaiter(Path parentPath, String waiterNode, String id, Duration waitForAll) { return mockFramework().createCompletionWaiter(); } |