diff options
| author | Martin Polden <mpolden@mpolden.no> | 2020-12-15 11:05:35 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2020-12-15 11:23:14 +0100 |
| commit | 1468a9df93196f38d8fc86d5d2be61650a94980f (patch) | |
| tree | aef1b0425009570e62afdf3f5076da0766b4d194 /zookeeper-server/zookeeper-server-common | |
| parent | b012824fe389d2a6cbfc054d42ce24d7ec76490b (diff) | |
Shut down ZooKeeper properly
Diffstat (limited to 'zookeeper-server/zookeeper-server-common')
4 files changed, 10 insertions, 2 deletions
diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/DummyVespaZooKeeperServer.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/DummyVespaZooKeeperServer.java index 91e3c07c2ee..ba53ea04b6e 100644 --- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/DummyVespaZooKeeperServer.java +++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/DummyVespaZooKeeperServer.java @@ -16,6 +16,9 @@ public class DummyVespaZooKeeperServer extends AbstractComponent implements Vesp @Inject public DummyVespaZooKeeperServer() {} @Override + public void shutdown() {} + + @Override public void start(Path configFilePath) {} } diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServer.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServer.java index d627c18c8ca..ea8c6d2bbee 100644 --- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServer.java +++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServer.java @@ -4,12 +4,14 @@ package com.yahoo.vespa.zookeeper; import java.nio.file.Path; /** - * Interface for a component that writes zookeeper config and starts a zookeeper server. + * Interface for a component that starts/stops a ZooKeeper server. * * @author Harald Musum */ public interface VespaZooKeeperServer { + void shutdown(); + void start(Path configFilePath); } diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java index 71ac4bbf62f..c64bfd783e0 100644 --- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java +++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java @@ -42,8 +42,8 @@ public class ZooKeeperRunner implements Runnable { void shutdown() { log.log(Level.INFO, "Triggering shutdown"); + server.shutdown(); executorService.shutdownNow(); - log.log(Level.INFO, "Shutdown triggered"); try { if (!executorService.awaitTermination(shutdownTimeout.toMillis(), TimeUnit.MILLISECONDS)) { log.log(Level.WARNING, "Failed to shut down within " + shutdownTimeout); 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 1ca79a885fb..6ea024db0a4 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 @@ -154,6 +154,9 @@ public class ReconfigurerTest { } @Override + public void shutdown() {} + + @Override public void start(Path configFilePath) { } } |