Use exponential backoff for ZooKeeper restart

1 files changed, 8 insertions, 2 deletions

diff --git a/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ReconfigurerTest.java b/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ReconfigurerTest.java
index 6ea024db0a4..61ddc5996a4 100644
--- a/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ReconfigurerTest.java
+++ b/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ReconfigurerTest.java
@@ -12,6 +12,7 @@ import org.junit.rules.TemporaryFolder;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
+import java.time.Duration;
 import java.util.stream.IntStream;
 
 import static org.junit.Assert.assertEquals;
@@ -71,8 +72,8 @@ public class ReconfigurerTest {
 
     @Test
     public void testReconfigureFailsWithReconfigInProgressThenSucceeds() {
+        TestableReconfigurer reconfigurer = new TestableReconfigurer(new TestableVespaZooKeeperAdmin().failures(3));
         try {
-            TestableReconfigurer reconfigurer = new TestableReconfigurer(new TestableVespaZooKeeperAdmin().failures(3));
             ZookeeperServerConfig initialConfig = createConfig(3, true);
             reconfigurer.startOrReconfigure(initialConfig);
             assertSame(initialConfig, reconfigurer.activeConfig());
@@ -128,7 +129,12 @@ public class ReconfigurerTest {
         private final TestableVespaZooKeeperAdmin zooKeeperAdmin;
 
         TestableReconfigurer(TestableVespaZooKeeperAdmin zooKeeperAdmin) {
-            super(zooKeeperAdmin, (ignored) -> {});
+            super(zooKeeperAdmin, new Sleeper() {
+                @Override
+                public void sleep(Duration duration) {
+                    // Do nothing
+                }
+            });
             this.zooKeeperAdmin = zooKeeperAdmin;
             HostName.setHostNameForTestingOnly("node1");
         }