diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-11-13 14:24:38 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-11-13 14:24:38 +0100 |
commit | 5d6cafafd8ec5e704f988693d1b5fb2b223d3b52 (patch) | |
tree | f9b3b5cafc56f2e742b7c3dc9cd1f699421032d7 /zookeeper-server | |
parent | 340cf1a4cd2f51a88be73186c8e55913b69dfe50 (diff) |
id file is needed when standaloneEnabled=false
Diffstat (limited to 'zookeeper-server')
2 files changed, 5 insertions, 5 deletions
diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java index d92b80b5b81..7424b1750c4 100644 --- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java +++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java @@ -100,10 +100,8 @@ public class Configurator { } private void writeMyIdFile(ZookeeperServerConfig config) throws IOException { - if (config.server().size() > 1) { - try (FileWriter writer = new FileWriter(getDefaults().underVespaHome(config.myidFile()))) { - writer.write(config.myid() + "\n"); - } + try (FileWriter writer = new FileWriter(getDefaults().underVespaHome(config.myidFile()))) { + writer.write(config.myid() + "\n"); } } diff --git a/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ConfiguratorTest.java b/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ConfiguratorTest.java index d73fbab8f64..2b2016460b8 100644 --- a/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ConfiguratorTest.java +++ b/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ConfiguratorTest.java @@ -55,9 +55,11 @@ public class ConfiguratorTest { @Test public void config_is_written_correctly_when_one_server() throws IOException { ZookeeperServerConfig.Builder builder = createConfigBuilderForSingleHost(cfgFile, idFile, jksKeyStoreFile); + builder.myidFile(idFile.getAbsolutePath()); + builder.myid(0); new Configurator(builder.build()).writeConfigToDisk(Optional.empty()); validateConfigFileSingleHost(cfgFile); - validateIdFile(idFile, ""); + validateIdFile(idFile, "0\n"); } @Test |