diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-12-07 18:54:13 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-12-07 18:54:13 +0100 |
commit | 9f94fca1554fde44fd652739f3cf6e647d87184a (patch) | |
tree | ee9525f943da9bcf34727e6b422063ae1b2c1d1d /zookeeper-server | |
parent | 6e44ab449d2bb686127192c71e4dbe87091be6ee (diff) |
Minor fixes
Diffstat (limited to 'zookeeper-server')
-rw-r--r-- | zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java | 4 | ||||
-rw-r--r-- | zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java | 4 | ||||
-rw-r--r-- | zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java (renamed from zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/Server.java) | 6 | ||||
-rw-r--r-- | zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/DummyVespaZooKeeperServer.java | 2 | ||||
-rw-r--r-- | zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServer.java | 4 | ||||
-rw-r--r-- | zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ReconfigurerTest.java | 2 |
6 files changed, 12 insertions, 10 deletions
diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java index 92181e5c2a0..027bb212f09 100644 --- a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java +++ b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java @@ -19,8 +19,8 @@ public class ReconfigurableVespaZooKeeperServer extends AbstractComponent implem reconfigurer.startOrReconfigure(zookeeperServerConfig, this); } - public void start(Path path) { - new Server().start(path); + public void start(Path configFilePath) { + new ZooKeeperServer().start(configFilePath); } } diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java index 2125ed12c5e..4a9a5bb4f65 100644 --- a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java +++ b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java @@ -28,8 +28,8 @@ public class VespaZooKeeperServerImpl extends AbstractComponent implements Vespa super.deconstruct(); } - public void start(Path path) { - new Server().start(path); + public void start(Path configFilePath) { + new ZooKeeperServer().start(configFilePath); } } diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/Server.java b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java index 2770e98bde4..9047c98f13c 100644 --- a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/Server.java +++ b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java @@ -1,3 +1,4 @@ +// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.zookeeper; import org.apache.zookeeper.server.admin.AdminServer; @@ -8,9 +9,10 @@ import java.io.IOException; import java.nio.file.Path; /** - * Extends QuorumPeerMain to be able to call initializeAndRun() + * Class to start zookeeper server. Extends QuorumPeerMain to be able to call initializeAndRun() and wraps + * exceptions so it can be used by code that does not depend on zookeeper. */ -class Server extends QuorumPeerMain { +class ZooKeeperServer extends QuorumPeerMain { public void start(Path path) { initializeAndRun(new String[]{ path.toFile().getAbsolutePath()}); 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 88968cc0de9..91e3c07c2ee 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,6 @@ public class DummyVespaZooKeeperServer extends AbstractComponent implements Vesp @Inject public DummyVespaZooKeeperServer() {} @Override - public void start(Path path) {} + 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 dbe4d4987a4..d627c18c8ca 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 @@ -1,4 +1,4 @@ -// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.zookeeper; import java.nio.file.Path; @@ -10,6 +10,6 @@ import java.nio.file.Path; */ public interface VespaZooKeeperServer { - void start(Path path); + void start(Path configFilePath); } 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 a93cc40d322..1907daf6c2d 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 @@ -155,7 +155,7 @@ public class ReconfigurerTest { } @Override - public void start(Path path) { } + public void start(Path configFilePath) { } } |