diff options
| author | Harald Musum <musum@yahooinc.com> | 2023-01-02 11:41:26 +0100 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2023-01-02 11:41:26 +0100 |
| commit | 66cdf03154bc7796820e0e0789553ea50ebf7e9b (patch) | |
| tree | 8c2f2d69b0a44205e1cb71ede4bee9551ad72ff8 /zookeeper-server | |
| parent | dee2c0c87e83ff11c6d1f5a68fc68e679a1a076e (diff) | |
Simplify
Diffstat (limited to 'zookeeper-server')
| -rw-r--r-- | zookeeper-server/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/ConfigServerZooKeeperServer.java | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/zookeeper-server/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/ConfigServerZooKeeperServer.java b/zookeeper-server/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/ConfigServerZooKeeperServer.java index 803cf224042..1cb88662fc8 100644 --- a/zookeeper-server/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/ConfigServerZooKeeperServer.java +++ b/zookeeper-server/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/ConfigServerZooKeeperServer.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.zookeeper; -import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.cloud.config.ZookeeperServerConfig; import com.yahoo.component.AbstractComponent; import com.yahoo.component.annotation.Inject; @@ -9,8 +8,8 @@ import java.nio.file.Path; /** * - * Server used for starting config server, needed to be able to have different behavior for hosted and - * self-hosted Vespa. + * Server used for starting config server, needed to be able to be able to have different behavior for hosted and + * self-hosted Vespa (controlled by zookeeperServerConfig.dynamicReconfiguration). * * @author Harald Musum */ @@ -19,11 +18,10 @@ public class ConfigServerZooKeeperServer extends AbstractComponent implements Ve private final VespaZooKeeperServer zooKeeperServer; @Inject - public ConfigServerZooKeeperServer(ZookeeperServerConfig zookeeperServerConfig, ConfigserverConfig configserverConfig) { - if (configserverConfig.hostedVespa()) - this.zooKeeperServer = new ReconfigurableVespaZooKeeperServer(new Reconfigurer(new VespaZooKeeperAdminImpl()), zookeeperServerConfig); - else - this.zooKeeperServer = new VespaZooKeeperServerImpl(zookeeperServerConfig); + public ConfigServerZooKeeperServer(ZookeeperServerConfig zookeeperServerConfig) { + this.zooKeeperServer = zookeeperServerConfig.dynamicReconfiguration() + ? new ReconfigurableVespaZooKeeperServer(new Reconfigurer(new VespaZooKeeperAdminImpl()), zookeeperServerConfig) + : new VespaZooKeeperServerImpl(zookeeperServerConfig); } @Override |