Keep track of config in use

3 files changed, 7 insertions, 7 deletions

diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java
index b92d49e2595..5f945b5ea1d 100644
--- a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java
+++ b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java
@@ -27,6 +27,7 @@ public class Reconfigurer extends AbstractComponent {
     private static final int sessionTimeoutInSeconds = 30;
 
     private ZooKeeperRunner zooKeeperRunner;
+    private ZookeeperServerConfig zookeeperServerConfig;
 
     @Inject
     public Reconfigurer() {
@@ -39,6 +40,8 @@ public class Reconfigurer extends AbstractComponent {
 
         if (shouldReconfigure(newConfig))
             reconfigure(new ReconfigurationInfo(existingConfig(), newConfig));
+
+        this.zookeeperServerConfig = newConfig;
     }
 
     boolean shouldReconfigure(ZookeeperServerConfig newConfig) {
@@ -90,7 +93,7 @@ public class Reconfigurer extends AbstractComponent {
     }
 
     ZookeeperServerConfig existingConfig() {
-        return zooKeeperRunner.zookeeperServerConfig();
+        return zookeeperServerConfig;
     }
 
     static class ReconfigurationInfo {
diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java
index 34c513a9457..7b7ec1fd3ec 100644
--- a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java
+++ b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java
@@ -45,8 +45,4 @@ public class ZooKeeperRunner implements Runnable {
         org.apache.zookeeper.server.quorum.QuorumPeerMain.main(args);
     }
 
-    public ZookeeperServerConfig zookeeperServerConfig() {
-        return zookeeperServerConfig;
-    }
-
 }
diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/test/java/com/yahoo/vespa/zookeeper/ReconfigurerTest.java b/zookeeper-server/zookeeper-server-3.5.6/src/test/java/com/yahoo/vespa/zookeeper/ReconfigurerTest.java
index 41b7a065495..3086cf8b43e 100644
--- a/zookeeper-server/zookeeper-server-3.5.6/src/test/java/com/yahoo/vespa/zookeeper/ReconfigurerTest.java
+++ b/zookeeper-server/zookeeper-server-3.5.6/src/test/java/com/yahoo/vespa/zookeeper/ReconfigurerTest.java
@@ -37,8 +37,9 @@ public class ReconfigurerTest {
     @Test
     public void testStartupAndReconfigure() {
         Reconfigurer reconfigurer = new Reconfigurer();
-        ZookeeperServerConfig existingConfig = createConfig(2);
-        reconfigurer.startOrReconfigure(existingConfig);
+        ZookeeperServerConfig initialConfig = createConfig(2);
+        reconfigurer.startOrReconfigure(initialConfig);
+        assertEquals(initialConfig, reconfigurer.existingConfig());
 
         // Created config has dynamicReconfig set to false
         assertFalse(reconfigurer.shouldReconfigure(createConfig(3)));