You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/08/16 14:48:40 UTC

[38/51] [partial] hbase-site git commit: Published site at 092efb42749bf7fc6ad338c96aae8e7b9d3a2c74.

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html b/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html
index b78489c..dc56751 100644
--- a/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html
+++ b/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html
@@ -443,7 +443,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.OutputSi
 <ul class="blockList">
 <li class="blockList">
 <h4>filterCellByStore</h4>
-<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html#line.1534">filterCellByStore</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a>&nbsp;logEntry)</pre>
+<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html#line.1536">filterCellByStore</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a>&nbsp;logEntry)</pre>
 </li>
 </ul>
 <a name="append-org.apache.hadoop.hbase.wal.WALSplitter.RegionEntryBuffer-">
@@ -452,7 +452,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.OutputSi
 <ul class="blockList">
 <li class="blockList">
 <h4>append</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html#line.1564">append</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.RegionEntryBuffer.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.RegionEntryBuffer</a>&nbsp;buffer)
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html#line.1566">append</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.RegionEntryBuffer.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.RegionEntryBuffer</a>&nbsp;buffer)
             throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -470,7 +470,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.OutputSi
 <ul class="blockList">
 <li class="blockList">
 <h4>appendBuffer</h4>
-<pre><a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.WriterAndPath</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html#line.1568">appendBuffer</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.RegionEntryBuffer.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.RegionEntryBuffer</a>&nbsp;buffer,
+<pre><a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.WriterAndPath</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html#line.1570">appendBuffer</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.RegionEntryBuffer.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.RegionEntryBuffer</a>&nbsp;buffer,
                                        boolean&nbsp;reusable)
                                 throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
@@ -485,7 +485,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.OutputSi
 <ul class="blockList">
 <li class="blockList">
 <h4>keepRegionEvent</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html#line.1613">keepRegionEvent</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a>&nbsp;entry)</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html#line.1615">keepRegionEvent</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a>&nbsp;entry)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.OutputSink.html#keepRegionEvent-org.apache.hadoop.hbase.wal.WAL.Entry-">WALSplitter.OutputSink</a></code></span></div>
 <div class="block">Some WALEdit's contain only KV's for account on what happened to a region.
  Not all sinks will want to get all of those edits.</div>
@@ -503,7 +503,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.OutputSi
 <ul class="blockList">
 <li class="blockList">
 <h4>getOutputCounts</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;byte[],<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true" title="class or interface in java.lang">Long</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html#line.1627">getOutputCounts</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;byte[],<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true" title="class or interface in java.lang">Long</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html#line.1629">getOutputCounts</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.OutputSink.html#getOutputCounts--">getOutputCounts</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.OutputSink.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.OutputSink</a></code></dd>
@@ -518,7 +518,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.OutputSi
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getNumberOfRecoveredRegions</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html#line.1636">getNumberOfRecoveredRegions</a>()</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html#line.1638">getNumberOfRecoveredRegions</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.OutputSink.html#getNumberOfRecoveredRegions--">getNumberOfRecoveredRegions</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.OutputSink.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.OutputSink</a></code></dd>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html b/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html
index 8fba2f6..484a6f9 100644
--- a/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html
+++ b/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.html#line.1800">WALSplitter.MutationReplay</a>
+<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.html#line.1802">WALSplitter.MutationReplay</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
 implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.MutationReplay</a>&gt;</pre>
 <div class="block">A struct used by getMutationsFromWALEntry</div>
@@ -230,7 +230,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparab
 <ul class="blockList">
 <li class="blockList">
 <h4>type</h4>
-<pre>public final&nbsp;org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutationProto.MutationType <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1812">type</a></pre>
+<pre>public final&nbsp;org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutationProto.MutationType <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1814">type</a></pre>
 </li>
 </ul>
 <a name="mutation">
@@ -239,7 +239,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparab
 <ul class="blockList">
 <li class="blockList">
 <h4>mutation</h4>
-<pre>public final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/Mutation.html" title="class in org.apache.hadoop.hbase.client">Mutation</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1813">mutation</a></pre>
+<pre>public final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/Mutation.html" title="class in org.apache.hadoop.hbase.client">Mutation</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1815">mutation</a></pre>
 </li>
 </ul>
 <a name="nonceGroup">
@@ -248,7 +248,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparab
 <ul class="blockList">
 <li class="blockList">
 <h4>nonceGroup</h4>
-<pre>public final&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1814">nonceGroup</a></pre>
+<pre>public final&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1816">nonceGroup</a></pre>
 </li>
 </ul>
 <a name="nonce">
@@ -257,7 +257,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparab
 <ul class="blockListLast">
 <li class="blockList">
 <h4>nonce</h4>
-<pre>public final&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1815">nonce</a></pre>
+<pre>public final&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1817">nonce</a></pre>
 </li>
 </ul>
 </li>
@@ -274,7 +274,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparab
 <ul class="blockListLast">
 <li class="blockList">
 <h4>MutationReplay</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1801">MutationReplay</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutationProto.MutationType&nbsp;type,
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1803">MutationReplay</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutationProto.MutationType&nbsp;type,
                       <a href="../../../../../org/apache/hadoop/hbase/client/Mutation.html" title="class in org.apache.hadoop.hbase.client">Mutation</a>&nbsp;mutation,
                       long&nbsp;nonceGroup,
                       long&nbsp;nonce)</pre>
@@ -294,7 +294,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparab
 <ul class="blockList">
 <li class="blockList">
 <h4>compareTo</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1818">compareTo</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.MutationReplay</a>&nbsp;d)</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1820">compareTo</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.MutationReplay</a>&nbsp;d)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true#compareTo-T-" title="class or interface in java.lang">compareTo</a></code>&nbsp;in interface&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.MutationReplay</a>&gt;</code></dd>
@@ -307,7 +307,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparab
 <ul class="blockList">
 <li class="blockList">
 <h4>equals</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1823">equals</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;obj)</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1825">equals</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;obj)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a></code>&nbsp;in class&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
@@ -320,7 +320,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparab
 <ul class="blockListLast">
 <li class="blockList">
 <h4>hashCode</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1832">hashCode</a>()</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html#line.1834">hashCode</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</a></code>&nbsp;in class&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html b/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html
index c1324e6..56d0991 100644
--- a/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html
+++ b/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public abstract static class <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.html#line.1754">WALSplitter.SinkWriter</a>
+<pre>public abstract static class <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.html#line.1756">WALSplitter.SinkWriter</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 <div class="block">Class wraps the actual writer which writes data out and related statistics</div>
 </li>
@@ -222,7 +222,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>editsWritten</h4>
-<pre>long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1756">editsWritten</a></pre>
+<pre>long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1758">editsWritten</a></pre>
 </li>
 </ul>
 <a name="editsSkipped">
@@ -231,7 +231,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>editsSkipped</h4>
-<pre>long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1758">editsSkipped</a></pre>
+<pre>long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1760">editsSkipped</a></pre>
 </li>
 </ul>
 <a name="nanosSpent">
@@ -240,7 +240,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>nanosSpent</h4>
-<pre>long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1760">nanosSpent</a></pre>
+<pre>long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1762">nanosSpent</a></pre>
 </li>
 </ul>
 </li>
@@ -257,7 +257,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>SinkWriter</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1754">SinkWriter</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1756">SinkWriter</a>()</pre>
 </li>
 </ul>
 </li>
@@ -274,7 +274,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>incrementEdits</h4>
-<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1762">incrementEdits</a>(int&nbsp;edits)</pre>
+<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1764">incrementEdits</a>(int&nbsp;edits)</pre>
 </li>
 </ul>
 <a name="incrementSkippedEdits-int-">
@@ -283,7 +283,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>incrementSkippedEdits</h4>
-<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1766">incrementSkippedEdits</a>(int&nbsp;skipped)</pre>
+<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1768">incrementSkippedEdits</a>(int&nbsp;skipped)</pre>
 </li>
 </ul>
 <a name="incrementNanoTime-long-">
@@ -292,7 +292,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>incrementNanoTime</h4>
-<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1770">incrementNanoTime</a>(long&nbsp;nanos)</pre>
+<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html#line.1772">incrementNanoTime</a>(long&nbsp;nanos)</pre>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html b/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html
index df08874..e8391c3 100644
--- a/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html
+++ b/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html
@@ -112,7 +112,7 @@
 </dl>
 <hr>
 <br>
-<pre>private static final class <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.html#line.1779">WALSplitter.WriterAndPath</a>
+<pre>private static final class <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.html#line.1781">WALSplitter.WriterAndPath</a>
 extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.SinkWriter</a></pre>
 <div class="block">Private data structure that wraps a Writer and its Path, also collecting statistics about the
  data written to this output.</div>
@@ -215,7 +215,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.SinkWrit
 <ul class="blockList">
 <li class="blockList">
 <h4>p</h4>
-<pre>final&nbsp;org.apache.hadoop.fs.Path <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html#line.1780">p</a></pre>
+<pre>final&nbsp;org.apache.hadoop.fs.Path <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html#line.1782">p</a></pre>
 </li>
 </ul>
 <a name="w">
@@ -224,7 +224,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.SinkWrit
 <ul class="blockList">
 <li class="blockList">
 <h4>w</h4>
-<pre>final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/wal/WALProvider.Writer.html" title="interface in org.apache.hadoop.hbase.wal">WALProvider.Writer</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html#line.1781">w</a></pre>
+<pre>final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/wal/WALProvider.Writer.html" title="interface in org.apache.hadoop.hbase.wal">WALProvider.Writer</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html#line.1783">w</a></pre>
 </li>
 </ul>
 <a name="minLogSeqNum">
@@ -233,7 +233,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.SinkWrit
 <ul class="blockListLast">
 <li class="blockList">
 <h4>minLogSeqNum</h4>
-<pre>final&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html#line.1782">minLogSeqNum</a></pre>
+<pre>final&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html#line.1784">minLogSeqNum</a></pre>
 </li>
 </ul>
 </li>
@@ -250,7 +250,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.SinkWrit
 <ul class="blockListLast">
 <li class="blockList">
 <h4>WriterAndPath</h4>
-<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html#line.1784">WriterAndPath</a>(org.apache.hadoop.fs.Path&nbsp;p,
+<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html#line.1786">WriterAndPath</a>(org.apache.hadoop.fs.Path&nbsp;p,
               <a href="../../../../../org/apache/hadoop/hbase/wal/WALProvider.Writer.html" title="interface in org.apache.hadoop.hbase.wal">WALProvider.Writer</a>&nbsp;w,
               long&nbsp;minLogSeqNum)</pre>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.html b/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.html
index 6042f21..0257e4b 100644
--- a/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.html
+++ b/devapidocs/org/apache/hadoop/hbase/wal/WALSplitter.html
@@ -431,8 +431,9 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 </tr>
 <tr id="i14" class="altColor">
 <td class="colFirst"><code>(package private) static org.apache.hadoop.fs.Path</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.html#getRegionSplitEditsPath-org.apache.hadoop.hbase.wal.WAL.Entry-java.lang.String-org.apache.hadoop.conf.Configuration-">getRegionSplitEditsPath</a></span>(<a href="../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a>&nbsp;logEntry,
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.html#getRegionSplitEditsPath-org.apache.hadoop.hbase.wal.WAL.Entry-java.lang.String-java.lang.String-org.apache.hadoop.conf.Configuration-">getRegionSplitEditsPath</a></span>(<a href="../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a>&nbsp;logEntry,
                        <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;fileNameBeingSplit,
+                       <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;tmpDirName,
                        org.apache.hadoop.conf.Configuration&nbsp;conf)</code>
 <div class="block">Path to a file under RECOVERED_EDITS_DIR directory of the region found in
  <code>logEntry</code> named for the sequenceid in the passed
@@ -909,14 +910,15 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 </dl>
 </li>
 </ul>
-<a name="getRegionSplitEditsPath-org.apache.hadoop.hbase.wal.WAL.Entry-java.lang.String-org.apache.hadoop.conf.Configuration-">
+<a name="getRegionSplitEditsPath-org.apache.hadoop.hbase.wal.WAL.Entry-java.lang.String-java.lang.String-org.apache.hadoop.conf.Configuration-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getRegionSplitEditsPath</h4>
-<pre>static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.html#line.469">getRegionSplitEditsPath</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a>&nbsp;logEntry,
+<pre>static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.html#line.470">getRegionSplitEditsPath</a>(<a href="../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a>&nbsp;logEntry,
                                                          <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;fileNameBeingSplit,
+                                                         <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;tmpDirName,
                                                          org.apache.hadoop.conf.Configuration&nbsp;conf)
                                                   throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Path to a file under RECOVERED_EDITS_DIR directory of the region found in
@@ -928,6 +930,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>logEntry</code> - </dd>
 <dd><code>fileNameBeingSplit</code> - the file being split currently. Used to generate tmp file name.</dd>
+<dd><code>tmpDirName</code> - of the directory used to sideline old recovered edits file</dd>
 <dd><code>conf</code> - </dd>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>Path to file into which to dump split log edits.</dd>
@@ -1215,7 +1218,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getMutationsFromWALEntry</h4>
-<pre>public static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.MutationReplay</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.html#line.1847">getMutationsFromWALEntry</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.WALEntry&nbsp;entry,
+<pre>public static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html" title="class in org.apache.hadoop.hbase.wal">WALSplitter.MutationReplay</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/wal/WALSplitter.html#line.1849">getMutationsFromWALEntry</a>(org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.WALEntry&nbsp;entry,
                                                                         <a href="../../../../../org/apache/hadoop/hbase/CellScanner.html" title="interface in org.apache.hadoop.hbase">CellScanner</a>&nbsp;cells,
                                                                         <a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/wal/WALKey.html" title="interface in org.apache.hadoop.hbase.wal">WALKey</a>,<a href="../../../../../org/apache/hadoop/hbase/wal/WALEdit.html" title="class in org.apache.hadoop.hbase.wal">WALEdit</a>&gt;&nbsp;logEntry,
                                                                         <a href="../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client">Durability</a>&nbsp;durability)

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/wal/class-use/WAL.Entry.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/wal/class-use/WAL.Entry.html b/devapidocs/org/apache/hadoop/hbase/wal/class-use/WAL.Entry.html
index c87aad6..1b06496 100644
--- a/devapidocs/org/apache/hadoop/hbase/wal/class-use/WAL.Entry.html
+++ b/devapidocs/org/apache/hadoop/hbase/wal/class-use/WAL.Entry.html
@@ -692,8 +692,9 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>(package private) static org.apache.hadoop.fs.Path</code></td>
-<td class="colLast"><span class="typeNameLabel">WALSplitter.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/wal/WALSplitter.html#getRegionSplitEditsPath-org.apache.hadoop.hbase.wal.WAL.Entry-java.lang.String-org.apache.hadoop.conf.Configuration-">getRegionSplitEditsPath</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a>&nbsp;logEntry,
+<td class="colLast"><span class="typeNameLabel">WALSplitter.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/wal/WALSplitter.html#getRegionSplitEditsPath-org.apache.hadoop.hbase.wal.WAL.Entry-java.lang.String-java.lang.String-org.apache.hadoop.conf.Configuration-">getRegionSplitEditsPath</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/wal/WAL.Entry.html" title="class in org.apache.hadoop.hbase.wal">WAL.Entry</a>&nbsp;logEntry,
                        <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;fileNameBeingSplit,
+                       <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;tmpDirName,
                        org.apache.hadoop.conf.Configuration&nbsp;conf)</code>
 <div class="block">Path to a file under RECOVERED_EDITS_DIR directory of the region found in
  <code>logEntry</code> named for the sequenceid in the passed

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html b/devapidocs/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html
index a145a8d..42a03ed 100644
--- a/devapidocs/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html
+++ b/devapidocs/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html
@@ -75,13 +75,13 @@ var activeTableTab = "activeTableTab";
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>
@@ -111,7 +111,7 @@ var activeTableTab = "activeTableTab";
 <br>
 <pre>@InterfaceAudience.LimitedPrivate(value="Tools")
  @InterfaceStability.Evolving
-public final class <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.57">HQuorumPeer</a>
+public final class <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.59">HQuorumPeer</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 <div class="block">HBase's version of ZooKeeper's QuorumPeer. When HBase is set to manage
  ZooKeeper, this class is used to start up QuorumPeer instances. By doing
@@ -124,6 +124,25 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>private static org.slf4j.Logger</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#LOG">LOG</a></span></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
 <li class="blockList"><a name="constructor.summary">
@@ -189,6 +208,23 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="LOG">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>LOG</h4>
+<pre>private static final&nbsp;org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.60">LOG</a></pre>
+</li>
+</ul>
+</li>
+</ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
 <li class="blockList"><a name="constructor.detail">
@@ -201,7 +237,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>HQuorumPeer</h4>
-<pre>private&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.58">HQuorumPeer</a>()</pre>
+<pre>private&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.62">HQuorumPeer</a>()</pre>
 </li>
 </ul>
 </li>
@@ -218,7 +254,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.65">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)</pre>
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.69">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[]&nbsp;args)</pre>
 <div class="block">Parse ZooKeeper configuration from HBase XML config and run a QuorumPeer.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -232,7 +268,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>runZKServer</h4>
-<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.85">runZKServer</a>(org.apache.zookeeper.server.quorum.QuorumPeerConfig&nbsp;zkConfig)
+<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.89">runZKServer</a>(org.apache.zookeeper.server.quorum.QuorumPeerConfig&nbsp;zkConfig)
                          throws <a href="https://docs.oracle.com/javase/8/docs/api/java/net/UnknownHostException.html?is-external=true" title="class or interface in java.net">UnknownHostException</a>,
                                 <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
@@ -248,7 +284,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>addressIsLocalHost</h4>
-<pre>private static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.98">addressIsLocalHost</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;address)</pre>
+<pre>private static&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.102">addressIsLocalHost</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;address)</pre>
 </li>
 </ul>
 <a name="writeMyID-java.util.Properties-">
@@ -257,7 +293,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>writeMyID</h4>
-<pre>static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.102">writeMyID</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util">Properties</a>&nbsp;properties)
+<pre>static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/zookeeper/HQuorumPeer.html#line.106">writeMyID</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html?is-external=true" title="class or interface in java.util">Properties</a>&nbsp;properties)
                throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -319,13 +355,13 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.summary">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field.detail">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor.detail">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method.detail">Method</a></li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html b/devapidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
index 9aa09f0..6900b04 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/LocalHBaseCluster.html
@@ -306,159 +306,162 @@
 <span class="sourceLineNo">298</span>        LOG.info("Waiting on " + rst.getRegionServer().toString());<a name="line.298"></a>
 <span class="sourceLineNo">299</span>        rst.join();<a name="line.299"></a>
 <span class="sourceLineNo">300</span>      } catch (InterruptedException e) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span>        e.printStackTrace();<a name="line.301"></a>
-<span class="sourceLineNo">302</span>      }<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    }<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    regionThreads.remove(rst);<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    return rst.getName();<a name="line.305"></a>
-<span class="sourceLineNo">306</span>  }<a name="line.306"></a>
-<span class="sourceLineNo">307</span><a name="line.307"></a>
-<span class="sourceLineNo">308</span>  /**<a name="line.308"></a>
-<span class="sourceLineNo">309</span>   * @return the HMaster thread<a name="line.309"></a>
-<span class="sourceLineNo">310</span>   */<a name="line.310"></a>
-<span class="sourceLineNo">311</span>  public HMaster getMaster(int serverNumber) {<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    return masterThreads.get(serverNumber).getMaster();<a name="line.312"></a>
-<span class="sourceLineNo">313</span>  }<a name="line.313"></a>
-<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span>  /**<a name="line.315"></a>
-<span class="sourceLineNo">316</span>   * Gets the current active master, if available.  If no active master, returns<a name="line.316"></a>
-<span class="sourceLineNo">317</span>   * null.<a name="line.317"></a>
-<span class="sourceLineNo">318</span>   * @return the HMaster for the active master<a name="line.318"></a>
-<span class="sourceLineNo">319</span>   */<a name="line.319"></a>
-<span class="sourceLineNo">320</span>  public HMaster getActiveMaster() {<a name="line.320"></a>
-<span class="sourceLineNo">321</span>    for (JVMClusterUtil.MasterThread mt : masterThreads) {<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      // Ensure that the current active master is not stopped.<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      // We don't want to return a stopping master as an active master.<a name="line.323"></a>
-<span class="sourceLineNo">324</span>      if (mt.getMaster().isActiveMaster()  &amp;&amp; !mt.getMaster().isStopped()) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span>        return mt.getMaster();<a name="line.325"></a>
-<span class="sourceLineNo">326</span>      }<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    }<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    return null;<a name="line.328"></a>
-<span class="sourceLineNo">329</span>  }<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span>  /**<a name="line.331"></a>
-<span class="sourceLineNo">332</span>   * @return Read-only list of master threads.<a name="line.332"></a>
-<span class="sourceLineNo">333</span>   */<a name="line.333"></a>
-<span class="sourceLineNo">334</span>  public List&lt;JVMClusterUtil.MasterThread&gt; getMasters() {<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    return Collections.unmodifiableList(this.masterThreads);<a name="line.335"></a>
-<span class="sourceLineNo">336</span>  }<a name="line.336"></a>
-<span class="sourceLineNo">337</span><a name="line.337"></a>
-<span class="sourceLineNo">338</span>  /**<a name="line.338"></a>
-<span class="sourceLineNo">339</span>   * @return List of running master servers (Some servers may have been killed<a name="line.339"></a>
-<span class="sourceLineNo">340</span>   * or aborted during lifetime of cluster; these servers are not included in<a name="line.340"></a>
-<span class="sourceLineNo">341</span>   * this list).<a name="line.341"></a>
-<span class="sourceLineNo">342</span>   */<a name="line.342"></a>
-<span class="sourceLineNo">343</span>  public List&lt;JVMClusterUtil.MasterThread&gt; getLiveMasters() {<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    List&lt;JVMClusterUtil.MasterThread&gt; liveServers = new ArrayList&lt;&gt;();<a name="line.344"></a>
-<span class="sourceLineNo">345</span>    List&lt;JVMClusterUtil.MasterThread&gt; list = getMasters();<a name="line.345"></a>
-<span class="sourceLineNo">346</span>    for (JVMClusterUtil.MasterThread mt: list) {<a name="line.346"></a>
-<span class="sourceLineNo">347</span>      if (mt.isAlive()) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span>        liveServers.add(mt);<a name="line.348"></a>
-<span class="sourceLineNo">349</span>      }<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    }<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    return liveServers;<a name="line.351"></a>
-<span class="sourceLineNo">352</span>  }<a name="line.352"></a>
-<span class="sourceLineNo">353</span><a name="line.353"></a>
-<span class="sourceLineNo">354</span>  /**<a name="line.354"></a>
-<span class="sourceLineNo">355</span>   * Wait for the specified master to stop. Removes this thread from list of running threads.<a name="line.355"></a>
-<span class="sourceLineNo">356</span>   * @return Name of master that just went down.<a name="line.356"></a>
-<span class="sourceLineNo">357</span>   */<a name="line.357"></a>
-<span class="sourceLineNo">358</span>  public String waitOnMaster(int serverNumber) {<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    JVMClusterUtil.MasterThread masterThread = this.masterThreads.get(serverNumber);<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    return waitOnMaster(masterThread);<a name="line.360"></a>
-<span class="sourceLineNo">361</span>  }<a name="line.361"></a>
-<span class="sourceLineNo">362</span><a name="line.362"></a>
-<span class="sourceLineNo">363</span>  /**<a name="line.363"></a>
-<span class="sourceLineNo">364</span>   * Wait for the specified master to stop. Removes this thread from list of running threads.<a name="line.364"></a>
-<span class="sourceLineNo">365</span>   * @return Name of master that just went down.<a name="line.365"></a>
-<span class="sourceLineNo">366</span>   */<a name="line.366"></a>
-<span class="sourceLineNo">367</span>  public String waitOnMaster(JVMClusterUtil.MasterThread masterThread) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    while (masterThread.isAlive()) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>      try {<a name="line.369"></a>
-<span class="sourceLineNo">370</span>        LOG.info("Waiting on " + masterThread.getMaster().getServerName().toString());<a name="line.370"></a>
-<span class="sourceLineNo">371</span>        masterThread.join();<a name="line.371"></a>
-<span class="sourceLineNo">372</span>      } catch (InterruptedException e) {<a name="line.372"></a>
-<span class="sourceLineNo">373</span>        e.printStackTrace();<a name="line.373"></a>
-<span class="sourceLineNo">374</span>      }<a name="line.374"></a>
-<span class="sourceLineNo">375</span>    }<a name="line.375"></a>
-<span class="sourceLineNo">376</span>    masterThreads.remove(masterThread);<a name="line.376"></a>
-<span class="sourceLineNo">377</span>    return masterThread.getName();<a name="line.377"></a>
-<span class="sourceLineNo">378</span>  }<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span>  /**<a name="line.380"></a>
-<span class="sourceLineNo">381</span>   * Wait for Mini HBase Cluster to shut down.<a name="line.381"></a>
-<span class="sourceLineNo">382</span>   * Presumes you've already called {@link #shutdown()}.<a name="line.382"></a>
-<span class="sourceLineNo">383</span>   */<a name="line.383"></a>
-<span class="sourceLineNo">384</span>  public void join() {<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    if (this.regionThreads != null) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span>      for(Thread t: this.regionThreads) {<a name="line.386"></a>
-<span class="sourceLineNo">387</span>        if (t.isAlive()) {<a name="line.387"></a>
-<span class="sourceLineNo">388</span>          try {<a name="line.388"></a>
-<span class="sourceLineNo">389</span>            Threads.threadDumpingIsAlive(t);<a name="line.389"></a>
-<span class="sourceLineNo">390</span>          } catch (InterruptedException e) {<a name="line.390"></a>
-<span class="sourceLineNo">391</span>            LOG.debug("Interrupted", e);<a name="line.391"></a>
-<span class="sourceLineNo">392</span>          }<a name="line.392"></a>
-<span class="sourceLineNo">393</span>        }<a name="line.393"></a>
-<span class="sourceLineNo">394</span>      }<a name="line.394"></a>
-<span class="sourceLineNo">395</span>    }<a name="line.395"></a>
-<span class="sourceLineNo">396</span>    if (this.masterThreads != null) {<a name="line.396"></a>
-<span class="sourceLineNo">397</span>      for (Thread t : this.masterThreads) {<a name="line.397"></a>
-<span class="sourceLineNo">398</span>        if (t.isAlive()) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span>          try {<a name="line.399"></a>
-<span class="sourceLineNo">400</span>            Threads.threadDumpingIsAlive(t);<a name="line.400"></a>
-<span class="sourceLineNo">401</span>          } catch (InterruptedException e) {<a name="line.401"></a>
-<span class="sourceLineNo">402</span>            LOG.debug("Interrupted", e);<a name="line.402"></a>
-<span class="sourceLineNo">403</span>          }<a name="line.403"></a>
-<span class="sourceLineNo">404</span>        }<a name="line.404"></a>
-<span class="sourceLineNo">405</span>      }<a name="line.405"></a>
-<span class="sourceLineNo">406</span>    }<a name="line.406"></a>
-<span class="sourceLineNo">407</span>  }<a name="line.407"></a>
-<span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span>  /**<a name="line.409"></a>
-<span class="sourceLineNo">410</span>   * Start the cluster.<a name="line.410"></a>
-<span class="sourceLineNo">411</span>   */<a name="line.411"></a>
-<span class="sourceLineNo">412</span>  public void startup() throws IOException {<a name="line.412"></a>
-<span class="sourceLineNo">413</span>    JVMClusterUtil.startup(this.masterThreads, this.regionThreads);<a name="line.413"></a>
-<span class="sourceLineNo">414</span>  }<a name="line.414"></a>
-<span class="sourceLineNo">415</span><a name="line.415"></a>
-<span class="sourceLineNo">416</span>  /**<a name="line.416"></a>
-<span class="sourceLineNo">417</span>   * Shut down the mini HBase cluster<a name="line.417"></a>
-<span class="sourceLineNo">418</span>   */<a name="line.418"></a>
-<span class="sourceLineNo">419</span>  public void shutdown() {<a name="line.419"></a>
-<span class="sourceLineNo">420</span>    JVMClusterUtil.shutdown(this.masterThreads, this.regionThreads);<a name="line.420"></a>
-<span class="sourceLineNo">421</span>  }<a name="line.421"></a>
-<span class="sourceLineNo">422</span><a name="line.422"></a>
-<span class="sourceLineNo">423</span>  /**<a name="line.423"></a>
-<span class="sourceLineNo">424</span>   * @param c Configuration to check.<a name="line.424"></a>
-<span class="sourceLineNo">425</span>   * @return True if a 'local' address in hbase.master value.<a name="line.425"></a>
-<span class="sourceLineNo">426</span>   */<a name="line.426"></a>
-<span class="sourceLineNo">427</span>  public static boolean isLocal(final Configuration c) {<a name="line.427"></a>
-<span class="sourceLineNo">428</span>    boolean mode = c.getBoolean(HConstants.CLUSTER_DISTRIBUTED, HConstants.DEFAULT_CLUSTER_DISTRIBUTED);<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    return(mode == HConstants.CLUSTER_IS_LOCAL);<a name="line.429"></a>
-<span class="sourceLineNo">430</span>  }<a name="line.430"></a>
-<span class="sourceLineNo">431</span><a name="line.431"></a>
-<span class="sourceLineNo">432</span>  /**<a name="line.432"></a>
-<span class="sourceLineNo">433</span>   * Test things basically work.<a name="line.433"></a>
-<span class="sourceLineNo">434</span>   * @param args<a name="line.434"></a>
-<span class="sourceLineNo">435</span>   * @throws IOException<a name="line.435"></a>
-<span class="sourceLineNo">436</span>   */<a name="line.436"></a>
-<span class="sourceLineNo">437</span>  public static void main(String[] args) throws IOException {<a name="line.437"></a>
-<span class="sourceLineNo">438</span>    Configuration conf = HBaseConfiguration.create();<a name="line.438"></a>
-<span class="sourceLineNo">439</span>    LocalHBaseCluster cluster = new LocalHBaseCluster(conf);<a name="line.439"></a>
-<span class="sourceLineNo">440</span>    cluster.startup();<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    Connection connection = ConnectionFactory.createConnection(conf);<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    Admin admin = connection.getAdmin();<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    try {<a name="line.443"></a>
-<span class="sourceLineNo">444</span>      HTableDescriptor htd =<a name="line.444"></a>
-<span class="sourceLineNo">445</span>        new HTableDescriptor(TableName.valueOf(cluster.getClass().getName()));<a name="line.445"></a>
-<span class="sourceLineNo">446</span>      admin.createTable(htd);<a name="line.446"></a>
-<span class="sourceLineNo">447</span>    } finally {<a name="line.447"></a>
-<span class="sourceLineNo">448</span>      admin.close();<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    }<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    connection.close();<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    cluster.shutdown();<a name="line.451"></a>
-<span class="sourceLineNo">452</span>  }<a name="line.452"></a>
-<span class="sourceLineNo">453</span>}<a name="line.453"></a>
+<span class="sourceLineNo">301</span>        LOG.error("Interrupted while waiting for {} to finish. Retrying join", rst.getName(), e);<a name="line.301"></a>
+<span class="sourceLineNo">302</span>        Thread.currentThread().interrupt();<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      }<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    }<a name="line.304"></a>
+<span class="sourceLineNo">305</span>    regionThreads.remove(rst);<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    return rst.getName();<a name="line.306"></a>
+<span class="sourceLineNo">307</span>  }<a name="line.307"></a>
+<span class="sourceLineNo">308</span><a name="line.308"></a>
+<span class="sourceLineNo">309</span>  /**<a name="line.309"></a>
+<span class="sourceLineNo">310</span>   * @return the HMaster thread<a name="line.310"></a>
+<span class="sourceLineNo">311</span>   */<a name="line.311"></a>
+<span class="sourceLineNo">312</span>  public HMaster getMaster(int serverNumber) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    return masterThreads.get(serverNumber).getMaster();<a name="line.313"></a>
+<span class="sourceLineNo">314</span>  }<a name="line.314"></a>
+<span class="sourceLineNo">315</span><a name="line.315"></a>
+<span class="sourceLineNo">316</span>  /**<a name="line.316"></a>
+<span class="sourceLineNo">317</span>   * Gets the current active master, if available.  If no active master, returns<a name="line.317"></a>
+<span class="sourceLineNo">318</span>   * null.<a name="line.318"></a>
+<span class="sourceLineNo">319</span>   * @return the HMaster for the active master<a name="line.319"></a>
+<span class="sourceLineNo">320</span>   */<a name="line.320"></a>
+<span class="sourceLineNo">321</span>  public HMaster getActiveMaster() {<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    for (JVMClusterUtil.MasterThread mt : masterThreads) {<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      // Ensure that the current active master is not stopped.<a name="line.323"></a>
+<span class="sourceLineNo">324</span>      // We don't want to return a stopping master as an active master.<a name="line.324"></a>
+<span class="sourceLineNo">325</span>      if (mt.getMaster().isActiveMaster()  &amp;&amp; !mt.getMaster().isStopped()) {<a name="line.325"></a>
+<span class="sourceLineNo">326</span>        return mt.getMaster();<a name="line.326"></a>
+<span class="sourceLineNo">327</span>      }<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    }<a name="line.328"></a>
+<span class="sourceLineNo">329</span>    return null;<a name="line.329"></a>
+<span class="sourceLineNo">330</span>  }<a name="line.330"></a>
+<span class="sourceLineNo">331</span><a name="line.331"></a>
+<span class="sourceLineNo">332</span>  /**<a name="line.332"></a>
+<span class="sourceLineNo">333</span>   * @return Read-only list of master threads.<a name="line.333"></a>
+<span class="sourceLineNo">334</span>   */<a name="line.334"></a>
+<span class="sourceLineNo">335</span>  public List&lt;JVMClusterUtil.MasterThread&gt; getMasters() {<a name="line.335"></a>
+<span class="sourceLineNo">336</span>    return Collections.unmodifiableList(this.masterThreads);<a name="line.336"></a>
+<span class="sourceLineNo">337</span>  }<a name="line.337"></a>
+<span class="sourceLineNo">338</span><a name="line.338"></a>
+<span class="sourceLineNo">339</span>  /**<a name="line.339"></a>
+<span class="sourceLineNo">340</span>   * @return List of running master servers (Some servers may have been killed<a name="line.340"></a>
+<span class="sourceLineNo">341</span>   * or aborted during lifetime of cluster; these servers are not included in<a name="line.341"></a>
+<span class="sourceLineNo">342</span>   * this list).<a name="line.342"></a>
+<span class="sourceLineNo">343</span>   */<a name="line.343"></a>
+<span class="sourceLineNo">344</span>  public List&lt;JVMClusterUtil.MasterThread&gt; getLiveMasters() {<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    List&lt;JVMClusterUtil.MasterThread&gt; liveServers = new ArrayList&lt;&gt;();<a name="line.345"></a>
+<span class="sourceLineNo">346</span>    List&lt;JVMClusterUtil.MasterThread&gt; list = getMasters();<a name="line.346"></a>
+<span class="sourceLineNo">347</span>    for (JVMClusterUtil.MasterThread mt: list) {<a name="line.347"></a>
+<span class="sourceLineNo">348</span>      if (mt.isAlive()) {<a name="line.348"></a>
+<span class="sourceLineNo">349</span>        liveServers.add(mt);<a name="line.349"></a>
+<span class="sourceLineNo">350</span>      }<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    }<a name="line.351"></a>
+<span class="sourceLineNo">352</span>    return liveServers;<a name="line.352"></a>
+<span class="sourceLineNo">353</span>  }<a name="line.353"></a>
+<span class="sourceLineNo">354</span><a name="line.354"></a>
+<span class="sourceLineNo">355</span>  /**<a name="line.355"></a>
+<span class="sourceLineNo">356</span>   * Wait for the specified master to stop. Removes this thread from list of running threads.<a name="line.356"></a>
+<span class="sourceLineNo">357</span>   * @return Name of master that just went down.<a name="line.357"></a>
+<span class="sourceLineNo">358</span>   */<a name="line.358"></a>
+<span class="sourceLineNo">359</span>  public String waitOnMaster(int serverNumber) {<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    JVMClusterUtil.MasterThread masterThread = this.masterThreads.get(serverNumber);<a name="line.360"></a>
+<span class="sourceLineNo">361</span>    return waitOnMaster(masterThread);<a name="line.361"></a>
+<span class="sourceLineNo">362</span>  }<a name="line.362"></a>
+<span class="sourceLineNo">363</span><a name="line.363"></a>
+<span class="sourceLineNo">364</span>  /**<a name="line.364"></a>
+<span class="sourceLineNo">365</span>   * Wait for the specified master to stop. Removes this thread from list of running threads.<a name="line.365"></a>
+<span class="sourceLineNo">366</span>   * @return Name of master that just went down.<a name="line.366"></a>
+<span class="sourceLineNo">367</span>   */<a name="line.367"></a>
+<span class="sourceLineNo">368</span>  public String waitOnMaster(JVMClusterUtil.MasterThread masterThread) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>    while (masterThread.isAlive()) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span>      try {<a name="line.370"></a>
+<span class="sourceLineNo">371</span>        LOG.info("Waiting on " + masterThread.getMaster().getServerName().toString());<a name="line.371"></a>
+<span class="sourceLineNo">372</span>        masterThread.join();<a name="line.372"></a>
+<span class="sourceLineNo">373</span>      } catch (InterruptedException e) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span>        LOG.error("Interrupted while waiting for {} to finish. Retrying join",<a name="line.374"></a>
+<span class="sourceLineNo">375</span>            masterThread.getName(), e);<a name="line.375"></a>
+<span class="sourceLineNo">376</span>        Thread.currentThread().interrupt();<a name="line.376"></a>
+<span class="sourceLineNo">377</span>      }<a name="line.377"></a>
+<span class="sourceLineNo">378</span>    }<a name="line.378"></a>
+<span class="sourceLineNo">379</span>    masterThreads.remove(masterThread);<a name="line.379"></a>
+<span class="sourceLineNo">380</span>    return masterThread.getName();<a name="line.380"></a>
+<span class="sourceLineNo">381</span>  }<a name="line.381"></a>
+<span class="sourceLineNo">382</span><a name="line.382"></a>
+<span class="sourceLineNo">383</span>  /**<a name="line.383"></a>
+<span class="sourceLineNo">384</span>   * Wait for Mini HBase Cluster to shut down.<a name="line.384"></a>
+<span class="sourceLineNo">385</span>   * Presumes you've already called {@link #shutdown()}.<a name="line.385"></a>
+<span class="sourceLineNo">386</span>   */<a name="line.386"></a>
+<span class="sourceLineNo">387</span>  public void join() {<a name="line.387"></a>
+<span class="sourceLineNo">388</span>    if (this.regionThreads != null) {<a name="line.388"></a>
+<span class="sourceLineNo">389</span>      for(Thread t: this.regionThreads) {<a name="line.389"></a>
+<span class="sourceLineNo">390</span>        if (t.isAlive()) {<a name="line.390"></a>
+<span class="sourceLineNo">391</span>          try {<a name="line.391"></a>
+<span class="sourceLineNo">392</span>            Threads.threadDumpingIsAlive(t);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>          } catch (InterruptedException e) {<a name="line.393"></a>
+<span class="sourceLineNo">394</span>            LOG.debug("Interrupted", e);<a name="line.394"></a>
+<span class="sourceLineNo">395</span>          }<a name="line.395"></a>
+<span class="sourceLineNo">396</span>        }<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      }<a name="line.397"></a>
+<span class="sourceLineNo">398</span>    }<a name="line.398"></a>
+<span class="sourceLineNo">399</span>    if (this.masterThreads != null) {<a name="line.399"></a>
+<span class="sourceLineNo">400</span>      for (Thread t : this.masterThreads) {<a name="line.400"></a>
+<span class="sourceLineNo">401</span>        if (t.isAlive()) {<a name="line.401"></a>
+<span class="sourceLineNo">402</span>          try {<a name="line.402"></a>
+<span class="sourceLineNo">403</span>            Threads.threadDumpingIsAlive(t);<a name="line.403"></a>
+<span class="sourceLineNo">404</span>          } catch (InterruptedException e) {<a name="line.404"></a>
+<span class="sourceLineNo">405</span>            LOG.debug("Interrupted", e);<a name="line.405"></a>
+<span class="sourceLineNo">406</span>          }<a name="line.406"></a>
+<span class="sourceLineNo">407</span>        }<a name="line.407"></a>
+<span class="sourceLineNo">408</span>      }<a name="line.408"></a>
+<span class="sourceLineNo">409</span>    }<a name="line.409"></a>
+<span class="sourceLineNo">410</span>  }<a name="line.410"></a>
+<span class="sourceLineNo">411</span><a name="line.411"></a>
+<span class="sourceLineNo">412</span>  /**<a name="line.412"></a>
+<span class="sourceLineNo">413</span>   * Start the cluster.<a name="line.413"></a>
+<span class="sourceLineNo">414</span>   */<a name="line.414"></a>
+<span class="sourceLineNo">415</span>  public void startup() throws IOException {<a name="line.415"></a>
+<span class="sourceLineNo">416</span>    JVMClusterUtil.startup(this.masterThreads, this.regionThreads);<a name="line.416"></a>
+<span class="sourceLineNo">417</span>  }<a name="line.417"></a>
+<span class="sourceLineNo">418</span><a name="line.418"></a>
+<span class="sourceLineNo">419</span>  /**<a name="line.419"></a>
+<span class="sourceLineNo">420</span>   * Shut down the mini HBase cluster<a name="line.420"></a>
+<span class="sourceLineNo">421</span>   */<a name="line.421"></a>
+<span class="sourceLineNo">422</span>  public void shutdown() {<a name="line.422"></a>
+<span class="sourceLineNo">423</span>    JVMClusterUtil.shutdown(this.masterThreads, this.regionThreads);<a name="line.423"></a>
+<span class="sourceLineNo">424</span>  }<a name="line.424"></a>
+<span class="sourceLineNo">425</span><a name="line.425"></a>
+<span class="sourceLineNo">426</span>  /**<a name="line.426"></a>
+<span class="sourceLineNo">427</span>   * @param c Configuration to check.<a name="line.427"></a>
+<span class="sourceLineNo">428</span>   * @return True if a 'local' address in hbase.master value.<a name="line.428"></a>
+<span class="sourceLineNo">429</span>   */<a name="line.429"></a>
+<span class="sourceLineNo">430</span>  public static boolean isLocal(final Configuration c) {<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    boolean mode = c.getBoolean(HConstants.CLUSTER_DISTRIBUTED, HConstants.DEFAULT_CLUSTER_DISTRIBUTED);<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    return(mode == HConstants.CLUSTER_IS_LOCAL);<a name="line.432"></a>
+<span class="sourceLineNo">433</span>  }<a name="line.433"></a>
+<span class="sourceLineNo">434</span><a name="line.434"></a>
+<span class="sourceLineNo">435</span>  /**<a name="line.435"></a>
+<span class="sourceLineNo">436</span>   * Test things basically work.<a name="line.436"></a>
+<span class="sourceLineNo">437</span>   * @param args<a name="line.437"></a>
+<span class="sourceLineNo">438</span>   * @throws IOException<a name="line.438"></a>
+<span class="sourceLineNo">439</span>   */<a name="line.439"></a>
+<span class="sourceLineNo">440</span>  public static void main(String[] args) throws IOException {<a name="line.440"></a>
+<span class="sourceLineNo">441</span>    Configuration conf = HBaseConfiguration.create();<a name="line.441"></a>
+<span class="sourceLineNo">442</span>    LocalHBaseCluster cluster = new LocalHBaseCluster(conf);<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    cluster.startup();<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    Connection connection = ConnectionFactory.createConnection(conf);<a name="line.444"></a>
+<span class="sourceLineNo">445</span>    Admin admin = connection.getAdmin();<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    try {<a name="line.446"></a>
+<span class="sourceLineNo">447</span>      HTableDescriptor htd =<a name="line.447"></a>
+<span class="sourceLineNo">448</span>        new HTableDescriptor(TableName.valueOf(cluster.getClass().getName()));<a name="line.448"></a>
+<span class="sourceLineNo">449</span>      admin.createTable(htd);<a name="line.449"></a>
+<span class="sourceLineNo">450</span>    } finally {<a name="line.450"></a>
+<span class="sourceLineNo">451</span>      admin.close();<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    }<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    connection.close();<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    cluster.shutdown();<a name="line.454"></a>
+<span class="sourceLineNo">455</span>  }<a name="line.455"></a>
+<span class="sourceLineNo">456</span>}<a name="line.456"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
index 7757245..e1ef1a3 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
@@ -16,11 +16,11 @@
 <span class="sourceLineNo">008</span>@InterfaceAudience.Private<a name="line.8"></a>
 <span class="sourceLineNo">009</span>public class Version {<a name="line.9"></a>
 <span class="sourceLineNo">010</span>  public static final String version = "3.0.0-SNAPSHOT";<a name="line.10"></a>
-<span class="sourceLineNo">011</span>  public static final String revision = "1114a1a65e78a00f643ef15b9a13bc710cb80845";<a name="line.11"></a>
+<span class="sourceLineNo">011</span>  public static final String revision = "092efb42749bf7fc6ad338c96aae8e7b9d3a2c74";<a name="line.11"></a>
 <span class="sourceLineNo">012</span>  public static final String user = "jenkins";<a name="line.12"></a>
-<span class="sourceLineNo">013</span>  public static final String date = "Wed Aug 15 14:39:17 UTC 2018";<a name="line.13"></a>
+<span class="sourceLineNo">013</span>  public static final String date = "Thu Aug 16 14:38:56 UTC 2018";<a name="line.13"></a>
 <span class="sourceLineNo">014</span>  public static final String url = "git://jenkins-websites1.apache.org/home/jenkins/jenkins-slave/workspace/hbase_generate_website/hbase";<a name="line.14"></a>
-<span class="sourceLineNo">015</span>  public static final String srcChecksum = "b03e26b326c47068ee3c2d38b4181ca8";<a name="line.15"></a>
+<span class="sourceLineNo">015</span>  public static final String srcChecksum = "ea011180320b95ba2577dbbea3f2ed3d";<a name="line.15"></a>
 <span class="sourceLineNo">016</span>}<a name="line.16"></a>
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/backup/RestoreDriver.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/backup/RestoreDriver.html b/devapidocs/src-html/org/apache/hadoop/hbase/backup/RestoreDriver.html
index 4b58ed2..73fb9dc 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/RestoreDriver.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/RestoreDriver.html
@@ -188,7 +188,7 @@
 <span class="sourceLineNo">180</span>      client.restore(BackupUtils.createRestoreRequest(backupRootDir, backupId, check,<a name="line.180"></a>
 <span class="sourceLineNo">181</span>        sTableArray, tTableArray, overwrite));<a name="line.181"></a>
 <span class="sourceLineNo">182</span>    } catch (Exception e) {<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      e.printStackTrace();<a name="line.183"></a>
+<span class="sourceLineNo">183</span>      LOG.error("Error while running restore backup", e);<a name="line.183"></a>
 <span class="sourceLineNo">184</span>      return -5;<a name="line.184"></a>
 <span class="sourceLineNo">185</span>    }<a name="line.185"></a>
 <span class="sourceLineNo">186</span>    return 0;<a name="line.186"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f3d62514/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.PrefetchRunnable.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.PrefetchRunnable.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.PrefetchRunnable.html
index 1c85f39..08653af 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.PrefetchRunnable.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/ClientAsyncPrefetchScanner.PrefetchRunnable.html
@@ -154,53 +154,52 @@
 <span class="sourceLineNo">146</span>    // Rethrow the exception so the application can handle it.<a name="line.146"></a>
 <span class="sourceLineNo">147</span>    while (!exceptionsQueue.isEmpty()) {<a name="line.147"></a>
 <span class="sourceLineNo">148</span>      Exception first = exceptionsQueue.peek();<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      first.printStackTrace();<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      if (first instanceof IOException) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span>        throw (IOException) first;<a name="line.151"></a>
-<span class="sourceLineNo">152</span>      }<a name="line.152"></a>
-<span class="sourceLineNo">153</span>      throw (RuntimeException) first;<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    }<a name="line.154"></a>
-<span class="sourceLineNo">155</span>  }<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span>  private boolean prefetchCondition() {<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    return cacheSizeInBytes.get() &lt; maxCacheSize / 2;<a name="line.158"></a>
-<span class="sourceLineNo">159</span>  }<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span>  private Result pollCache() {<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    Result res = cache.poll();<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    long estimatedSize = calcEstimatedSize(res);<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    addEstimatedSize(-estimatedSize);<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    return res;<a name="line.165"></a>
-<span class="sourceLineNo">166</span>  }<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>  private class PrefetchRunnable implements Runnable {<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span>    @Override<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    public void run() {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      while (!closed) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>        boolean succeed = false;<a name="line.173"></a>
-<span class="sourceLineNo">174</span>        try {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>          lock.lock();<a name="line.175"></a>
-<span class="sourceLineNo">176</span>          while (!prefetchCondition()) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span>            notFull.await();<a name="line.177"></a>
-<span class="sourceLineNo">178</span>          }<a name="line.178"></a>
-<span class="sourceLineNo">179</span>          loadCache();<a name="line.179"></a>
-<span class="sourceLineNo">180</span>          succeed = true;<a name="line.180"></a>
-<span class="sourceLineNo">181</span>        } catch (Exception e) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span>          exceptionsQueue.add(e);<a name="line.182"></a>
-<span class="sourceLineNo">183</span>        } finally {<a name="line.183"></a>
-<span class="sourceLineNo">184</span>          notEmpty.signalAll();<a name="line.184"></a>
-<span class="sourceLineNo">185</span>          lock.unlock();<a name="line.185"></a>
-<span class="sourceLineNo">186</span>          if (prefetchListener != null) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>            prefetchListener.accept(succeed);<a name="line.187"></a>
-<span class="sourceLineNo">188</span>          }<a name="line.188"></a>
-<span class="sourceLineNo">189</span>        }<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      }<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    }<a name="line.191"></a>
-<span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span>  }<a name="line.193"></a>
-<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span>}<a name="line.195"></a>
+<span class="sourceLineNo">149</span>      if (first instanceof IOException) {<a name="line.149"></a>
+<span class="sourceLineNo">150</span>        throw (IOException) first;<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      }<a name="line.151"></a>
+<span class="sourceLineNo">152</span>      throw (RuntimeException) first;<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    }<a name="line.153"></a>
+<span class="sourceLineNo">154</span>  }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span>  private boolean prefetchCondition() {<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    return cacheSizeInBytes.get() &lt; maxCacheSize / 2;<a name="line.157"></a>
+<span class="sourceLineNo">158</span>  }<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span>  private Result pollCache() {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    Result res = cache.poll();<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    long estimatedSize = calcEstimatedSize(res);<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    addEstimatedSize(-estimatedSize);<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    return res;<a name="line.164"></a>
+<span class="sourceLineNo">165</span>  }<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span>  private class PrefetchRunnable implements Runnable {<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span>    @Override<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    public void run() {<a name="line.170"></a>
+<span class="sourceLineNo">171</span>      while (!closed) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span>        boolean succeed = false;<a name="line.172"></a>
+<span class="sourceLineNo">173</span>        try {<a name="line.173"></a>
+<span class="sourceLineNo">174</span>          lock.lock();<a name="line.174"></a>
+<span class="sourceLineNo">175</span>          while (!prefetchCondition()) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span>            notFull.await();<a name="line.176"></a>
+<span class="sourceLineNo">177</span>          }<a name="line.177"></a>
+<span class="sourceLineNo">178</span>          loadCache();<a name="line.178"></a>
+<span class="sourceLineNo">179</span>          succeed = true;<a name="line.179"></a>
+<span class="sourceLineNo">180</span>        } catch (Exception e) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span>          exceptionsQueue.add(e);<a name="line.181"></a>
+<span class="sourceLineNo">182</span>        } finally {<a name="line.182"></a>
+<span class="sourceLineNo">183</span>          notEmpty.signalAll();<a name="line.183"></a>
+<span class="sourceLineNo">184</span>          lock.unlock();<a name="line.184"></a>
+<span class="sourceLineNo">185</span>          if (prefetchListener != null) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>            prefetchListener.accept(succeed);<a name="line.186"></a>
+<span class="sourceLineNo">187</span>          }<a name="line.187"></a>
+<span class="sourceLineNo">188</span>        }<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      }<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span>  }<a name="line.192"></a>
+<span class="sourceLineNo">193</span><a name="line.193"></a>
+<span class="sourceLineNo">194</span>}<a name="line.194"></a>