diff options
| author | Harald Musum <musum@verizonmedia.com> | 2019-10-24 13:43:54 +0200 |
|---|---|---|
| committer | Harald Musum <musum@verizonmedia.com> | 2019-10-24 13:43:54 +0200 |
| commit | 907dfbc0842202a75be87a126698da8cece031d1 (patch) | |
| tree | d43c05320df90473fc4823d71b9ef3271cd71d3d /zkfacade | |
| parent | d36f55c5e067ebe8e929a23f236f8498144e785f (diff) | |
Create VespaZooKeeperServer interface and use where appropriate
Diffstat (limited to 'zkfacade')
| -rw-r--r-- | zkfacade/abi-spec.json | 2 | ||||
| -rw-r--r-- | zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/zkfacade/abi-spec.json b/zkfacade/abi-spec.json index 27027287d39..9cc49d20262 100644 --- a/zkfacade/abi-spec.json +++ b/zkfacade/abi-spec.json @@ -68,7 +68,7 @@ "methods": [ "public static com.yahoo.vespa.curator.Curator create(java.lang.String)", "public void <init>(com.yahoo.cloud.config.ConfigserverConfig)", - "public void <init>(com.yahoo.cloud.config.ConfigserverConfig, com.yahoo.vespa.zookeeper.ZooKeeperServer)", + "public void <init>(com.yahoo.cloud.config.ConfigserverConfig, com.yahoo.vespa.zookeeper.VespaZooKeeperServer)", "protected void <init>(java.lang.String, java.lang.String, java.util.function.Function)", "public java.lang.String connectionSpec()", "public org.apache.curator.framework.recipes.atomic.DistributedAtomicLong createAtomicCounter(java.lang.String)", diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java index dc51c82b5e6..c8aea1f3d21 100644 --- a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java +++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java @@ -6,7 +6,7 @@ import com.yahoo.cloud.config.ConfigserverConfig; import com.yahoo.net.HostName; import com.yahoo.path.Path; import com.yahoo.vespa.curator.recipes.CuratorCounter; -import com.yahoo.vespa.zookeeper.ZooKeeperServer; +import com.yahoo.vespa.zookeeper.VespaZooKeeperServer; import org.apache.curator.RetryPolicy; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; @@ -72,7 +72,7 @@ public class Curator implements AutoCloseable { // Depend on ZooKeeperServer to make sure it is started first // TODO: Move zookeeperserver config out of configserverconfig (requires update of controller services.xml as well) @Inject - public Curator(ConfigserverConfig configserverConfig, ZooKeeperServer server) { + public Curator(ConfigserverConfig configserverConfig, VespaZooKeeperServer server) { this(configserverConfig, createConnectionSpec(configserverConfig)); } |