diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-12-07 13:37:26 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-12-07 13:37:26 +0100 |
commit | f98e158a6f61cd39029f439da903f10e75e4c3fa (patch) | |
tree | ca0ad83241f461097e790c4ddaaddb6d5a796839 /config-model | |
parent | c183491dd0d3ad22477f4c1f884bec07156956bf (diff) |
Split out a ZKAdmin interface and implement it
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 7e6c6486b86..ddb3e21fb57 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 @@ -226,6 +226,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { cluster.getContainers().forEach(container -> { container.addComponent(zookeeperComponent("com.yahoo.vespa.zookeeper.ReconfigurableVespaZooKeeperServer", container)); container.addComponent(zookeeperComponent("com.yahoo.vespa.zookeeper.Reconfigurer", container)); + container.addComponent(zookeeperComponent("com.yahoo.vespa.zookeeper.ZkAdminImpl", 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 bb13a77524a..0728925fde1 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 @@ -891,6 +891,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { cluster.getContainers().forEach(container -> { assertComponentConfigured(container, "com.yahoo.vespa.zookeeper.ReconfigurableVespaZooKeeperServer"); assertComponentConfigured(container, "com.yahoo.vespa.zookeeper.Reconfigurer"); + assertComponentConfigured(container, "com.yahoo.vespa.zookeeper.ZkAdminImpl"); ZookeeperServerConfig config = model.getConfig(ZookeeperServerConfig.class, container.getConfigId()); assertEquals(container.index(), config.myid()); |