Return-Path: <commits-return-5732-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 4D730200D04
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Mon, 11 Sep 2017 22:44:50 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 4BFE31609C4; Mon, 11 Sep 2017 20:44:50 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 91FDB1609B7
	for <archive-asf-public@cust-asf.ponee.io>; Mon, 11 Sep 2017 22:44:49 +0200 (CEST)
Received: (qmail 52466 invoked by uid 500); 11 Sep 2017 20:44:48 -0000
Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@zookeeper.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@zookeeper.apache.org>
List-Post: <mailto:commits@zookeeper.apache.org>
List-Id: <commits.zookeeper.apache.org>
Reply-To: dev@zookeeper.apache.org
Delivered-To: mailing list commits@zookeeper.apache.org
Received: (qmail 52455 invoked by uid 99); 11 Sep 2017 20:44:48 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Sep 2017 20:44:48 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 6250DF5768; Mon, 11 Sep 2017 20:44:48 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: hanm@apache.org
To: commits@zookeeper.apache.org
Message-Id: <49ecde41d7ec4dd8a147d551cfdadadf@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: zookeeper git commit: ZOOKEEPER-2349: Update documentation for
 snapCount
Date: Mon, 11 Sep 2017 20:44:48 +0000 (UTC)
archived-at: Mon, 11 Sep 2017 20:44:50 -0000

Repository: zookeeper
Updated Branches:
  refs/heads/branch-3.4 70797397f -> 574a94daf


ZOOKEEPER-2349: Update documentation for snapCount

Origin patch can not apply now and it has something inaccurate.so I give it a new PR.
more details in [JIRA](https://issues.apache.org/jira/browse/ZOOKEEPER-2349)

Author: maoling <maoling199210191@sina.com>

Reviewers: Abe Fine <afine@apache.org>, Michael Han <hanm@apache.org>

Closes #349 from maoling/ZOOKEEPER-2349


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

Branch: refs/heads/branch-3.4
Commit: 574a94dafd9238e74d36d41c8b37388717d32d28
Parents: 7079739
Author: maoling <maoling199210191@sina.com>
Authored: Mon Sep 11 13:43:11 2017 -0700
Committer: Michael Han <hanm@apache.org>
Committed: Mon Sep 11 13:44:37 2017 -0700

----------------------------------------------------------------------
 .../documentation/content/xdocs/zookeeperAdmin.xml    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zookeeper/blob/574a94da/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
----------------------------------------------------------------------
diff --git a/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml b/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
index cc5da13..3f9051a 100644
--- a/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
+++ b/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
@@ -764,11 +764,15 @@ server.3=zoo3:2888:3888</programlisting>
               <para>(Java system property: <emphasis
               role="bold">zookeeper.snapCount</emphasis>)</para>
 
-              <para>ZooKeeper logs transactions to a transaction
-              log. After snapCount transactions are written to a log
-              file a snapshot is started and a new transaction log
-              file is created. The default snapCount is
-              100,000.</para>
+              <para>ZooKeeper records its transactions using snapshots and
+              a transaction log (think write-ahead log).The number of
+              transactions recorded in the transaction log before a snapshot
+              can be taken (and the transaction log rolled) is determined
+              by snapCount. In order to prevent all of the machines in the quorum
+              from taking a snapshot at the same time, each ZooKeeper server
+              will take a snapshot when the number of transactions in the transaction log
+              reaches a runtime generated random value in the [snapCount/2+1, snapCount] 
+              range.The default snapCount is 100,000.</para>
             </listitem>
           </varlistentry>