Return-Path: <commits-return-5730-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 AC0C3200D04
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Mon, 11 Sep 2017 22:43:18 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id AA9481609C4; Mon, 11 Sep 2017 20:43:18 +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 F1C1E1609B7
	for <archive-asf-public@cust-asf.ponee.io>; Mon, 11 Sep 2017 22:43:17 +0200 (CEST)
Received: (qmail 41342 invoked by uid 500); 11 Sep 2017 20:43:16 -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 41330 invoked by uid 99); 11 Sep 2017 20:43:16 -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:43:16 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id D9615F5768; Mon, 11 Sep 2017 20:43:14 +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: <794f7eaca1684410a058ef13e245256d@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:43:14 +0000 (UTC)
archived-at: Mon, 11 Sep 2017 20:43:18 -0000

Repository: zookeeper
Updated Branches:
  refs/heads/master 1165794be -> 563f892da


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/563f892d
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/563f892d
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/563f892d

Branch: refs/heads/master
Commit: 563f892da0e03e23715bddf236b10582bd51e429
Parents: 1165794
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:43:11 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/563f892d/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 67efc4b..19aa182 100644
--- a/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
+++ b/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
@@ -822,11 +822,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>