Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ZOOKEEPER-2635: regenerate document for branch-3.5 before release. #202

Closed
wants to merge 1 commit into from
Closed

ZOOKEEPER-2635: regenerate document for branch-3.5 before release. #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ <h1>ZooKeeper: Because Coordinating Distributed Systems is a Zoo</h1>
</div>
<div class="copyright">
Copyright &copy;
2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
<a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
</div>
<div id="logos"></div>
<!--+
Expand Down
Binary file modified docs/index.pdf
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/javaExample.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,7 +890,7 @@ <h2 class="h3">Complete Source Listings</h2>
</div>
<div class="copyright">
Copyright &copy;
2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
<a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
</div>
<!--+
|end bottomstrip
Expand Down
Binary file modified docs/javaExample.pdf
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/linkmap.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ <h1>Site Linkmap Table of Contents</h1>
</div>
<div class="copyright">
Copyright &copy;
2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
<a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
</div>
<!--+
|end bottomstrip
Expand Down
Binary file modified docs/linkmap.pdf
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/recipes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,7 +1014,7 @@ <h3 class="h4">Leader Election</h3>
</div>
<div class="copyright">
Copyright &copy;
2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
<a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
</div>
<!--+
|end bottomstrip
Expand Down
Binary file modified docs/recipes.pdf
View file
Open in desktop
Binary file not shown.
87 changes: 62 additions & 25 deletions docs/zookeeperAdmin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ <h3>A Guide to Deployment and Administration</h3>
<a href="#sc_zkCommands">ZooKeeper Commands</a>
<ul class="minitoc">
<li>
<a href="#The+Four+Letter+Words">The Four Letter Words</a>
<a href="#sc_4lw">The Four Letter Words</a>
</li>
<li>
<a href="#sc_adminserver">The AdminServer</a>
Expand Down Expand Up @@ -940,14 +940,10 @@ <h4>Ongoing Data Directory Cleanup</h4>
of the znodes stored by a particular serving ensemble. These
are the snapshot and transactional log files. As changes are
made to the znodes these changes are appended to a
transaction log. Occasionally, when a log grows large, a
transaction log, occasionally, when a log grows large, a
snapshot of the current state of all znodes will be written
to the filesystem and a new transaction log file is created
for future transactions. During snapshotting, ZooKeeper may
continue appending incoming transactions to the old log file.
Therefore, some transactions which are newer than a snapshot
may be found in the last transaction log preceding the
snapshot.
to the filesystem. This snapshot supercedes all previous
logs.
</p>
<p>A ZooKeeper server <strong>will not remove
old snapshots and log files</strong> when using the default
Expand Down Expand Up @@ -1205,10 +1201,8 @@ <h4>Advanced Configuration</h4>
<p>(Java system property: <strong>zookeeper.snapCount</strong>)</p>
<p>ZooKeeper logs transactions to a transaction
log. After snapCount transactions are written to a log
file a snapshot is started. It also influences rollover
of the current transaction log to a new file. However,
the creation of a new snapshot and rollover of transaction
log proceed independently. The default snapCount is
file a snapshot is started and a new transaction log
file is created. The default snapCount is
100,000.</p>
</dd>

Expand Down Expand Up @@ -1531,6 +1525,36 @@ <h4>Cluster Options</h4>
</p>
</dd>


<dt>
<term>4lw.commands.whitelist</term>
</dt>
<dd>
<p>(Java system property: <strong>zookeeper.4lw.commands.whitelist</strong>)</p>
<p>
<strong>New in 3.5.3:</strong>
A list of comma separated <a href="#sc_4lw">Four Letter Words</a>
commands that user wants to use. A valid Four Letter Words
command must be put in this list else ZooKeeper server will
not enable the command.
By default the whitelist only contains "srvr" command
which zkServer.sh uses. The rest of four letter word commands are disabled
by default.
</p>
<p>Here's an example of the configuration that enables stat, ruok, conf, and isro
command while disabling the rest of Four Letter Words command:</p>
<pre class="code">
4lw.commands.whitelist=stat, ruok, conf, isro
</pre>
<p>If you really need enable all four letter word commands by default, you can use
the asterisk option so you don't have to include every command one by one in the list.
As an example, this will enable all four letter word commands:
</p>
<pre class="code">
4lw.commands.whitelist=*
</pre>
</dd>


</dl>
<p></p>
Expand Down Expand Up @@ -1933,7 +1957,7 @@ <h4>AdminServer configuration</h4>
</dl>
<a name="sc_zkCommands"></a>
<h3 class="h4">ZooKeeper Commands</h3>
<a name="The+Four+Letter+Words"></a>
<a name="sc_4lw"></a>
<h4>The Four Letter Words</h4>
<p>ZooKeeper responds to a small set of commands. Each command is
composed of four letters. You issue the commands to ZooKeeper via telnet
Expand All @@ -1942,6 +1966,15 @@ <h4>The Four Letter Words</h4>
general information about the server and connected clients,
while "srvr" and "cons" give extended details on server and
connections respectively.</p>
<p>
<strong>New in 3.5.3:</strong>
Four Letter Words need to be explicitly white listed before using.
Please refer <strong>4lw.commands.whitelist</strong>
described in <a href="#sc_clusterOptions">
cluster configuration section</a> for details.
Moving forward, Four Letter Words will be deprecated, please use
<a href="#sc_adminserver">AdminServer</a> instead.
</p>
<dl>

<dt>
Expand Down Expand Up @@ -2350,11 +2383,8 @@ <h4>The Log Directory</h4>
<p>The Log Directory contains the ZooKeeper transaction logs.
Before any update takes place, ZooKeeper ensures that the transaction
that represents the update is written to non-volatile storage. A new
log file is started when the number of transactions written to the
current log file reaches a (variable) threshold. The threshold is
computed using the same parameter which influences the frequency of
snapshotting (see snapCount above). The log file's suffix is the first
zxid written to that log.</p>
log file is started each time a snapshot is begun. The log file's
suffix is the first zxid written to that log.</p>
<a name="sc_filemanagement"></a>
<h4>File Management</h4>
<p>The format of snapshot and log files does not change between
Expand All @@ -2369,12 +2399,8 @@ <h4>File Management</h4>
<p>The ZooKeeper server creates snapshot and log files, but
never deletes them. The retention policy of the data and log
files is implemented outside of the ZooKeeper server. The
server itself only needs the latest complete fuzzy snapshot, all log
files following it, and the last log file preceding it. The latter
requirement is necessary to include updates which happened after this
snapshot was started but went into the existing log file at that time.
This is possible because snapshotting and rolling over of logs
proceed somewhat independently in Zookeeper. See the
server itself only needs the latest complete fuzzy snapshot
and the log files from the start of that snapshot. See the
<a href="#sc_maintenance">maintenance</a> section in
this document for more details on setting a retention policy
and maintenance of ZooKeeper storage.
Expand Down Expand Up @@ -2443,6 +2469,17 @@ <h3 class="h4">Things to Avoid</h3>
is to run load tests, and then make sure you are well below the
usage limit that would cause the system to swap.</p>
</dd>


<dt>
<term>Publicly accessible deployment</term>
</dt>
<dd>
<p>
A ZooKeeper ensemble is expected to operate in a trusted computing environment.
It is thus recommended to deploy ZooKeeper behind a firewall.
</p>
</dd>

</dl>
<a name="sc_bestPractices"></a>
Expand Down Expand Up @@ -2475,7 +2512,7 @@ <h3 class="h4">Best Practices</h3>
</div>
<div class="copyright">
Copyright &copy;
2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
<a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
</div>
<!--+
|end bottomstrip
Expand Down
Binary file modified docs/zookeeperAdmin.pdf
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/zookeeperHierarchicalQuorums.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ <h1>Introduction to hierarchical quorums</h1>
</div>
<div class="copyright">
Copyright &copy;
2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
<a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
</div>
<!--+
|end bottomstrip
Expand Down
Binary file modified docs/zookeeperHierarchicalQuorums.pdf
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/zookeeperInternals.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ <h4>Use of Standard slf4j Idioms</h4>
</div>
<div class="copyright">
Copyright &copy;
2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
<a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
</div>
<!--+
|end bottomstrip
Expand Down
Binary file modified docs/zookeeperInternals.pdf
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/zookeeperJMX.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ <h2 class="h3">ZooKeeper MBean Reference</h2>
</div>
<div class="copyright">
Copyright &copy;
2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
<a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
</div>
<!--+
|end bottomstrip
Expand Down
Binary file modified docs/zookeeperJMX.pdf
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/zookeeperObservers.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ <h2 class="h3">Example use cases</h2>
</div>
<div class="copyright">
Copyright &copy;
2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
<a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
</div>
<!--+
|end bottomstrip
Expand Down
Binary file modified docs/zookeeperObservers.pdf
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/zookeeperOver.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ <h3 class="h4">The ZooKeeper Project</h3>
</div>
<div class="copyright">
Copyright &copy;
2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
<a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
</div>
<!--+
|end bottomstrip
Expand Down
Binary file modified docs/zookeeperOver.pdf
View file
Open in desktop
Binary file not shown.
30 changes: 20 additions & 10 deletions docs/zookeeperProgrammers.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1307,11 +1307,14 @@ <h2 class="h3">ZooKeeper access control using ACLs</h2>
be able to read <em>/app/status</em>; ACLs are not
recursive.</p>
<p>ZooKeeper supports pluggable authentication schemes. Ids are
specified using the form <em>scheme:id</em>,
where <em>scheme</em> is a the authentication scheme
that the id corresponds to. For
example, <em>ip:172.16.16.1</em> is an id for a
host with the address <em>172.16.16.1</em>.</p>
specified using the form <em>scheme:expression</em>,
where <em>scheme</em> is the authentication scheme
that the id corresponds to. The set of valid expressions are defined
by the scheme. For example, <em>ip:172.16.16.1</em> is
an id for a host with the address <em>172.16.16.1</em>
using the <em>ip</em> scheme, whereas <em>digest:bob:password</em>
is an id for the user with the name of <em>bob</em> using
the <em>digest</em> scheme.</p>
<p>When a client connects to ZooKeeper and authenticates
itself, ZooKeeper associates all the ids that correspond to a
client with the clients connection. These ids are checked against
Expand Down Expand Up @@ -1393,9 +1396,16 @@ <h4>Builtin ACL Schemes</h4>

<li>
<p>
<strong>auth</strong> doesn't
use any id, represents any authenticated
user.</p>
<strong>auth</strong> is a special
scheme which ignores any provided expression and instead uses the current user,
credentials, and scheme. Any expression (whether <em>user</em> like with SASL
authentication or <em>user:password</em> like with DIGEST authentication) provided is ignored
by the ZooKeeper server when persisting the ACL. However, the expression must still be
provided in the ACL because the ACL must match the form <em>scheme:expression:perms</em>.
This scheme is provided as a convenience as it is a common use-case for
a user to create a znode and then restrict access to that znode to only that user.
If there is no authenticated user, setting an ACL with the auth scheme will fail.
</p>
</li>


Expand Down Expand Up @@ -2310,7 +2320,7 @@ <h2 class="h3">Gotchas: Common Problems and Troubleshooting</h2>
<p>If you are using watches, you must look for the connected watch
event. When a ZooKeeper client disconnects from a server, you will
not receive notification of changes until reconnected. If you are
watching for a znode to come into existance, you will miss the event
watching for a znode to come into existence, you will miss the event
if the znode is created and deleted while you are disconnected.</p>

</li>
Expand Down Expand Up @@ -2493,7 +2503,7 @@ <h2 class="h3">Gotchas: Common Problems and Troubleshooting</h2>
</div>
<div class="copyright">
Copyright &copy;
2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
<a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
</div>
<!--+
|end bottomstrip
Expand Down
Binary file modified docs/zookeeperProgrammers.pdf
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/zookeeperQuotas.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ <h3 class="h4"> Deleting Quotas</h3>
</div>
<div class="copyright">
Copyright &copy;
2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
<a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
</div>
<!--+
|end bottomstrip
Expand Down
Binary file modified docs/zookeeperQuotas.pdf
View file
Open in desktop
Binary file not shown.
6 changes: 5 additions & 1 deletion docs/zookeeperReconfig.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,10 @@ <h3 class="h4">API</h3>
from ZooKeeper class, and use of this API requires ACL setup and user
authentication (see <a href="#sc_reconfig_access_control">Security</a> for more information.).
</p>
<p>Note: for temporary backward compatibility, the reconfig() APIs will remain in ZooKeeper.java
where they were for a few alpha versions of 3.5.x. However, these APIs are deprecated and users
should move to the reconfigure() APIs in ZooKeeperAdmin.java.
</p>
</dd>


Expand Down Expand Up @@ -1232,7 +1236,7 @@ <h2 class="h3">Rebalancing Client Connections</h2>
</div>
<div class="copyright">
Copyright &copy;
2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
<a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
</div>
<!--+
|end bottomstrip
Expand Down
Binary file modified docs/zookeeperReconfig.pdf
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/zookeeperStarted.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ <h3 class="h4">Other Optimizations</h3>
</div>
<div class="copyright">
Copyright &copy;
2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
<a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
</div>
<!--+
|end bottomstrip
Expand Down
Binary file modified docs/zookeeperStarted.pdf
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/zookeeperTutorial.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,7 @@ <h2 class="h3">Complete Source Listing</h2>
</div>
<div class="copyright">
Copyright &copy;
2008-2013 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
<a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
</div>
<!--+
|end bottomstrip
Expand Down
Binary file modified docs/zookeeperTutorial.pdf
View file
Open in desktop
Binary file not shown.