diff options
| author | Harald Musum <musum@verizonmedia.com> | 2020-12-16 08:08:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-16 08:08:50 +0100 |
| commit | fe022d3df48b8e840696fe7ed92f91e1a1c56e5d (patch) | |
| tree | 9dc5122e52c42c9774b91acd104440d5bb93fa1e /config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller | |
| parent | e5b1ddb28a720200aacb31de95e331068cf33c01 (diff) | |
Revert "Revert " Stop depending on ZooKeeperProvider, take 2""
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java | 26 |
1 files changed, 7 insertions, 19 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 14fbeb17aaf..b2aa1e6b704 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,23 +54,11 @@ public class ClusterControllerContainer extends Container implements "com.yahoo.vespa.clustercontroller.apps.clustercontroller.StateRestApiV2Handler", "/cluster/v2/*", CLUSTERCONTROLLER_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("clustercontroller-zookeeper-server", + runStandaloneZooKeeper + ? "com.yahoo.vespa.zookeeper.VespaZooKeeperServerImpl" + : "com.yahoo.vespa.zookeeper.DummyVespaZooKeeperServer", + ZOOKEEPER_SERVER_BUNDLE); addComponent(new AccessLogComponent(AccessLogComponent.AccessLogType.jsonAccessLog, "controller", isHosted)); // TODO: Why are bundles added here instead of in the cluster? @@ -96,7 +84,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); } @@ -116,7 +104,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() { |