aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/main/java/com/yahoo
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2020-11-11 11:42:31 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2020-11-11 11:42:31 +0100
commitb5150229ade132af490562a37484c9969e8b12e1 (patch)
tree9317d4a8add9fab1d5785dfdda10d4f09c80cbfc /config-model/src/main/java/com/yahoo
parent8898c57ea0a2376b8ab77aa9e675f51afac99b84 (diff)
Ensure ZK server has started before ReindexingMaintainer
Diffstat (limited to 'config-model/src/main/java/com/yahoo')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java4
1 files changed, 4 insertions, 0 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 1364d74fa11..96c10879bf1 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
@@ -56,6 +56,10 @@ public class ClusterControllerContainer extends Container implements
"com.yahoo.vespa.clustercontroller.apps.clustercontroller.StandaloneZooKeeperProvider",
CLUSTERCONTROLLER_BUNDLE);
} else {
+ addComponent(
+ "clustercontroller-zkrunner",
+ "com.yahoo.vespa.zookeeper.DummyVespaZooKeeperServer",
+ new ComponentSpecification("zookeeper-server-common"));
addComponent("clustercontroller-zkprovider",
"com.yahoo.vespa.clustercontroller.apps.clustercontroller.DummyZooKeeperProvider",
CLUSTERCONTROLLER_BUNDLE);