diff options
| author | Harald Musum <musum@verizonmedia.com> | 2020-12-07 12:23:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-07 12:23:53 +0100 |
| commit | c8b8988ee986fa0a08274aa8ef12b7fbddd90488 (patch) | |
| tree | b9a870ffcfb2d948082ad761befffe8835f6457a | |
| parent | 4347f41489642426f79194306c1ca695d85c4208 (diff) | |
| parent | 0ca1c397b9c9efa3826ce8aee799b01425375901 (diff) | |
Merge pull request #15711 from vespa-engine/mpolden/allow-single-node
Allow single-node cluster with ZooKeeper
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<ContainerModel> { 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) {} } |