Repository: zookeeper
Updated Branches:
  refs/heads/branch-3.5 5d85cfa34 -> d7c26e33f


ZOOKEEPER-2865: Document a new error condition for reconfig.


Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/d7c26e33
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/d7c26e33
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/d7c26e33

Branch: refs/heads/branch-3.5
Commit: d7c26e33f29089eb976ea1ca15debae33828b2e4
Parents: 5d85cfa
Author: Alexander Shraer <ashr...@apple.com>
Authored: Sat Aug 5 21:22:30 2017 -0700
Committer: Michael Han <h...@apache.org>
Committed: Sat Aug 5 21:24:42 2017 -0700

----------------------------------------------------------------------
 docs/zookeeperReconfig.html                                    | 4 ++++
 src/docs/src/documentation/content/xdocs/zookeeperReconfig.xml | 4 ++++
 2 files changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zookeeper/blob/d7c26e33/docs/zookeeperReconfig.html
----------------------------------------------------------------------
diff --git a/docs/zookeeperReconfig.html b/docs/zookeeperReconfig.html
index 05e00e5..d3d6a26 100644
--- a/docs/zookeeperReconfig.html
+++ b/docs/zookeeperReconfig.html
@@ -859,6 +859,10 @@ zk.getConfig(watcher, callback, context);</pre>
         
 </div>
 </div>
+<p>If the configuration of existing servers changes or they become unavailable
+          before the joiner succeeds to connect and learn obout configuration 
changes, the
+          joiner may need to be restarted with an updated configuration file 
in order to be
+          able to connect.</p>
 <p>Finally, note that once connected to the leader, a joiner adopts
           the last committed configuration, in which it is absent (the initial
           config of the joiner is backed up before being rewritten). If the

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/d7c26e33/src/docs/src/documentation/content/xdocs/zookeeperReconfig.xml
----------------------------------------------------------------------
diff --git a/src/docs/src/documentation/content/xdocs/zookeeperReconfig.xml 
b/src/docs/src/documentation/content/xdocs/zookeeperReconfig.xml
index 5dd6c9e..a6b0701 100644
--- a/src/docs/src/documentation/content/xdocs/zookeeperReconfig.xml
+++ b/src/docs/src/documentation/content/xdocs/zookeeperReconfig.xml
@@ -555,6 +555,10 @@ zk.getConfig(watcher, callback, context);</programlisting>
             independently from your main ensemble. It is OK to list multiple
             joiners as observers in an initial config.</para>
         </note>
+        <para>If the configuration of existing servers changes or they become 
unavailable
+          before the joiner succeeds to connect and learn obout configuration 
changes, the
+          joiner may need to be restarted with an updated configuration file 
in order to be
+          able to connect.</para>
         <para>Finally, note that once connected to the leader, a joiner adopts
           the last committed configuration, in which it is absent (the initial
           config of the joiner is backed up before being rewritten). If the

Reply via email to