diff options
| author | Harald Musum <musum@verizonmedia.com> | 2020-12-16 06:45:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-16 06:45:28 +0100 |
| commit | c22af942effa64d34e59b8514c95cfa1335a1e72 (patch) | |
| tree | 6470dd43ff5a1896476aa29d891eb308793dc733 /config-model | |
| parent | cc8dae8c056eebad8297e18e8b97de9f3aee99a0 (diff) | |
Revert " Stop depending on ZooKeeperProvider, take 2"
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java index b2aa1e6b704..14fbeb17aaf 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java @@ -54,11 +54,23 @@ public class ClusterControllerContainer extends Container implements "com.yahoo.vespa.clustercontroller.apps.clustercontroller.StateRestApiV2Handler", "/cluster/v2/*", CLUSTERCONTROLLER_BUNDLE); - addComponent("clustercontroller-zookeeper-server", - runStandaloneZooKeeper - ? "com.yahoo.vespa.zookeeper.VespaZooKeeperServerImpl" - : "com.yahoo.vespa.zookeeper.DummyVespaZooKeeperServer", - ZOOKEEPER_SERVER_BUNDLE); + if (runStandaloneZooKeeper) { + addComponent("clustercontroller-zkrunner", + "com.yahoo.vespa.zookeeper.VespaZooKeeperServerImpl", + ZOOKEEPER_SERVER_BUNDLE); + addComponent("clustercontroller-zkprovider", + "com.yahoo.vespa.clustercontroller.apps.clustercontroller.StandaloneZooKeeperProvider", + CLUSTERCONTROLLER_BUNDLE); + } else { + // TODO bjorncs/jonmv: remove extraneous ZooKeeperProvider layer + addComponent( + "clustercontroller-zkrunner", + "com.yahoo.vespa.zookeeper.DummyVespaZooKeeperServer", + ZOOKEEPER_SERVER_BUNDLE); + addComponent("clustercontroller-zkprovider", + "com.yahoo.vespa.clustercontroller.apps.clustercontroller.DummyZooKeeperProvider", + CLUSTERCONTROLLER_BUNDLE); + } addComponent(new AccessLogComponent(AccessLogComponent.AccessLogType.jsonAccessLog, "controller", isHosted)); // TODO: Why are bundles added here instead of in the cluster? @@ -84,7 +96,7 @@ public class ClusterControllerContainer extends Container implements return ContainerServiceType.CLUSTERCONTROLLER_CONTAINER; } - private void addHandler(Handler<?> h, String path) { + private void addHandler(Handler h, String path) { h.addServerBindings(SystemBindingPattern.fromHttpPath(path)); super.addHandler(h); } @@ -104,7 +116,7 @@ public class ClusterControllerContainer extends Container implements } private void addHandler(String id, String className, String path, ComponentSpecification bundle) { - addHandler(new Handler<>(createComponentModel(id, className, bundle)), path); + addHandler(new Handler(createComponentModel(id, className, bundle)), path); } private ReindexingContext reindexingContext() { |