You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2016/03/14 07:57:11 UTC
svn commit: r1734882 - in /zookeeper/branches/branch-3.5: ./ docs/
src/docs/src/documentation/content/xdocs/
Author: phunt
Date: Mon Mar 14 06:57:10 2016
New Revision: 1734882
URL: http://svn.apache.org/viewvc?rev=1734882&view=rev
Log:
ZOOKEEPER-2283 traceFile property is not used in the ZooKeeper, it should be removed from documentation (Arshad Mohammad via phunt)
Modified:
zookeeper/branches/branch-3.5/CHANGES.txt
zookeeper/branches/branch-3.5/docs/index.html
zookeeper/branches/branch-3.5/docs/index.pdf
zookeeper/branches/branch-3.5/docs/javaExample.html
zookeeper/branches/branch-3.5/docs/javaExample.pdf
zookeeper/branches/branch-3.5/docs/linkmap.html
zookeeper/branches/branch-3.5/docs/linkmap.pdf
zookeeper/branches/branch-3.5/docs/recipes.html
zookeeper/branches/branch-3.5/docs/recipes.pdf
zookeeper/branches/branch-3.5/docs/zookeeperAdmin.html
zookeeper/branches/branch-3.5/docs/zookeeperAdmin.pdf
zookeeper/branches/branch-3.5/docs/zookeeperHierarchicalQuorums.html
zookeeper/branches/branch-3.5/docs/zookeeperHierarchicalQuorums.pdf
zookeeper/branches/branch-3.5/docs/zookeeperInternals.html
zookeeper/branches/branch-3.5/docs/zookeeperInternals.pdf
zookeeper/branches/branch-3.5/docs/zookeeperJMX.html
zookeeper/branches/branch-3.5/docs/zookeeperJMX.pdf
zookeeper/branches/branch-3.5/docs/zookeeperObservers.html
zookeeper/branches/branch-3.5/docs/zookeeperObservers.pdf
zookeeper/branches/branch-3.5/docs/zookeeperOver.html
zookeeper/branches/branch-3.5/docs/zookeeperOver.pdf
zookeeper/branches/branch-3.5/docs/zookeeperProgrammers.html
zookeeper/branches/branch-3.5/docs/zookeeperProgrammers.pdf
zookeeper/branches/branch-3.5/docs/zookeeperQuotas.html
zookeeper/branches/branch-3.5/docs/zookeeperQuotas.pdf
zookeeper/branches/branch-3.5/docs/zookeeperReconfig.html
zookeeper/branches/branch-3.5/docs/zookeeperReconfig.pdf
zookeeper/branches/branch-3.5/docs/zookeeperStarted.html
zookeeper/branches/branch-3.5/docs/zookeeperStarted.pdf
zookeeper/branches/branch-3.5/docs/zookeeperTutorial.html
zookeeper/branches/branch-3.5/docs/zookeeperTutorial.pdf
zookeeper/branches/branch-3.5/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Mon Mar 14 06:57:10 2016
@@ -126,6 +126,9 @@ BUGFIXES:
ZOOKEEPER-2133 zkperl: Segmentation fault if getting a node with
null value (Botond Hejj via phunt)
+ ZOOKEEPER-2283 traceFile property is not used in the ZooKeeper, it
+ should be removed from documentation (Arshad Mohammad via phunt)
+
IMPROVEMENTS:
ZOOKEEPER-2270: Allow MBeanRegistry to be overridden for better unit tests
Modified: zookeeper/branches/branch-3.5/docs/index.html
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/index.html?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/docs/index.html (original)
+++ zookeeper/branches/branch-3.5/docs/index.html Mon Mar 14 06:57:10 2016
@@ -67,7 +67,7 @@
<a class="unselected" href="https://cwiki.apache.org/confluence/display/ZOOKEEPER/">Wiki</a>
</li>
<li class="current">
-<a class="selected" href="index.html">ZooKeeper 3.4 Documentation</a>
+<a class="selected" href="index.html">ZooKeeper 3.5 Documentation</a>
</li>
</ul>
<!--+
Modified: zookeeper/branches/branch-3.5/docs/index.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/index.pdf?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/branches/branch-3.5/docs/javaExample.html
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/javaExample.html?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/docs/javaExample.html (original)
+++ zookeeper/branches/branch-3.5/docs/javaExample.html Mon Mar 14 06:57:10 2016
@@ -149,6 +149,9 @@ document.write("Last Published: " + docu
<div class="menuitem">
<a href="zookeeperObservers.html">Observers Guide</a>
</div>
+<div class="menuitem">
+<a href="zookeeperReconfig.html">Dynamic Reconfiguration</a>
+</div>
</div>
<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Contributor</div>
<div id="menu_1.4" class="menuitemgroup">
Modified: zookeeper/branches/branch-3.5/docs/javaExample.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/javaExample.pdf?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/branches/branch-3.5/docs/linkmap.html
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/linkmap.html?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/docs/linkmap.html (original)
+++ zookeeper/branches/branch-3.5/docs/linkmap.html Mon Mar 14 06:57:10 2016
@@ -149,6 +149,9 @@ document.write("Last Published: " + docu
<div class="menuitem">
<a href="zookeeperObservers.html">Observers Guide</a>
</div>
+<div class="menuitem">
+<a href="zookeeperReconfig.html">Dynamic Reconfiguration</a>
+</div>
</div>
<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Contributor</div>
<div id="menu_1.4" class="menuitemgroup">
@@ -302,6 +305,12 @@ document.write("Last Published: " + docu
<a href="zookeeperObservers.html">Observers Guide</a> ___________________ <em>observers</em>
</li>
</ul>
+
+<ul>
+<li>
+<a href="zookeeperReconfig.html">Dynamic Reconfiguration</a> ___________________ <em>reconfig</em>
+</li>
+</ul>
</ul>
</ul>
Modified: zookeeper/branches/branch-3.5/docs/linkmap.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/linkmap.pdf?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/branches/branch-3.5/docs/recipes.html
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/recipes.html?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/docs/recipes.html (original)
+++ zookeeper/branches/branch-3.5/docs/recipes.html Mon Mar 14 06:57:10 2016
@@ -149,6 +149,9 @@ document.write("Last Published: " + docu
<div class="menuitem">
<a href="zookeeperObservers.html">Observers Guide</a>
</div>
+<div class="menuitem">
+<a href="zookeeperReconfig.html">Dynamic Reconfiguration</a>
+</div>
</div>
<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Contributor</div>
<div id="menu_1.4" class="menuitemgroup">
@@ -901,7 +904,7 @@ document.write("Last Published: " + docu
processes watching upon the current smallest znode, and checking if they
are the new leader when the smallest znode goes away (note that the
smallest znode will go away if the leader fails because the node is
- ephemeral). But this causes a herd effect: upon of failure of the current
+ ephemeral). But this causes a herd effect: upon a failure of the current
leader, all other processes receive a notification, and execute
getChildren on "/election" to obtain the current list of children of
"/election". If the number of clients is large, it causes a spike on the
Modified: zookeeper/branches/branch-3.5/docs/recipes.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/recipes.pdf?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/branches/branch-3.5/docs/zookeeperAdmin.html
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperAdmin.html?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/docs/zookeeperAdmin.html (original)
+++ zookeeper/branches/branch-3.5/docs/zookeeperAdmin.html Mon Mar 14 06:57:10 2016
@@ -67,7 +67,7 @@
<a class="unselected" href="https://cwiki.apache.org/confluence/display/ZOOKEEPER/">Wiki</a>
</li>
<li class="current">
-<a class="selected" href="index.html">ZooKeeper 3.4 Documentation</a>
+<a class="selected" href="index.html">ZooKeeper 3.5 Documentation</a>
</li>
</ul>
<!--+
@@ -276,7 +276,7 @@ document.write("Last Published: " + docu
<a href="#sc_clusterOptions">Cluster Options</a>
</li>
<li>
-<a href="#sc_authOptions">Authentication & Authorization Options</a>
+<a href="#sc_authOptions">Encryption, Authentication, Authorization Options</a>
</li>
<li>
<a href="#Experimental+Options%2FFeatures">Experimental Options/Features</a>
@@ -384,54 +384,124 @@ document.write("Last Published: " + docu
<h3 class="h4">System Requirements</h3>
<a name="sc_supportedPlatforms"></a>
<h4>Supported Platforms</h4>
+<p>ZooKeeper consists of multiple components. Some components are
+ supported broadly, and other components are supported only on a smaller
+ set of platforms.</p>
<ul>
<li>
-<p>GNU/Linux is supported as a development and production
- platform for both server and client.</p>
+<p>
+<strong>Client</strong> is the Java client
+ library, used by applications to connect to a ZooKeeper ensemble.
+ </p>
</li>
<li>
-<p>Sun Solaris is supported as a development and production
- platform for both server and client.</p>
+<p>
+<strong>Server</strong> is the Java server
+ that runs on the ZooKeeper ensemble nodes.</p>
</li>
<li>
-<p>FreeBSD is supported as a development and production
- platform for both server and client.</p>
+<p>
+<strong>Native Client</strong> is a client
+ implemented in C, similar to the Java client, used by applications
+ to connect to a ZooKeeper ensemble.</p>
</li>
<li>
-<p>Win32 is supported as a <em>development
- platform</em> only for both server and client.</p>
+<p>
+<strong>Contrib</strong> refers to multiple
+ optional add-on components.</p>
</li>
+
+</ul>
+<p>The following matrix describes the level of support committed for
+ running each component on different operating system platforms.</p>
+<table class="ForrestTable" cellspacing="1" cellpadding="4">
+<caption>Support Matrix</caption>
-<li>
-
-<p>Win64 is supported as a <em>development
- platform</em> only for both server and client.</p>
-
-</li>
+<title>Support Matrix</title>
-<li>
+
+<tr>
+
+<th>Operating System</th>
+ <th>Client</th>
+ <th>Server</th>
+ <th>Native Client</th>
+ <th>Contrib</th>
+
+</tr>
+
+
+<tr>
+
+<td>GNU/Linux</td>
+ <td>Development and Production</td>
+ <td>Development and Production</td>
+ <td>Development and Production</td>
+ <td>Development and Production</td>
+
+</tr>
+
+<tr>
+
+<td>Solaris</td>
+ <td>Development and Production</td>
+ <td>Development and Production</td>
+ <td>Not Supported</td>
+ <td>Not Supported</td>
+
+</tr>
+
+<tr>
+
+<td>FreeBSD</td>
+ <td>Development and Production</td>
+ <td>Development and Production</td>
+ <td>Not Supported</td>
+ <td>Not Supported</td>
+
+</tr>
+
+<tr>
+
+<td>Windows</td>
+ <td>Development and Production</td>
+ <td>Development and Production</td>
+ <td>Not Supported</td>
+ <td>Not Supported</td>
+
+</tr>
+
+<tr>
+
+<td>Mac OS X</td>
+ <td>Development Only</td>
+ <td>Development Only</td>
+ <td>Not Supported</td>
+ <td>Not Supported</td>
+
+</tr>
-<p>MacOSX is supported as a <em>development
- platform</em> only for both server and client.</p>
-
-</li>
-</ul>
+</table>
+<p>For any operating system not explicitly mentioned as supported in
+ the matrix, components may or may not work. The ZooKeeper community
+ will fix obvious bugs that are reported for other platforms, but there
+ is no full support.</p>
<a name="sc_requiredSoftware"></a>
<h4>Required Software </h4>
-<p>ZooKeeper runs in Java, release 1.6 or greater (JDK 6 or
+<p>ZooKeeper runs in Java, release 1.7 or greater (JDK 7 or
greater, FreeBSD support requires openjdk7). It runs as an
<em>ensemble</em> of ZooKeeper servers. Three
ZooKeeper servers is the minimum recommended size for an
@@ -449,27 +519,6 @@ document.write("Last Published: " + docu
only handle the failure of a single machine; if two machines fail, the
remaining two machines do not constitute a majority. However, with five
machines ZooKeeper can handle the failure of two machines. </p>
-
-<div class="note">
-<div class="label">Note</div>
-<div class="content">
-<p>As mentioned in the Getting Started guide, a minimum of three servers are
- required for a fault tolerant clustered setup, and it is strongly
- recommended that you have an odd number of servers.</p>
-<p>Usually three servers is more than enough for a production install, but
- for maximum reliability during maintenance, you may wish to install
- five servers. With three servers, if you perform maintenance on
- one of them, you are vulnerable to a failure on one of the other
- two servers during that maintenance. If you have five of them
- running, you can take one down for maintenance, and know that
- you're still OK if one of the other four suddenly fails.</p>
-<p>Your redundancy considerations should include all aspects of your
- environment. If you have three zookeeper servers, but their
- network cables are all plugged into the same network switch, then
- the failure of that switch will take down your entire ensemble.</p>
-</div>
-</div>
-
<p>Here are the steps to setting a server that will be part of an
ensemble. These steps should be performed on every host in the
ensemble:</p>
@@ -846,7 +895,7 @@ server.3=zoo3:2888:3888</pre>
<a name="Single+Machine+Requirements"></a>
<h4>Single Machine Requirements</h4>
<p>If ZooKeeper has to contend with other applications for
- access to resourses like storage media, CPU, network, or
+ access to resources like storage media, CPU, network, or
memory, its performance will suffer markedly. ZooKeeper has
strong durability guarantees, which means it uses storage
media to log changes before the operation responsible for the
@@ -960,6 +1009,16 @@ server.3=zoo3:2888:3888</pre>
examples) managing your ZooKeeper server ensures that if the
process does exit abnormally it will automatically be restarted
and will quickly rejoin the cluster.</p>
+<p>It is also recommended to configure the ZooKeeper server process to
+ terminate and dump its heap if an
+ <span class="codefrag computeroutput">OutOfMemoryError</span> occurs. This is achieved
+ by launching the JVM with the following arguments on Linux and Windows
+ respectively. The <span class="codefrag filename">zkServer.sh</span> and
+ <span class="codefrag filename">zkServer.cmd</span> scripts that ship with ZooKeeper set
+ these options.
+ </p>
+<pre class="code">-XX:+HeapDumpOnOutOfMemoryError -XX:OnOutOfMemoryError='kill -9 %p'</pre>
+<pre class="code">"-XX:+HeapDumpOnOutOfMemoryError" "-XX:OnOutOfMemoryError=cmd /c taskkill /pid %%%%p /t /f"</pre>
<a name="sc_monitoring"></a>
<h3 class="h4">Monitoring</h3>
<p>The ZooKeeper service can be monitored in one of two
@@ -967,12 +1026,22 @@ server.3=zoo3:2888:3888</pre>
your environment/requirements.</p>
<a name="sc_logging"></a>
<h3 class="h4">Logging</h3>
-<p>ZooKeeper uses <strong>log4j</strong> version 1.2 as
- its logging infrastructure. The ZooKeeper default <span class="codefrag filename">log4j.properties</span>
- file resides in the <span class="codefrag filename">conf</span> directory. Log4j requires that
- <span class="codefrag filename">log4j.properties</span> either be in the working directory
- (the directory from which ZooKeeper is run) or be accessible from the classpath.</p>
-<p>For more information, see
+<p>
+ ZooKeeper uses <strong><a href="http://www.slf4j.org">SLF4J</a></strong>
+ version 1.7 as its logging infrastructure. For backward compatibility it is bound to
+ <strong>LOG4J</strong> but you can use
+ <strong><a href="http://logback.qos.ch/">LOGBack</a></strong>
+ or any other supported logging framework of your choice.
+ </p>
+<p>
+ The ZooKeeper default <span class="codefrag filename">log4j.properties</span>
+ file resides in the <span class="codefrag filename">conf</span> directory. Log4j requires that
+ <span class="codefrag filename">log4j.properties</span> either be in the working directory
+ (the directory from which ZooKeeper is run) or be accessible from the classpath.
+ </p>
+<p>For more information about SLF4J, see
+ <a href="http://www.slf4j.org/manual.html">its manual</a>.</p>
+<p>For more information about LOG4J, see
<a href="http://logging.apache.org/log4j/1.2/manual.html#defaultInit">Log4j Default Initialization Procedure</a>
of the log4j manual.</p>
<a name="sc_troubleshooting"></a>
@@ -1031,6 +1100,22 @@ server.3=zoo3:2888:3888</pre>
<dt>
+<term>secureClientPort</term>
+</dt>
+<dd>
+<p>the port to listen on for secure client connections using SSL.
+
+ <strong>clientPort</strong> specifies
+ the port for plaintext connections while <strong>
+ secureClientPort</strong> specifies the port for SSL
+ connections. Specifying both enables mixed-mode while omitting
+ either will disable that mode.</p>
+<p>Note that SSL feature will be enabled when user plugs-in
+ zookeeper.serverCnxnFactory, zookeeper.clientCnxnSocket as Netty.</p>
+</dd>
+
+
+<dt>
<term>dataDir</term>
</dt>
<dd>
@@ -1136,20 +1221,6 @@ server.3=zoo3:2888:3888</pre>
<dt>
-<term>traceFile</term>
-</dt>
-<dd>
-<p>(Java system property: <strong>requestTraceFile</strong>)</p>
-<p>If this option is defined, requests will be will logged to
- a trace file named traceFile.year.month.day. Use of this option
- provides useful debugging information, but will impact
- performance. (Note: The system property has no zookeeper prefix,
- and the configuration variable name is different from the system
- property. Yes - it's not consistent, and it's annoying.)</p>
-</dd>
-
-
-<dt>
<term>maxClientCnxns</term>
</dt>
<dd>
@@ -1434,16 +1505,16 @@ server.3=zoo3:2888:3888</pre>
</dl>
<p></p>
<a name="sc_authOptions"></a>
-<h4>Authentication & Authorization Options</h4>
+<h4>Encryption, Authentication, Authorization Options</h4>
<p>The options in this section allow control over
- authentication/authorization performed by the service.</p>
+ encryption/authentication/authorization performed by the service.</p>
<dl>
<dt>
-<term>zookeeper.DigestAuthenticationProvider.superDigest</term>
+<term>DigestAuthenticationProvider.superDigest</term>
</dt>
<dd>
-<p>(Java system property only: <strong>zookeeper.DigestAuthenticationProvider.superDigest</strong>)</p>
+<p>(Java system property: <strong>zookeeper.DigestAuthenticationProvider.superDigest</strong>)</p>
<p>By default this feature is <strong>disabled</strong>
</p>
<p>
@@ -1465,6 +1536,80 @@ server.3=zoo3:2888:3888</pre>
localhost (not over the network) or over an encrypted
connection.</p>
</dd>
+
+
+<dt>
+<term>X509AuthenticationProvider.superUser</term>
+</dt>
+<dd>
+<p>(Java system property: <strong>zookeeper.X509AuthenticationProvider.superUser</strong>)</p>
+<p>The SSL-backed way to enable a ZooKeeper ensemble
+ administrator to access the znode hierarchy as a "super" user.
+ When this parameter is set to an X500 principal name, only an
+ authenticated client with that principal will be able to bypass
+ ACL checking and have full privileges to all znodes.</p>
+</dd>
+
+
+<dt>
+<term>ssl.keyStore.location and ssl.keyStore.password</term>
+</dt>
+<dd>
+<p>(Java system properties: <strong>
+ zookeeper.ssl.keyStore.location</strong> and <strong>zookeeper.ssl.keyStore.password</strong>)</p>
+<p>Specifies the file path to a JKS containing the local
+ credentials to be used for SSL connections, and the
+ password to unlock the file.</p>
+</dd>
+
+
+<dt>
+<term>ssl.trustStore.location and ssl.trustStore.password</term>
+</dt>
+<dd>
+<p>(Java system properties: <strong>
+ zookeeper.ssl.trustStore.location</strong> and <strong>zookeeper.ssl.trustStore.password</strong>)</p>
+<p>Specifies the file path to a JKS containing the remote
+ credentials to be used for SSL connections, and the
+ password to unlock the file.</p>
+</dd>
+
+
+<dt>
+<term>ssl.authProvider</term>
+</dt>
+<dd>
+<p>(Java system property: <strong>zookeeper.ssl.authProvider</strong>)</p>
+<p>Specifies a subclass of <strong>
+ org.apache.zookeeper.auth.X509AuthenticationProvider</strong>
+ to use for secure client authentication. This is useful in
+ certificate key infrastructures that do not use JKS. It may be
+ necessary to extend <strong>javax.net.ssl.X509KeyManager
+ </strong> and <strong>javax.net.ssl.X509TrustManager</strong>
+ to get the desired behavior from the SSL stack. To configure the
+ ZooKeeper server to use the custom provider for authentication,
+ choose a scheme name for the custom AuthenticationProvider and
+ set the property <strong>zookeeper.authProvider.[scheme]
+ </strong> to the fully-qualified class name of the custom
+ implementation. This will load the provider into the ProviderRegistry.
+ Then set this property <strong>
+ zookeeper.ssl.authProvider=[scheme]</strong> and that provider
+ will be used for secure authentication.</p>
+</dd>
+
+
+<dt>
+<term>zookeeper.client.secure</term>
+</dt>
+<dd>
+<p>(Java system property only: <strong>zookeeper.client.secure</strong>)</p>
+<p>If you want to connect to server's secure client port, you need to
+ set this property to <strong>true</strong> on client.
+ This will connect to server using SSL with specified credentials. Note that
+ you also need to plug-in Netty client.
+ </p>
+</dd>
+
</dl>
<a name="Experimental+Options%2FFeatures"></a>
@@ -1660,13 +1805,36 @@ server.3=zoo3:2888:3888</pre>
</p>
</dd>
+
+<dt>
+<term>znode.container.checkIntervalMs</term>
+</dt>
+<dd>
+<p>(Java system property only)</p>
+<p>
+<strong>New in 3.5.1:</strong> The
+ time interval in milliseconds for each check of candidate container
+ nodes. Default is "60000".</p>
+</dd>
+
+
+<dt>
+<term>znode.container.maxPerMinute</term>
+</dt>
+<dd>
+<p>(Java system property only)</p>
+<p>
+<strong>New in 3.5.1:</strong> The
+ maximum number of container nodes that can be deleted per
+ minute. This prevents herding during container deletion.
+ Default is "10000".</p>
+</dd>
</dl>
<a name="Communication+using+the+Netty+framework"></a>
<h4>Communication using the Netty framework</h4>
<p>
-<strong>New in
- 3.4:</strong> <a href="http://jboss.org/netty">Netty</a>
+<a href="http://netty.io">Netty</a>
is an NIO based client/server communication framework, it
simplifies (over NIO being used directly) many of the
complexities of network level communication for java
@@ -1675,16 +1843,12 @@ server.3=zoo3:2888:3888</pre>
(certificates). These are optional features and can be
turned on or off individually.
</p>
-<p>Prior to version 3.4 ZooKeeper has always used NIO
- directly, however in versions 3.4 and later Netty is
- supported as an option to NIO (replaces). NIO continues to
- be the default, however Netty based communication can be
- used in place of NIO by setting the environment variable
- "zookeeper.serverCnxnFactory" to
- "org.apache.zookeeper.server.NettyServerCnxnFactory". You
- have the option of setting this on either the client(s) or
- server(s), typically you would want to set this on both,
- however that is at your discretion.
+<p>In versions 3.5+, a ZooKeeper server can use Netty
+ instead of NIO (default option) by setting the environment
+ variable <strong>zookeeper.serverCnxnFactory</strong>
+ to <strong>org.apache.zookeeper.server.NettyServerCnxnFactory</strong>;
+ for the client, set <strong>zookeeper.clientCnxnSocket</strong>
+ to <strong>org.apache.zookeeper.ClientCnxnSocketNetty</strong>.
</p>
<p>
TBD - tuning options for netty - currently there are none that are netty specific but we should add some. Esp around max bound on the number of reader worker threads netty creates.
@@ -1713,6 +1877,15 @@ server.3=zoo3:2888:3888</pre>
<dt>
+<term>admin.serverAddress</term>
+</dt>
+<dd>
+<p>(Java system property: <strong>zookeeper.admin.serverAddress</strong>)</p>
+<p>The address the embedded Jetty server listens on. Defaults to 0.0.0.0.</p>
+</dd>
+
+
+<dt>
<term>admin.serverPort</term>
</dt>
<dd>
@@ -1860,6 +2033,17 @@ server.3=zoo3:2888:3888</pre>
<dt>
+<term>dirs</term>
+</dt>
+<dd>
+<p>
+<strong>New in 3.5.1:</strong>
+ Shows the total size of snapshot and log files in bytes
+ </p>
+</dd>
+
+
+<dt>
<term>wchp</term>
</dt>
<dd>
@@ -1907,6 +2091,141 @@ server.3=zoo3:2888:3888</pre>
<p>The output contains multiple lines with the following format:</p>
<pre class="code">key \t value</pre>
</dd>
+
+
+<dt>
+<term>isro</term>
+</dt>
+<dd>
+<p>
+<strong>New in 3.4.0:</strong> Tests if
+ server is running in read-only mode. The server will respond with
+ "ro" if in read-only mode or "rw" if not in read-only mode.</p>
+</dd>
+
+
+<dt>
+<term>gtmk</term>
+</dt>
+<dd>
+<p>Gets the current trace mask as a 64-bit signed long value in
+ decimal format. See <span class="codefrag command">stmk</span> for an explanation of
+ the possible values.</p>
+</dd>
+
+
+<dt>
+<term>stmk</term>
+</dt>
+<dd>
+<p>Sets the current trace mask. The trace mask is 64 bits,
+ where each bit enables or disables a specific category of trace
+ logging on the server. Log4J must be configured to enable
+ <span class="codefrag command">TRACE</span> level first in order to see trace logging
+ messages. The bits of the trace mask correspond to the following
+ trace logging categories.</p>
+<table class="ForrestTable" cellspacing="1" cellpadding="4">
+<caption>Trace Mask Bit Values</caption>
+
+<title>Trace Mask Bit Values</title>
+
+
+<tr>
+
+<td>0b0000000000</td>
+ <td>Unused, reserved for future use.</td>
+
+</tr>
+
+<tr>
+
+<td>0b0000000010</td>
+ <td>Logs client requests, excluding ping
+ requests.</td>
+
+</tr>
+
+<tr>
+
+<td>0b0000000100</td>
+ <td>Unused, reserved for future use.</td>
+
+</tr>
+
+<tr>
+
+<td>0b0000001000</td>
+ <td>Logs client ping requests.</td>
+
+</tr>
+
+<tr>
+
+<td>0b0000010000</td>
+ <td>Logs packets received from the quorum peer that is
+ the current leader, excluding ping requests.</td>
+
+</tr>
+
+<tr>
+
+<td>0b0000100000</td>
+ <td>Logs addition, removal and validation of client
+ sessions.</td>
+
+</tr>
+
+<tr>
+
+<td>0b0001000000</td>
+ <td>Logs delivery of watch events to client
+ sessions.</td>
+
+</tr>
+
+<tr>
+
+<td>0b0010000000</td>
+ <td>Logs ping packets received from the quorum peer
+ that is the current leader.</td>
+
+</tr>
+
+<tr>
+
+<td>0b0100000000</td>
+ <td>Unused, reserved for future use.</td>
+
+</tr>
+
+<tr>
+
+<td>0b1000000000</td>
+ <td>Unused, reserved for future use.</td>
+
+</tr>
+
+
+</table>
+<p>All remaining bits in the 64-bit value are unused and
+ reserved for future use. Multiple trace logging categories are
+ specified by calculating the bitwise OR of the documented values.
+ The default trace mask is 0b0100110010. Thus, by default, trace
+ logging includes client requests, packets received from the
+ leader and sessions.</p>
+<p>To set a different trace mask, send a request containing the
+ <span class="codefrag command">stmk</span> four-letter word followed by the trace
+ mask represented as a 64-bit signed long value. This example uses
+ the Perl <span class="codefrag command">pack</span> function to construct a trace
+ mask that enables all trace logging categories described above and
+ convert it to a 64-bit signed long value with big-endian byte
+ order. The result is appended to <span class="codefrag command">stmk</span> and sent
+ to the server using netcat. The server responds with the new
+ trace mask in decimal format.</p>
+<pre class="code">$ perl -e "print 'stmk', pack('q>', 0b0011111010)" | nc localhost 2181
+250
+ </pre>
+</dd>
</dl>
<p>Here's an example of the <strong>ruok</strong>
@@ -2026,6 +2345,18 @@ server.3=zoo3:2888:3888</pre>
this document for more details on setting a retention policy
and maintenance of ZooKeeper storage.
</p>
+<div class="note">
+<div class="label">Note</div>
+<div class="content">
+
+<p>The data stored in these files is not encrypted. In the case of
+ storing sensitive data in ZooKeeper, necessary measures need to be
+ taken to prevent unauthorized access. Such measures are external to
+ ZooKeeper (e.g., control access to the files) and depend on the
+ individual settings in which it is being deployed. </p>
+
+</div>
+</div>
<a name="sc_commonProblems"></a>
<h3 class="h4">Things to Avoid</h3>
<p>Here are some common problems you can avoid by configuring
Modified: zookeeper/branches/branch-3.5/docs/zookeeperAdmin.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperAdmin.pdf?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/branches/branch-3.5/docs/zookeeperHierarchicalQuorums.html
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperHierarchicalQuorums.html?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/docs/zookeeperHierarchicalQuorums.html (original)
+++ zookeeper/branches/branch-3.5/docs/zookeeperHierarchicalQuorums.html Mon Mar 14 06:57:10 2016
@@ -149,6 +149,9 @@ document.write("Last Published: " + docu
<div class="menuitem">
<a href="zookeeperObservers.html">Observers Guide</a>
</div>
+<div class="menuitem">
+<a href="zookeeperReconfig.html">Dynamic Reconfiguration</a>
+</div>
</div>
<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Contributor</div>
<div id="menu_1.4" class="menuitemgroup">
Modified: zookeeper/branches/branch-3.5/docs/zookeeperHierarchicalQuorums.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperHierarchicalQuorums.pdf?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
Binary files zookeeper/branches/branch-3.5/docs/zookeeperHierarchicalQuorums.pdf (original) and zookeeper/branches/branch-3.5/docs/zookeeperHierarchicalQuorums.pdf Mon Mar 14 06:57:10 2016 differ
Modified: zookeeper/branches/branch-3.5/docs/zookeeperInternals.html
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperInternals.html?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/docs/zookeeperInternals.html (original)
+++ zookeeper/branches/branch-3.5/docs/zookeeperInternals.html Mon Mar 14 06:57:10 2016
@@ -149,6 +149,9 @@ document.write("Last Published: " + docu
<div class="menuitem">
<a href="zookeeperObservers.html">Observers Guide</a>
</div>
+<div class="menuitem">
+<a href="zookeeperReconfig.html">Dynamic Reconfiguration</a>
+</div>
</div>
<div onclick="SwitchMenu('menu_selected_1.4', 'skin/')" id="menu_selected_1.4Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Contributor</div>
<div id="menu_selected_1.4" class="selectedmenuitemgroup" style="display: block;">
@@ -595,7 +598,7 @@ message when that proposal is committed.
</ul>
<a name="sc_summary"></a>
<h3 class="h4">Summary</h3>
-<p>So there you go. Why does it work? Specifically, why does is set of proposals
+<p>So there you go. Why does it work? Specifically, why does a set of proposals
believed by a new leader always contain any proposal that has actually been committed?
First, all proposals have a unique zxid, so unlike other protocols, we never have
to worry about two different values being proposed for the same zxid; followers
Modified: zookeeper/branches/branch-3.5/docs/zookeeperInternals.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperInternals.pdf?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/branches/branch-3.5/docs/zookeeperJMX.html
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperJMX.html?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/docs/zookeeperJMX.html (original)
+++ zookeeper/branches/branch-3.5/docs/zookeeperJMX.html Mon Mar 14 06:57:10 2016
@@ -149,6 +149,9 @@ document.write("Last Published: " + docu
<div class="menuitem">
<a href="zookeeperObservers.html">Observers Guide</a>
</div>
+<div class="menuitem">
+<a href="zookeeperReconfig.html">Dynamic Reconfiguration</a>
+</div>
</div>
<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Contributor</div>
<div id="menu_1.4" class="menuitemgroup">
Modified: zookeeper/branches/branch-3.5/docs/zookeeperJMX.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperJMX.pdf?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
Binary files zookeeper/branches/branch-3.5/docs/zookeeperJMX.pdf (original) and zookeeper/branches/branch-3.5/docs/zookeeperJMX.pdf Mon Mar 14 06:57:10 2016 differ
Modified: zookeeper/branches/branch-3.5/docs/zookeeperObservers.html
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperObservers.html?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/docs/zookeeperObservers.html (original)
+++ zookeeper/branches/branch-3.5/docs/zookeeperObservers.html Mon Mar 14 06:57:10 2016
@@ -149,6 +149,9 @@ document.write("Last Published: " + docu
<div class="menupage">
<div class="menupagetitle">Observers Guide</div>
</div>
+<div class="menuitem">
+<a href="zookeeperReconfig.html">Dynamic Reconfiguration</a>
+</div>
</div>
<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Contributor</div>
<div id="menu_1.4" class="menuitemgroup">
@@ -287,7 +290,7 @@ document.write("Last Published: " + docu
<div class="section">
<p>
Two example use cases for Observers are listed below. In fact, wherever
- you wish to scale the numbe of clients of your ZooKeeper ensemble, or
+ you wish to scale the number of clients of your ZooKeeper ensemble, or
where you wish to insulate the critical part of an ensemble from the load
of dealing with client requests, Observers are a good architectural
choice.
Modified: zookeeper/branches/branch-3.5/docs/zookeeperObservers.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperObservers.pdf?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
Binary files zookeeper/branches/branch-3.5/docs/zookeeperObservers.pdf (original) and zookeeper/branches/branch-3.5/docs/zookeeperObservers.pdf Mon Mar 14 06:57:10 2016 differ
Modified: zookeeper/branches/branch-3.5/docs/zookeeperOver.html
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperOver.html?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/docs/zookeeperOver.html (original)
+++ zookeeper/branches/branch-3.5/docs/zookeeperOver.html Mon Mar 14 06:57:10 2016
@@ -149,6 +149,9 @@ document.write("Last Published: " + docu
<div class="menuitem">
<a href="zookeeperObservers.html">Observers Guide</a>
</div>
+<div class="menuitem">
+<a href="zookeeperReconfig.html">Dynamic Reconfiguration</a>
+</div>
</div>
<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Contributor</div>
<div id="menu_1.4" class="menuitemgroup">
@@ -326,7 +329,7 @@ document.write("Last Published: " + docu
</table>
<a name="Nodes+and+ephemeral+nodes"></a>
<h3 class="h4">Nodes and ephemeral nodes</h3>
-<p>Unlike is standard file systems, each node in a ZooKeeper
+<p>Unlike standard file systems, each node in a ZooKeeper
namespace can have data associated with it as well as children. It is
like having a file-system that allows a file to also be a directory.
(ZooKeeper was designed to store coordination data: status information,
@@ -350,9 +353,9 @@ document.write("Last Published: " + docu
<a name="Conditional+updates+and+watches"></a>
<h3 class="h4">Conditional updates and watches</h3>
<p>ZooKeeper supports the concept of <em>watches</em>.
- Clients can set a watch on a znodes. A watch will be triggered and
- removed when the znode changes. When a watch is triggered the client
- receives a packet saying that the znode has changed. And if the
+ Clients can set a watch on a znode. A watch will be triggered and
+ removed when the znode changes. When a watch is triggered, the client
+ receives a packet saying that the znode has changed. If the
connection between the client and one of the Zoo Keeper servers is
broken, the client will receive a local notification. These can be used
to <em>[tbd]</em>.</p>
@@ -484,7 +487,7 @@ document.write("Last Published: " + docu
of the ZooKeeper service. With the exception of the request processor,
each of
the servers that make up the ZooKeeper service replicates its own copy
- of each of components.</p>
+ of each of the components.</p>
<table class="ForrestTable" cellspacing="1" cellpadding="4">
<tr>
<td>ZooKeeper Components</td>
Modified: zookeeper/branches/branch-3.5/docs/zookeeperOver.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperOver.pdf?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/branches/branch-3.5/docs/zookeeperProgrammers.html
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperProgrammers.html?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/docs/zookeeperProgrammers.html (original)
+++ zookeeper/branches/branch-3.5/docs/zookeeperProgrammers.html Mon Mar 14 06:57:10 2016
@@ -149,6 +149,9 @@ document.write("Last Published: " + docu
<div class="menuitem">
<a href="zookeeperObservers.html">Observers Guide</a>
</div>
+<div class="menuitem">
+<a href="zookeeperReconfig.html">Dynamic Reconfiguration</a>
+</div>
</div>
<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Contributor</div>
<div id="menu_1.4" class="menuitemgroup">
@@ -213,6 +216,9 @@ document.write("Last Published: " + docu
<li>
<a href="#Sequence+Nodes+--+Unique+Naming">Sequence Nodes -- Unique Naming</a>
</li>
+<li>
+<a href="#Container+Nodes">Container Nodes</a>
+</li>
</ul>
</li>
<li>
@@ -418,7 +424,7 @@ document.write("Last Published: " + docu
useful, ZooKeeper-related information.</p>
<p>Most of information in this document is written to be accessible as
stand-alone reference material. However, before starting your first
- ZooKeeper application, you should probably at least read the chapters on
+ ZooKeeper application, you should probably at least read the chaptes on
the <a href="#ch_zkDataModel">ZooKeeper Data Model</a> and <a href="#ch_guideToZkOperations">ZooKeeper Basic Operations</a>. Also,
the <a href="#ch_programStructureWithExample">Simple Programmming
Example</a> <em>[tbd]</em> is helpful for understanding the basic
@@ -434,7 +440,7 @@ document.write("Last Published: " + docu
data associated with it as well as children. It is like having a file
system that allows a file to also be a directory. Paths to nodes are
always expressed as canonical, absolute, slash-separated paths; there are
- no relative references. Any unicode character can be used in a path subject
+ no relative reference. Any unicode character can be used in a path subject
to the following constraints:</p>
<ul>
@@ -559,6 +565,20 @@ document.write("Last Published: " + docu
(4bytes) maintained by the parent node, the counter will
overflow when incremented beyond 2147483647 (resulting in a
name "<path>-2147483647").</p>
+<a name="Container+Nodes"></a>
+<h4>Container Nodes</h4>
+<p>
+<strong>Added in 3.6.0</strong>
+</p>
+<p>ZooKeeper has the notion of container nodes. Container nodes are
+ special purpose nodes useful for recipes such as leader, lock, etc.
+ When the last child of a container is deleted, the container becomes
+ a candidate to be deleted by the server at some point in the future.</p>
+<p>Given this property, you should be prepared to get
+ KeeperException.NoNodeException when creating children inside of
+ container nodes. i.e. when creating child nodes inside of container nodes
+ always check for KeeperException.NoNodeException and recreate the container
+ node when it occurs.</p>
<a name="sc_timeInZk"></a>
<h3 class="h4">Time in ZooKeeper</h3>
<p>ZooKeeper tracks time multiple ways:</p>
@@ -662,6 +682,18 @@ document.write("Last Published: " + docu
<li>
<p>
+<strong>pzxid</strong>
+</p>
+
+
+<p>The zxid of the change that last modified children of this znode.</p>
+
+</li>
+
+
+<li>
+
+<p>
<strong>ctime</strong>
</p>
@@ -1376,6 +1408,16 @@ document.write("Last Published: " + docu
IP.</p>
</li>
+
+<li>
+<p>
+<strong>x509</strong> uses the client
+ X500 Principal as an ACL ID identity. The ACL expression is the exact
+ X500 Principal name of a client. When using the secure port, clients
+ are automatically authenticated and their auth info for the x509 scheme
+ is set.</p>
+</li>
+
</ul>
<a name="ZooKeeper+C+client+API"></a>
Modified: zookeeper/branches/branch-3.5/docs/zookeeperProgrammers.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperProgrammers.pdf?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/branches/branch-3.5/docs/zookeeperQuotas.html
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperQuotas.html?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/docs/zookeeperQuotas.html (original)
+++ zookeeper/branches/branch-3.5/docs/zookeeperQuotas.html Mon Mar 14 06:57:10 2016
@@ -149,6 +149,9 @@ document.write("Last Published: " + docu
<div class="menuitem">
<a href="zookeeperObservers.html">Observers Guide</a>
</div>
+<div class="menuitem">
+<a href="zookeeperReconfig.html">Dynamic Reconfiguration</a>
+</div>
</div>
<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Contributor</div>
<div id="menu_1.4" class="menuitemgroup">
Modified: zookeeper/branches/branch-3.5/docs/zookeeperQuotas.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperQuotas.pdf?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
Binary files zookeeper/branches/branch-3.5/docs/zookeeperQuotas.pdf (original) and zookeeper/branches/branch-3.5/docs/zookeeperQuotas.pdf Mon Mar 14 06:57:10 2016 differ
Modified: zookeeper/branches/branch-3.5/docs/zookeeperReconfig.html
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperReconfig.html?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/docs/zookeeperReconfig.html (original)
+++ zookeeper/branches/branch-3.5/docs/zookeeperReconfig.html Mon Mar 14 06:57:10 2016
@@ -67,7 +67,7 @@
<a class="unselected" href="https://cwiki.apache.org/confluence/display/ZOOKEEPER/">Wiki</a>
</li>
<li class="current">
-<a class="selected" href="index.html">ZooKeeper 3.4 Documentation</a>
+<a class="selected" href="index.html">ZooKeeper 3.5 Documentation</a>
</li>
</ul>
<!--+
Modified: zookeeper/branches/branch-3.5/docs/zookeeperReconfig.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperReconfig.pdf?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/branches/branch-3.5/docs/zookeeperStarted.html
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperStarted.html?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/docs/zookeeperStarted.html (original)
+++ zookeeper/branches/branch-3.5/docs/zookeeperStarted.html Mon Mar 14 06:57:10 2016
@@ -149,6 +149,9 @@ document.write("Last Published: " + docu
<div class="menuitem">
<a href="zookeeperObservers.html">Observers Guide</a>
</div>
+<div class="menuitem">
+<a href="zookeeperReconfig.html">Dynamic Reconfiguration</a>
+</div>
</div>
<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Contributor</div>
<div id="menu_1.4" class="menuitemgroup">
@@ -519,23 +522,8 @@ numChildren = 0
ZooKeeper in replicated mode. A replicated group of servers in the same
application is called a <em>quorum</em>, and in replicated
mode, all servers in the quorum have copies of the same configuration
- file.</p>
-
-<div class="note">
-<div class="label">Note</div>
-<div class="content">
-<p>For replicated mode, a minimum of three servers are required, and it is
- strongly recommended that you have an odd number of servers. If you
- only have two servers, then you are in a situation where if one of
- them fails, there are not enough machines to form a majority quorum.
- Two servers is inherently <strong>less</strong> stable than a single
- server, because there are two single points of failure.</p>
-</div>
-</div>
-
-<p>The required <strong>conf/zoo.cfg</strong> file for replicated mode is
- similar to the one used in standalone mode, but with a few differences.
- Here is an example:</p>
+ file. The file is similar to the one used in standalone mode, but with a
+ few differences. Here is an example:</p>
<pre class="code">
tickTime=2000
dataDir=/var/lib/zookeeper
@@ -584,15 +572,7 @@ server.3=zoo3:2888:3888
(in the above replicated example, running on a
single <em>localhost</em>, you would still have
three config files).</p>
-
-<p>Please be aware that setting up multiple servers on a single machine
- will not create any redundancy. If something were to happen
- which caused the machine to die, all of the zookeeper servers
- would be offline. Full redundancy requires that each server have
- its own machine. It must be a completely separate physical server.
- Multiple virtual machines on the same physical host are still
- vulnerable to the complete failure of that host.</p>
-
+
</div>
</div>
<a name="Other+Optimizations"></a>
Modified: zookeeper/branches/branch-3.5/docs/zookeeperStarted.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperStarted.pdf?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/branches/branch-3.5/docs/zookeeperTutorial.html
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperTutorial.html?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/docs/zookeeperTutorial.html (original)
+++ zookeeper/branches/branch-3.5/docs/zookeeperTutorial.html Mon Mar 14 06:57:10 2016
@@ -149,6 +149,9 @@ document.write("Last Published: " + docu
<div class="menuitem">
<a href="zookeeperObservers.html">Observers Guide</a>
</div>
+<div class="menuitem">
+<a href="zookeeperReconfig.html">Dynamic Reconfiguration</a>
+</div>
</div>
<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Contributor</div>
<div id="menu_1.4" class="menuitemgroup">
@@ -370,14 +373,14 @@ a boolean flag that enables the process
</pre>
<p>
Note that enter() throws both KeeperException and InterruptedException, so it is
-the reponsability of the application to catch and handle such exceptions.</p>
+the responsibility of the application to catch and handle such exceptions.</p>
<p>
Once the computation is finished, a process calls leave() to leave the barrier.
First it deletes its corresponding node, and then it gets the children of the root
node. If there is at least one child, then it waits for a notification (obs: note
that the second parameter of the call to getChildren() is true, meaning that
ZooKeeper has to set a watch on the the root node). Upon reception of a notification,
-it checks once more whether the root node has any child.</p>
+it checks once more whether the root node has any children.</p>
<pre class="code">
/**
* Wait until all reach barrier
@@ -408,7 +411,7 @@ it checks once more whether the root nod
<h2 class="h3">Producer-Consumer Queues</h2>
<div class="section">
<p>
-A producer-consumer queue is a distributed data estructure thata group of processes
+A producer-consumer queue is a distributed data structure that groups of processes
use to generate and consume items. Producer processes create new elements and add
them to the queue. Consumer processes remove elements from the list, and process them.
In this implementation, the elements are simple integers. The queue is represented
Modified: zookeeper/branches/branch-3.5/docs/zookeeperTutorial.pdf
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/docs/zookeeperTutorial.pdf?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
Binary files - no diff available.
Modified: zookeeper/branches/branch-3.5/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml?rev=1734882&r1=1734881&r2=1734882&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml (original)
+++ zookeeper/branches/branch-3.5/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml Mon Mar 14 06:57:10 2016
@@ -824,22 +824,6 @@ server.3=zoo3:2888:3888</programlisting>
</varlistentry>
<varlistentry>
- <term>traceFile</term>
-
- <listitem>
- <para>(Java system property: <emphasis
- role="bold">requestTraceFile</emphasis>)</para>
-
- <para>If this option is defined, requests will be will logged to
- a trace file named traceFile.year.month.day. Use of this option
- provides useful debugging information, but will impact
- performance. (Note: The system property has no zookeeper prefix,
- and the configuration variable name is different from the system
- property. Yes - it's not consistent, and it's annoying.)</para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term>maxClientCnxns</term>
<listitem>
<para>(No Java system property)</para>