diff options
| author | jonmv <venstad@gmail.com> | 2022-10-10 12:02:05 +0200 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2022-10-10 12:33:57 +0200 |
| commit | bad5d2aa8f8008ae59abc9381a6474d265ca60b7 (patch) | |
| tree | 1c92093c9c0c8140e27425df6e9bbd5c934b6684 /config-model | |
| parent | 8397ef71c76832b37d1cd99a1d12e88c84a3677d (diff) | |
Also set up Curator in graph
Diffstat (limited to 'config-model')
2 files changed, 2 insertions, 0 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 c85591336bb..307e0e17955 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 @@ -245,6 +245,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { MIN_ZOOKEEPER_NODE_COUNT + " and " + MAX_ZOOKEEPER_NODE_COUNT + ", have " + nonRetiredNodes + " non-retired"); } + cluster.addSimpleComponent("com.yahoo.vespa.curator.Curator", null, "zkfacade"); cluster.addSimpleComponent("com.yahoo.vespa.curator.CuratorWrapper", null, "zkfacade"); // These need to be setup so that they will use the container's config id, since each container 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 3037d8a7cd9..cf6b6365792 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 @@ -569,6 +569,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { VespaModel model = tester.createModel(servicesXml.apply(3), true); ApplicationContainerCluster cluster = model.getContainerClusters().get("default"); assertNotNull(cluster); + assertComponentConfigured(cluster, "com.yahoo.vespa.curator.Curator"); assertComponentConfigured(cluster, "com.yahoo.vespa.curator.CuratorWrapper"); cluster.getContainers().forEach(container -> { assertComponentConfigured(container, "com.yahoo.vespa.zookeeper.ReconfigurableVespaZooKeeperServer"); |