diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-12-08 09:59:27 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-12-08 09:59:27 +0100 |
commit | c51b8fe382f8647cb624f34d408d33b90778eb43 (patch) | |
tree | 136fc1923033f8f8b834a3cc2655ab06238e0132 /zookeeper-server/zookeeper-server-common | |
parent | 9f94fca1554fde44fd652739f3cf6e647d87184a (diff) |
Inline watcher and rename class
Diffstat (limited to 'zookeeper-server/zookeeper-server-common')
-rw-r--r-- | zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java | 8 | ||||
-rw-r--r-- | zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdmin.java (renamed from zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZkAdmin.java) | 2 | ||||
-rw-r--r-- | zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ReconfigurerTest.java | 12 |
3 files changed, 11 insertions, 11 deletions
diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java index 3466b0a8d22..7dcb9d2ec11 100644 --- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java +++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java @@ -38,11 +38,11 @@ public class Reconfigurer extends AbstractComponent { private ZooKeeperRunner zooKeeperRunner; private ZookeeperServerConfig activeConfig; - protected final ZkAdmin zkAdmin; + protected final VespaZooKeeperAdmin vespaZooKeeperAdmin; @Inject - public Reconfigurer(ZkAdmin zkAdmin) { - this.zkAdmin = zkAdmin; + public Reconfigurer(VespaZooKeeperAdmin vespaZooKeeperAdmin) { + this.vespaZooKeeperAdmin = vespaZooKeeperAdmin; log.log(Level.FINE, "Created ZooKeeperReconfigurer"); } @@ -95,7 +95,7 @@ public class Reconfigurer extends AbstractComponent { for (int attempts = 1; Instant.now().isBefore(end); attempts++) { try { Instant reconfigStarted = Instant.now(); - zkAdmin.reconfigure(connectionSpec, joiningServers, leavingServers); + vespaZooKeeperAdmin.reconfigure(connectionSpec, joiningServers, leavingServers); Instant reconfigEnded = Instant.now(); log.log(Level.INFO, "Reconfiguration completed in " + Duration.between(reconfigTriggered, reconfigEnded) + diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZkAdmin.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdmin.java index fb62f662566..1a7bf483ac5 100644 --- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZkAdmin.java +++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdmin.java @@ -8,7 +8,7 @@ import java.time.Duration; * * @author hmusum */ -public interface ZkAdmin { +public interface VespaZooKeeperAdmin { void reconfigure(String connectionSpec, String joiningServers, String leavingServers) throws ReconfigException; 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 1907daf6c2d..020c84f74fb 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 @@ -36,7 +36,7 @@ public class ReconfigurerTest { public void setup() throws IOException { cfgFile = folder.newFile(); idFile = folder.newFile("myid"); - reconfigurer = new TestableReconfigurer(new TestableZkAdmin()); + reconfigurer = new TestableReconfigurer(new TestableVespaZooKeeperAdmin()); } @Test @@ -71,7 +71,7 @@ public class ReconfigurerTest { @Test public void testReconfigureFailsWithReconfigInProgressThenSucceeds() { - reconfigurer = new TestableReconfigurer(new TemporarilyFailZkAdmin()); + reconfigurer = new TestableReconfigurer(new TemporarilyFailVespaZooKeeperAdmin()); ZookeeperServerConfig initialConfig = createConfig(3, true); reconfigurer.startOrReconfigure(initialConfig); assertSame(initialConfig, reconfigurer.activeConfig()); @@ -121,9 +121,9 @@ public class ReconfigurerTest { private static class TestableReconfigurer extends Reconfigurer implements VespaZooKeeperServer{ - private final TestableZkAdmin zkReconfigurer; + private final TestableVespaZooKeeperAdmin zkReconfigurer; - TestableReconfigurer(TestableZkAdmin zkReconfigurer) { + TestableReconfigurer(TestableVespaZooKeeperAdmin zkReconfigurer) { super(zkReconfigurer); this.zkReconfigurer = zkReconfigurer; HostName.setHostNameForTestingOnly("node1"); @@ -159,7 +159,7 @@ public class ReconfigurerTest { } - private static class TestableZkAdmin implements ZkAdmin { + private static class TestableVespaZooKeeperAdmin implements VespaZooKeeperAdmin { String connectionSpec; String joiningServers; @@ -177,7 +177,7 @@ public class ReconfigurerTest { } // Fails 3 times with KeeperException.ReconfigInProgress(), then succeeds - private static class TemporarilyFailZkAdmin extends TestableZkAdmin { + private static class TemporarilyFailVespaZooKeeperAdmin extends TestableVespaZooKeeperAdmin { private int attempts = 0; |