From 0ca1c397b9c9efa3826ce8aee799b01425375901 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Mon, 7 Dec 2020 11:05:12 +0100 Subject: Allow single-node cluster with ZooKeeper --- .../java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 2 +- .../com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index 7e6c6486b86..7575f517b10 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -115,7 +115,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder { private static final String ENVIRONMENT_VARIABLES_ELEMENT = "environment-variables"; // The node count to enforce in a cluster running ZooKeeper - private static final int MIN_ZOOKEEPER_NODE_COUNT = 3; + private static final int MIN_ZOOKEEPER_NODE_COUNT = 1; private static final int MAX_ZOOKEEPER_NODE_COUNT = 7; public enum Networking { disable, enable } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java index bb13a77524a..60704065e28 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java @@ -899,7 +899,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { } { try { - tester.createModel(servicesXml.apply(1), true); + tester.createModel(servicesXml.apply(2), true); fail("Expected exception"); } catch (IllegalArgumentException ignored) {} } -- cgit v1.2.3