Flag service for orchestrated restart when ZK myid changes

3 files changed, 3 insertions, 3 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RestartConfigs.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RestartConfigs.java
index eccb903df3a..62e80586dc2 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RestartConfigs.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RestartConfigs.java
@@ -18,7 +18,7 @@ import java.lang.annotation.Target;
  * This is different the inheritance that {@link java.lang.annotation.Inherited} provides, where sub-classes can either
  * inherit or override the annotation from the super class.
  *
- * NOTE: This annotation is will only have effect on subclasses of {@link com.yahoo.vespa.model.Service}.
+ * NOTE: This annotation will only have effect on subclasses of {@link com.yahoo.vespa.model.Service}.
  *       Do not use this annotation on other types config producers.
  *
  * @author bjorncs
diff --git a/configdefinitions/src/vespa/zookeeper-server.def b/configdefinitions/src/vespa/zookeeper-server.def
index 2e80f9b35e0..39785afd681 100644
--- a/configdefinitions/src/vespa/zookeeper-server.def
+++ b/configdefinitions/src/vespa/zookeeper-server.def
@@ -28,7 +28,7 @@ myidFile string default="var/zookeeper/myid"
 # Change from default of 1 Mb in zookeeper to 50 Mb
 juteMaxBuffer int default=52428800
 
-myid int
+myid int restart
 server[].id int
 server[].hostname string
 server[].quorumPort int default=2182
diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java
index 045538b2d7e..9c2a543d2ef 100644
--- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java
+++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java
@@ -54,7 +54,7 @@ public class Reconfigurer extends AbstractComponent {
     void startOrReconfigure(ZookeeperServerConfig newConfig, VespaZooKeeperServer server,
                             Supplier<QuorumPeer> quorumPeerGetter, Consumer<QuorumPeer> quorumPeerSetter) {
         if (zooKeeperRunner == null) {
-            peer = quorumPeerGetter.get(); // Obtain the peer from the server. This will be shared with laters servers.
+            peer = quorumPeerGetter.get(); // Obtain the peer from the server. This will be shared with later servers.
             zooKeeperRunner = startServer(newConfig, server);
         }
         quorumPeerSetter.accept(peer);