summaryrefslogtreecommitdiffstats
path: root/clustercontroller-apps
diff options
context:
space:
mode:
Diffstat (limited to 'clustercontroller-apps')
-rw-r--r--clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java8
1 files changed, 1 insertions, 7 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 05daa43690c..1eca2d18493 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,7 +11,6 @@ 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.Reconfigurer;
import com.yahoo.vespa.zookeeper.VespaZooKeeperServer;
import java.util.LinkedHashMap;
@@ -32,19 +31,14 @@ public class ClusterController extends AbstractComponent
private final Map<String, FleetController> controllers = new TreeMap<>();
private final Map<String, StatusHandler.ContainerStatusPageServer> status = new TreeMap<>();
- ClusterController() {
- this(null);
- }
-
/**
* Dependency injection constructor for controller. A {@link VespaZooKeeperServer} argument is required
* for all its users, to ensure that zookeeper has started before we start polling it, but
* should not be injected here, as that causes recreation of the cluster controller, and old and new
* will run master election, etc., concurrently, which breaks everything.
- * Instead, a {@link Reconfigurer} is injected to ensure this is shutdown before the ZK server owned by that.
*/
@Inject
- public ClusterController(Reconfigurer unused) {
+ public ClusterController() {
metricWrapper = new JDiscMetricWrapper(null);
}