From 5d6cafafd8ec5e704f988693d1b5fb2b223d3b52 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Fri, 13 Nov 2020 14:24:38 +0100 Subject: id file is needed when standaloneEnabled=false --- .../src/main/java/com/yahoo/vespa/zookeeper/Configurator.java | 6 ++---- .../src/test/java/com/yahoo/vespa/zookeeper/ConfiguratorTest.java | 4 +++- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'zookeeper-server') 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 -- cgit v1.2.3