summaryrefslogtreecommitdiffstats
path: root/clustercontroller-apps
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-12-16 08:11:53 +0100
committerHarald Musum <musum@verizonmedia.com>2020-12-16 08:11:53 +0100
commit7bc109da82a27fe67c02b5110ccefea4ce818b34 (patch)
tree6fe0403fbf6f5b0be3ab5516a825261aeb4e7038 /clustercontroller-apps
parentfe022d3df48b8e840696fe7ed92f91e1a1c56e5d (diff)
Inject VespaZooKeeperServer in constructor
Diffstat (limited to 'clustercontroller-apps')
-rw-r--r--clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java8
1 files changed, 7 insertions, 1 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 49538e476d1..202c154d676 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
@@ -11,6 +11,7 @@ import com.yahoo.vespa.clustercontroller.core.RemoteClusterControllerTaskSchedul
import com.yahoo.vespa.clustercontroller.core.restapiv2.ClusterControllerStateRestAPI;
import com.yahoo.vespa.clustercontroller.core.status.StatusHandler;
import com.yahoo.vespa.curator.Curator;
+import com.yahoo.vespa.zookeeper.VespaZooKeeperServer;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -29,8 +30,13 @@ public class ClusterController extends AbstractComponent
private final Map<String, FleetController> controllers = new TreeMap<>();
private final Map<String, StatusHandler.ContainerStatusPageServer> status = new TreeMap<>();
+ @SuppressWarnings("unused")
@Inject
- public ClusterController() {
+ public ClusterController(VespaZooKeeperServer ignored) {
+ this();
+ }
+
+ ClusterController() {
metricWrapper = new JDiscMetricWrapper(null);
}