diff options
5 files changed, 7 insertions, 59 deletions
diff --git a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java index 9020765f777..52a37c9489e 100644 --- a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java +++ b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.clustercontroller.apps.clustercontroller; import com.google.inject.Inject; @@ -29,21 +29,11 @@ public class ClusterController extends AbstractComponent private final Map<String, FleetController> controllers = new TreeMap<>(); private final Map<String, StatusHandler.ContainerStatusPageServer> status = new TreeMap<>(); - /** - * Dependency injection constructor for controller. {@link ZooKeeperProvider} argument given - * to ensure that zookeeper has started before we start polling it. - */ - @SuppressWarnings("unused") @Inject - public ClusterController(ZooKeeperProvider zooKeeperProvider) { - this(); - } - ClusterController() { metricWrapper = new JDiscMetricWrapper(null); } - public void setOptions(FleetControllerOptions options, Metric metricImpl) throws Exception { metricWrapper.updateMetricImplementation(metricImpl); verifyThatZooKeeperWorks(options); diff --git a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/DummyZooKeeperProvider.java b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/DummyZooKeeperProvider.java deleted file mode 100644 index f961297643e..00000000000 --- a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/DummyZooKeeperProvider.java +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.clustercontroller.apps.clustercontroller; - -/** - * A dummy zookeeper provider when we do not run our own zookeeper instance. - * - * @author Ulf Lilleengen - */ -public class DummyZooKeeperProvider implements ZooKeeperProvider { -} diff --git a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StandaloneZooKeeperProvider.java b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StandaloneZooKeeperProvider.java deleted file mode 100644 index baad012a234..00000000000 --- a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/StandaloneZooKeeperProvider.java +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.clustercontroller.apps.clustercontroller; - -import com.yahoo.vespa.zookeeper.VespaZooKeeperServer; - -/** - * ZooKeeper provider that ensures we are running our own instance of zookeeper. - * - * @author Ulf Lilleengen - */ -public class StandaloneZooKeeperProvider implements ZooKeeperProvider { - - public StandaloneZooKeeperProvider(VespaZooKeeperServer server) { - } - -} diff --git a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ZooKeeperProvider.java b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ZooKeeperProvider.java deleted file mode 100644 index bb18bcc65d6..00000000000 --- a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ZooKeeperProvider.java +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.clustercontroller.apps.clustercontroller; - -/** - * Abstraction we can depend on providing us with a zookeeper server being up. - * - * @author Ulf Lilleengen - */ -public interface ZooKeeperProvider { -} 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..555c87b5667 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 @@ -55,21 +55,15 @@ public class ClusterControllerContainer extends Container implements "/cluster/v2/*", CLUSTERCONTROLLER_BUNDLE); if (runStandaloneZooKeeper) { - addComponent("clustercontroller-zkrunner", + addComponent("clustercontroller-zookeeper-server", "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)); |