diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-12-15 22:01:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-15 22:01:18 +0100 |
commit | cc8dae8c056eebad8297e18e8b97de9f3aee99a0 (patch) | |
tree | 9dc5122e52c42c9774b91acd104440d5bb93fa1e /clustercontroller-apps | |
parent | 42cf29fb7452f9d50b6dcbf2cde1102f1543eb6f (diff) | |
parent | 4037c80a826a25cf9a00475e8f93f446c9cc1463 (diff) |
Merge pull request #15824 from vespa-engine/revert-15821-revert-15812-hmuusum/remove-unnecessary-dependency
Stop depending on ZooKeeperProvider, take 2
Diffstat (limited to 'clustercontroller-apps')
4 files changed, 2 insertions, 48 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..49538e476d1 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() { + public 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 { -} |