http://git-wip-us.apache.org/repos/asf/hbase-site/blob/044b3379/book.html ---------------------------------------------------------------------- diff --git a/book.html b/book.html index 1f99bce..d244150 100644 --- a/book.html +++ b/book.html @@ -1928,8 +1928,9 @@ For example:</p> <h3 id="zookeeper.requirements"><a class="anchor" href="#zookeeper.requirements"></a>4.2. ZooKeeper Requirements</h3> <div class="paragraph"> <p>ZooKeeper 3.4.x is required as of HBase 1.0.0. -HBase makes use of the <code>multi</code> functionality that is only available since 3.4.0 (The <code>useMulti</code> configuration option defaults to <code>true</code> in HBase 1.0.0). -See <a href="https://issues.apache.org/jira/browse/HBASE-12241";>HBASE-12241 (The crash of regionServer when taking deadserver’s replication queue breaks replication)</a> and <a href="https://issues.apache.org/jira/browse/HBASE-6775";>HBASE-6775 (Use ZK.multi when available for HBASE-6710 0.92/0.94 compatibility fix)</a> for background.</p> +HBase makes use of the <code>multi</code> functionality that is only available since Zookeeper 3.4.0. The <code>hbase.zookeeper.useMulti</code> configuration property defaults to <code>true</code> in HBase 1.0.0. +Refer to <a href="https://issues.apache.org/jira/browse/HBASE-12241";>HBASE-12241 (The crash of regionServer when taking deadserver’s replication queue breaks replication)</a> and <a href="https://issues.apache.org/jira/browse/HBASE-6775";>HBASE-6775 (Use ZK.multi when available for HBASE-6710 0.92/0.94 compatibility fix)</a> for background. +The property is deprecated and useMulti is always enabled in HBase 2.0.</p> </div> </div> </div> @@ -2221,21 +2222,6 @@ Configuration that it is thought rare anyone would change can exist only in code </dd> </dl> </div> -<div id="hbase.bulkload.staging.dir" class="dlist"> -<dl> -<dt class="hdlist1"><code>hbase.bulkload.staging.dir</code></dt> -<dd> -<div class="paragraph"> -<div class="title">Description</div> -<p>A staging directory in default file system (HDFS) for bulk loading.</p> -</div> -<div class="paragraph"> -<div class="title">Default</div> -<p><code>${hbase.fs.tmp.dir}</code></p> -</div> -</dd> -</dl> -</div> <div id="hbase.cluster.distributed" class="dlist"> <dl> <dt class="hdlist1"><code>hbase.cluster.distributed</code></dt> @@ -2791,21 +2777,6 @@ Configuration that it is thought rare anyone would change can exist only in code </dd> </dl> </div> -<div id="hbase.zookeeper.useMulti" class="dlist"> -<dl> -<dt class="hdlist1"><code>hbase.zookeeper.useMulti</code></dt> -<dd> -<div class="paragraph"> -<div class="title">Description</div> -<p>Instructs HBase to make use of ZooKeeper’s multi-update functionality. This allows certain ZooKeeper operations to complete more quickly and prevents some issues with rare Replication failure scenarios (see the release note of HBASE-2611 for an example). IMPORTANT: only set this to true if all ZooKeeper servers in the cluster are on version 3.4+ and will not be downgraded. ZooKeeper versions before 3.4 do not support multi-update and will not fail gracefully if multi-update is invoked (see ZOOKEEPER-1495).</p> -</div> -<div class="paragraph"> -<div class="title">Default</div> -<p><code>true</code></p> -</div> -</dd> -</dl> -</div> <div id="hbase.zookeeper.property.initLimit" class="dlist"> <dl> <dt class="hdlist1"><code>hbase.zookeeper.property.initLimit</code></dt> @@ -4218,7 +4189,7 @@ Configuration that it is thought rare anyone would change can exist only in code <dd> <div class="paragraph"> <div class="title">Description</div> -<p>FS Permissions for the root directory in a secure (kerberos) setup. When master starts, it creates the rootdir with this permissions or sets the permissions if it does not match.</p> +<p>FS Permissions for the root data subdirectory in a secure (kerberos) setup. When master starts, it creates the rootdir with this permissions or sets the permissions if it does not match.</p> </div> <div class="paragraph"> <div class="title">Default</div> @@ -26440,9 +26411,7 @@ The following example limits the above example to 200 MB/sec.</p> <div class="sect2"> <h3 id="snapshots_s3"><a class="anchor" href="#snapshots_s3"></a>137.9. Storing Snapshots in an Amazon S3 Bucket</h3> <div class="paragraph"> -<p>For general information and limitations of using Amazon S3 storage with HBase, see -<a href="#amazon_s3_configuration">[amazon_s3_configuration]</a>. You can also store and retrieve snapshots from Amazon -S3, using the following procedure.</p> +<p>You can store and retrieve snapshots from Amazon S3, using the following procedure.</p> </div> <div class="admonitionblock note"> <table> @@ -30021,9 +29990,7 @@ In the example below we have ZooKeeper persist to <em>/user/local/zookeeper</em> <td class="content"> <div class="title">What version of ZooKeeper should I use?</div> <div class="paragraph"> -<p>The newer version, the better. -For example, some folks have been bitten by <a href="https://issues.apache.org/jira/browse/ZOOKEEPER-1277";>ZOOKEEPER-1277</a>. -If running zookeeper 3.5+, you can ask hbase to make use of the new multi operation by enabling <a href="#hbase.zookeeper.useMulti">hbase.zookeeper.useMulti</a>" in your <em>hbase-site.xml</em>.</p> +<p>The newer version, the better. ZooKeeper 3.4.x is required as of HBase 1.0.0</p> </div> </td> </tr> @@ -34050,7 +34017,7 @@ The server will return cellblocks compressed using this same compressor as long <div id="footer"> <div id="footer-text"> Version 2.0.0-SNAPSHOT<br> -Last updated 2016-07-24 14:31:11 +00:00 +Last updated 2016-09-29 14:44:28 +00:00 </div> </div> </body>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/044b3379/bulk-loads.html ---------------------------------------------------------------------- diff --git a/bulk-loads.html b/bulk-loads.html index 0a4e0ff..ea211c3 100644 --- a/bulk-loads.html +++ b/bulk-loads.html @@ -7,7 +7,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20160916" /> + <meta name="Date-Revision-yyyymmdd" content="20160929" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache HBase – Bulk Loads in Apache HBase (TM) @@ -305,7 +305,7 @@ under the License. --> <a href="http://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2016-09-16</li> + <li id="publishDate" class="pull-right">Last Published: 2016-09-29</li> </p> </div>
