diff options
| author | Harald Musum <musum@verizonmedia.com> | 2021-03-02 07:12:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-02 07:12:26 +0100 |
| commit | 876ef2eae02b15a3220a9d7985ae4331348dc040 (patch) | |
| tree | 6f170c94200763b9ede43245d20cabb123cf9fec | |
| parent | 2e743e722ba395dc22755ab22bf2ae2bac2d9522 (diff) | |
| parent | 446699adb5163359e17af7548f68e7464bd06a5b (diff) | |
Merge pull request #16707 from vespa-engine/hmusum/enable-reconfigurable-zookeeper-server-for-cluster-controller-by-default
Enable reconfigurable-zookeeper-server-for-cluster-controller by default [run-systemtest]
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java | 2 | ||||
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 2 |
2 files changed, 2 insertions, 2 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 1e4a3b1e003..f55d179b184 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 @@ -89,7 +89,7 @@ public class ClusterControllerContainer extends Container implements } private void configureZooKeeperServer(boolean runStandaloneZooKeeper, boolean reconfigurable) { - if (reconfigurable) { + if (reconfigurable && runStandaloneZooKeeper) { ContainerModelBuilder.addReconfigurableZooKeeperServerComponents(this); } else { addComponent("clustercontroller-zookeeper-server", diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index e53195e3a71..0a29382b93d 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -207,7 +207,7 @@ public class Flags { APPLICATION_ID); public static final UnboundBooleanFlag RECONFIGURABLE_ZOOKEEPER_SERVER_FOR_CLUSTER_CONTROLLER = defineFeatureFlag( - "reconfigurable-zookeeper-server-for-cluster-controller", false, + "reconfigurable-zookeeper-server-for-cluster-controller", true, List.of("musum", "mpolden"), "2020-12-16", "2021-03-16", "Whether to use reconfigurable zookeeper server for cluster controller", "Takes effect on (re)redeployment", |