http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b2e10744/book.html
----------------------------------------------------------------------
diff --git a/book.html b/book.html
index 2770027..04d2890 100644
--- a/book.html
+++ b/book.html
@@ -890,8 +890,8 @@ This step is offered for testing and learning purposes only.
 You can start up to 9 backup HMaster servers, which makes 10 total HMasters, 
counting the primary.
 To start a backup HMaster, use the <code>local-master-backup.sh</code>.
 For each backup master you want to start, add a parameter representing the 
port offset for that master.
-Each HMaster uses three ports (16010, 16020, and 16030 by default). The port 
offset is added to these ports, so using an offset of 2, the backup HMaster 
would use ports 16012, 16022, and 16032.
-The following command starts 3 backup servers using ports 16012/16022/16032, 
16013/16023/16033, and 16015/16025/16035.</p>
+Each HMaster uses two ports (16000 and 16010 by default). The port offset is 
added to these ports, so using an offset of 2, the backup HMaster would use 
ports 16002 and 16012.
+The following command starts 3 backup servers using ports 16002/16012, 
16003/16013, and 16005/16015.</p>
 </div>
 <div class="listingblock">
 <div class="content">
@@ -920,7 +920,7 @@ The <code>local-regionservers.sh</code> command allows you 
to run multiple Regio
 It works in a similar way to the <code>local-master-backup.sh</code> command, 
in that each parameter you provide represents the port offset for an instance.
 Each RegionServer requires two ports, and the default ports are 16020 and 
16030.
 Since HBase version 1.1.0, HMaster doesn&#8217;t use region server ports, this 
leaves 10 ports (16020 to 16029 and 16030 to 16039) to be used for 
RegionServers.
-For supporting additional RegionServers, base ports can be changed in script 
'local-regionservers.sh' to appropriate value.
+For supporting additional RegionServers, set environment variables 
HBASE_RS_BASE_PORT and HBASE_RS_INFO_BASE_PORT to appropriate values before 
running script <code>local-regionservers.sh</code>.
 e.g. With values 16200 and 16300 for base ports, 99 additional RegionServers 
can be supported, on a server.
 The following command starts four additional RegionServers, running on 
sequential ports starting at 16022/16032 (base ports 16020/16030 plus 2).</p>
 </div>
@@ -6881,12 +6881,6 @@ Quitting...</code></pre>
 <p>Please consult the documentation published specifically for the version of 
HBase that you are upgrading to for details on the upgrade process.</p>
 </div>
 </div>
-<div class="sect2">
-<h3 id="upgrade2.0"><a class="anchor" href="#upgrade2.0"></a>13.4. Upgrading 
to 2.x</h3>
-<div class="paragraph">
-<p>Coming soon&#8230;&#8203;</p>
-</div>
-</div>
 </div>
 </div>
 <h1 id="shell" class="sect0"><a class="anchor" href="#shell"></a>The Apache 
HBase Shell</h1>
@@ -15943,9 +15937,21 @@ These parameters will be explained in context, and 
then will be given in a table
 <h6 id="compaction.being.stuck"><a class="anchor" 
href="#compaction.being.stuck"></a>Being Stuck</h6>
 <div class="paragraph">
 <p>When the MemStore gets too large, it needs to flush its contents to a 
StoreFile.
-However, a Store can only have <code>hbase.hstore.blockingStoreFiles</code> 
files, so the MemStore needs to wait for the number of StoreFiles to be reduced 
by one or more compactions.
-However, if the MemStore grows larger than 
<code>hbase.hregion.memstore.flush.size</code>, it is not able to flush its 
contents to a StoreFile.
-If the MemStore is too large and the number of StoreFiles is also too high, 
the algorithm is said to be "stuck". The compaction algorithm checks for this 
"stuck" situation and provides mechanisms to alleviate it.</p>
+However, Stores are configured with a bound on the number StoreFiles,
+<code>hbase.hstore.blockingStoreFiles</code>, and if in excess, the MemStore 
flush must wait
+until the StoreFile count is reduced by one or more compactions. If the 
MemStore
+is too large and the number of StoreFiles is also too high, the algorithm is 
said
+to be "stuck". By default we&#8217;ll wait on compactions up to
+<code>hbase.hstore.blockingWaitTime</code> milliseconds. If this period 
expires, we&#8217;ll flush
+anyways even though we are in excess of the
+<code>hbase.hstore.blockingStoreFiles</code> count.</p>
+</div>
+<div class="paragraph">
+<p>Upping the <code>hbase.hstore.blockingStoreFiles</code> count will allow 
flushes to happen
+but a Store with many StoreFiles in will likely have higher read latencies. 
Try to
+figure why Compactions are not keeping up. Is it a write spurt that is bringing
+about this situation or is a regular occurance and the cluster is 
under-provisioned
+for the volume of writes?</p>
 </div>
 </div>
 <div class="sect5">
@@ -32662,9 +32668,6 @@ Starting the mini-cluster takes about 20-30 seconds, 
but that should be appropri
 </table>
 </div>
 <div class="paragraph">
-<p>To use an HBase mini-cluster on Microsoft Windows, you need to use a Cygwin 
environment.</p>
-</div>
-<div class="paragraph">
 <p>See the paper at <a 
href="http://blog.sematext.com/2010/08/30/hbase-case-study-using-hbasetestingutility-for-local-testing-development/";>HBase
 Case-Study: Using HBaseTestingUtility for Local Testing and
                 Development</a> (2010) for more information about 
HBaseTestingUtility.</p>
 </div>
@@ -37001,7 +37004,7 @@ The server will return cellblocks compressed using this 
same compressor as long
 <div id="footer">
 <div id="footer-text">
 Version 3.0.0-SNAPSHOT<br>
-Last updated 2018-03-27 14:29:58 UTC
+Last updated 2018-03-28 14:29:55 UTC
 </div>
 </div>
 </body>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b2e10744/bulk-loads.html
----------------------------------------------------------------------
diff --git a/bulk-loads.html b/bulk-loads.html
index f4df371..a1f7dab 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="20180327" />
+    <meta name="Date-Revision-yyyymmdd" content="20180328" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013;  
       Bulk Loads in Apache HBase (TM)
@@ -178,9 +178,6 @@
                       <li>      <a href="metrics.html"  target="_blank" 
title="Metrics">Metrics</a>
 </li>
                   
-                      <li>      <a href="cygwin.html"  target="_blank" 
title="HBase on Windows">HBase on Windows</a>
-</li>
-                  
                       <li>      <a href="book.html#replication"  
target="_blank" title="Cluster replication">Cluster replication</a>
 </li>
                   
@@ -299,7 +296,7 @@ under the License. -->
                         <a href="https://www.apache.org/";>The Apache Software 
Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2018-03-27</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2018-03-28</li>
             </p>
                 </div>
 

Reply via email to