You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2016/01/29 18:13:49 UTC
[30/51] [partial] hbase-site git commit: Published site at
0de221a19d799ad515f8f4556cacd05e6b4e74f8.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c6155501/devapidocs/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html b/devapidocs/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html
index 734392e..f68a0c0 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html
@@ -105,7 +105,7 @@
<hr>
<br>
<pre><a href="../../../../../../org/apache/hadoop/hbase/classification/InterfaceAudience.Private.html" title="annotation in org.apache.hadoop.hbase.classification">@InterfaceAudience.Private</a>
-public class <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#line.50">DispatchMergingRegionHandler</a>
+public class <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#line.51">DispatchMergingRegionHandler</a>
extends <a href="../../../../../../org/apache/hadoop/hbase/executor/EventHandler.html" title="class in org.apache.hadoop.hbase.executor">EventHandler</a></pre>
<div class="block">Handles MERGE regions request on master: move the regions together(on the
same regionserver) and send MERGE RPC to regionserver.
@@ -157,6 +157,10 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/executor/EventHandler
<td class="colFirst"><code>private int</code></td>
<td class="colLast"><code><strong><a href="../../../../../../org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#timeout">timeout</a></strong></code> </td>
</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/security/User.html" title="class in org.apache.hadoop.hbase.security">User</a></code></td>
+<td class="colLast"><code><strong><a href="../../../../../../org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#user">user</a></strong></code> </td>
+</tr>
</table>
<ul class="blockList">
<li class="blockList"><a name="fields_inherited_from_class_org.apache.hadoop.hbase.executor.EventHandler">
@@ -179,11 +183,12 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/executor/EventHandler
<th class="colOne" scope="col">Constructor and Description</th>
</tr>
<tr class="altColor">
-<td class="colOne"><code><strong><a href="../../../../../../org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#DispatchMergingRegionHandler(org.apache.hadoop.hbase.master.MasterServices,%20org.apache.hadoop.hbase.master.CatalogJanitor,%20org.apache.hadoop.hbase.HRegionInfo,%20org.apache.hadoop.hbase.HRegionInfo,%20boolean)">DispatchMergingRegionHandler</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/master/MasterServices.html" title="interface in org.apache.hadoop.hbase.master">MasterServices</a> services,
+<td class="colOne"><code><strong><a href="../../../../../../org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#DispatchMergingRegionHandler(org.apache.hadoop.hbase.master.MasterServices,%20org.apache.hadoop.hbase.master.CatalogJanitor,%20org.apache.hadoop.hbase.HRegionInfo,%20org.apache.hadoop.hbase.HRegionInfo,%20boolean,%20org.apache.hadoop.hbase.security.User)">DispatchMergingRegionHandler</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/master/MasterServices.html" title="interface in org.apache.hadoop.hbase.master">MasterServices</a> services,
<a href="../../../../../../org/apache/hadoop/hbase/master/CatalogJanitor.html" title="class in org.apache.hadoop.hbase.master">CatalogJanitor</a> catalogJanitor,
<a href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a> region_a,
<a href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a> region_b,
- boolean forcible)</code> </td>
+ boolean forcible,
+ <a href="../../../../../../org/apache/hadoop/hbase/security/User.html" title="class in org.apache.hadoop.hbase.security">User</a> user)</code> </td>
</tr>
</table>
</li>
@@ -247,7 +252,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/executor/EventHandler
<ul class="blockList">
<li class="blockList">
<h4>LOG</h4>
-<pre>private static final org.apache.commons.logging.Log <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#line.51">LOG</a></pre>
+<pre>private static final org.apache.commons.logging.Log <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#line.52">LOG</a></pre>
</li>
</ul>
<a name="masterServices">
@@ -256,7 +261,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/executor/EventHandler
<ul class="blockList">
<li class="blockList">
<h4>masterServices</h4>
-<pre>private final <a href="../../../../../../org/apache/hadoop/hbase/master/MasterServices.html" title="interface in org.apache.hadoop.hbase.master">MasterServices</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#line.52">masterServices</a></pre>
+<pre>private final <a href="../../../../../../org/apache/hadoop/hbase/master/MasterServices.html" title="interface in org.apache.hadoop.hbase.master">MasterServices</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#line.53">masterServices</a></pre>
</li>
</ul>
<a name="catalogJanitor">
@@ -265,7 +270,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/executor/EventHandler
<ul class="blockList">
<li class="blockList">
<h4>catalogJanitor</h4>
-<pre>private final <a href="../../../../../../org/apache/hadoop/hbase/master/CatalogJanitor.html" title="class in org.apache.hadoop.hbase.master">CatalogJanitor</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#line.53">catalogJanitor</a></pre>
+<pre>private final <a href="../../../../../../org/apache/hadoop/hbase/master/CatalogJanitor.html" title="class in org.apache.hadoop.hbase.master">CatalogJanitor</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#line.54">catalogJanitor</a></pre>
</li>
</ul>
<a name="region_a">
@@ -274,7 +279,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/executor/EventHandler
<ul class="blockList">
<li class="blockList">
<h4>region_a</h4>
-<pre>private <a href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#line.54">region_a</a></pre>
+<pre>private <a href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#line.55">region_a</a></pre>
</li>
</ul>
<a name="region_b">
@@ -283,7 +288,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/executor/EventHandler
<ul class="blockList">
<li class="blockList">
<h4>region_b</h4>
-<pre>private <a href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#line.55">region_b</a></pre>
+<pre>private <a href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#line.56">region_b</a></pre>
</li>
</ul>
<a name="forcible">
@@ -292,16 +297,25 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/executor/EventHandler
<ul class="blockList">
<li class="blockList">
<h4>forcible</h4>
-<pre>private final boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#line.56">forcible</a></pre>
+<pre>private final boolean <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#line.57">forcible</a></pre>
</li>
</ul>
<a name="timeout">
<!-- -->
</a>
-<ul class="blockListLast">
+<ul class="blockList">
<li class="blockList">
<h4>timeout</h4>
-<pre>private final int <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#line.57">timeout</a></pre>
+<pre>private final int <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#line.58">timeout</a></pre>
+</li>
+</ul>
+<a name="user">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>user</h4>
+<pre>private final <a href="../../../../../../org/apache/hadoop/hbase/security/User.html" title="class in org.apache.hadoop.hbase.security">User</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#line.59">user</a></pre>
</li>
</ul>
</li>
@@ -312,17 +326,18 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/executor/EventHandler
<!-- -->
</a>
<h3>Constructor Detail</h3>
-<a name="DispatchMergingRegionHandler(org.apache.hadoop.hbase.master.MasterServices, org.apache.hadoop.hbase.master.CatalogJanitor, org.apache.hadoop.hbase.HRegionInfo, org.apache.hadoop.hbase.HRegionInfo, boolean)">
+<a name="DispatchMergingRegionHandler(org.apache.hadoop.hbase.master.MasterServices, org.apache.hadoop.hbase.master.CatalogJanitor, org.apache.hadoop.hbase.HRegionInfo, org.apache.hadoop.hbase.HRegionInfo, boolean, org.apache.hadoop.hbase.security.User)">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
<h4>DispatchMergingRegionHandler</h4>
-<pre>public <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#line.59">DispatchMergingRegionHandler</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/MasterServices.html" title="interface in org.apache.hadoop.hbase.master">MasterServices</a> services,
+<pre>public <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#line.61">DispatchMergingRegionHandler</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/MasterServices.html" title="interface in org.apache.hadoop.hbase.master">MasterServices</a> services,
<a href="../../../../../../org/apache/hadoop/hbase/master/CatalogJanitor.html" title="class in org.apache.hadoop.hbase.master">CatalogJanitor</a> catalogJanitor,
<a href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a> region_a,
<a href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a> region_b,
- boolean forcible)</pre>
+ boolean forcible,
+ <a href="../../../../../../org/apache/hadoop/hbase/security/User.html" title="class in org.apache.hadoop.hbase.security">User</a> user)</pre>
</li>
</ul>
</li>
@@ -339,7 +354,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/executor/EventHandler
<ul class="blockList">
<li class="blockList">
<h4>process</h4>
-<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#line.73">process</a>()
+<pre>public void <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#line.76">process</a>()
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block"><strong>Description copied from class: <code><a href="../../../../../../org/apache/hadoop/hbase/executor/EventHandler.html#process()">EventHandler</a></code></strong></div>
<div class="block">This method is the main processing loop to be implemented by the various
@@ -357,7 +372,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/executor/EventHandler
<ul class="blockListLast">
<li class="blockList">
<h4>getRegionLoad</h4>
-<pre>private <a href="../../../../../../org/apache/hadoop/hbase/RegionLoad.html" title="class in org.apache.hadoop.hbase">RegionLoad</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#line.177">getRegionLoad</a>(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> sn,
+<pre>private <a href="../../../../../../org/apache/hadoop/hbase/RegionLoad.html" title="class in org.apache.hadoop.hbase">RegionLoad</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/handler/DispatchMergingRegionHandler.html#line.180">getRegionLoad</a>(<a href="../../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a> sn,
<a href="../../../../../../org/apache/hadoop/hbase/HRegionInfo.html" title="class in org.apache.hadoop.hbase">HRegionInfo</a> hri)</pre>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c6155501/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
index 42f801a..203ad35 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
@@ -152,7 +152,7 @@
<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/HasThread.html" title="class in org.apache.hadoop.hbase.util"><span class="strong">HasThread</span></a> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Runnable.html?is-external=true" title="class or interface in java.lang">Runnable</a>)
<ul>
<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/HMaster.InitializationMonitor.html" title="class in org.apache.hadoop.hbase.master"><span class="strong">HMaster.InitializationMonitor</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html" title="class in org.apache.hadoop.hbase.regionserver"><span class="strong">HRegionServer</span></a> (implements org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/LastSequenceId.html" title="interface in org.apache.hadoop.hbase.regionserver">LastSequenceId</a>, org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>)
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html" title="class in org.apache.hadoop.hbase.regionserver"><span class="strong">HRegionServer</span></a> (implements org.apache.hadoop.hbase.conf.<a href="../../../../../org/apache/hadoop/hbase/conf/ConfigurationObserver.html" title="interface in org.apache.hadoop.hbase.conf">ConfigurationObserver</a>, org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/LastSequenceId.html" title="interface in org.apache.hadoop.hbase.regionserver">LastSequenceId</a>, org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>)
<ul>
<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master"><span class="strong">HMaster</span></a> (implements org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MasterServices.html" title="interface in org.apache.hadoop.hbase.master">MasterServices</a>)
<ul>
@@ -318,11 +318,11 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MasterRpcServices.BalanceSwitchMode.html" title="enum in org.apache.hadoop.hbase.master"><span class="strong">MasterRpcServices.BalanceSwitchMode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.TerminationStatus.html" title="enum in org.apache.hadoop.hbase.master"><span class="strong">SplitLogManager.TerminationStatus</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/RegionState.State.html" title="enum in org.apache.hadoop.hbase.master"><span class="strong">RegionState.State</span></a></li>
<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MetricsMasterSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.master"><span class="strong">MetricsMasterSourceFactoryImpl.FactoryStorage</span></a></li>
<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.ResubmitDirective.html" title="enum in org.apache.hadoop.hbase.master"><span class="strong">SplitLogManager.ResubmitDirective</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/RegionState.State.html" title="enum in org.apache.hadoop.hbase.master"><span class="strong">RegionState.State</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.TerminationStatus.html" title="enum in org.apache.hadoop.hbase.master"><span class="strong">SplitLogManager.TerminationStatus</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MasterRpcServices.BalanceSwitchMode.html" title="enum in org.apache.hadoop.hbase.master"><span class="strong">MasterRpcServices.BalanceSwitchMode</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c6155501/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
index e5bf586..409bb8a 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
@@ -145,9 +145,9 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/DisableTableProcedure.MarkRegionOfflineOpResult.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="strong">DisableTableProcedure.MarkRegionOfflineOpResult</span></a></li>
<li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/ServerProcedureInterface.ServerOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="strong">ServerProcedureInterface.ServerOperationType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/TableProcedureInterface.TableOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="strong">TableProcedureInterface.TableOperationType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/DisableTableProcedure.MarkRegionOfflineOpResult.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="strong">DisableTableProcedure.MarkRegionOfflineOpResult</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c6155501/devapidocs/org/apache/hadoop/hbase/mob/DefaultMobStoreCompactor.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mob/DefaultMobStoreCompactor.html b/devapidocs/org/apache/hadoop/hbase/mob/DefaultMobStoreCompactor.html
index 32b33df..4eb525e 100644
--- a/devapidocs/org/apache/hadoop/hbase/mob/DefaultMobStoreCompactor.html
+++ b/devapidocs/org/apache/hadoop/hbase/mob/DefaultMobStoreCompactor.html
@@ -211,12 +211,12 @@ extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions
</tr>
<tr class="altColor">
<td class="colFirst"><code>protected boolean</code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mob/DefaultMobStoreCompactor.html#performCompaction(org.apache.hadoop.hbase.regionserver.compactions.Compactor.FileDetails,%20org.apache.hadoop.hbase.regionserver.InternalScanner,%20org.apache.hadoop.hbase.regionserver.compactions.Compactor.CellSink,%20long,%20boolean,%20org.apache.hadoop.hbase.regionserver.compactions.CompactionThroughputController,%20boolean)">performCompaction</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.FileDetails.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">Compactor.FileDetails</a> fd,
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mob/DefaultMobStoreCompactor.html#performCompaction(org.apache.hadoop.hbase.regionserver.compactions.Compactor.FileDetails,%20org.apache.hadoop.hbase.regionserver.InternalScanner,%20org.apache.hadoop.hbase.regionserver.compactions.Compactor.CellSink,%20long,%20boolean,%20org.apache.hadoop.hbase.regionserver.throttle.ThroughputController,%20boolean)">performCompaction</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.FileDetails.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">Compactor.FileDetails</a> fd,
<a href="../../../../../org/apache/hadoop/hbase/regionserver/InternalScanner.html" title="interface in org.apache.hadoop.hbase.regionserver">InternalScanner</a> scanner,
<a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.CellSink.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">Compactor.CellSink</a> writer,
long smallestReadPoint,
boolean cleanSeqId,
- <a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">CompactionThroughputController</a> throughputController,
+ <a href="../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a> throughputController,
boolean major)</code>
<div class="block">Performs compaction on a column family with the mob flag enabled.</div>
</td>
@@ -227,7 +227,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions
<!-- -->
</a>
<h3>Methods inherited from class org.apache.hadoop.hbase.regionserver.compactions.<a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/DefaultCompactor.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">DefaultCompactor</a></h3>
-<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/DefaultCompactor.html#compact(org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest,%20org.apache.hadoop.hbase.regionserver.compactions.CompactionThroughputController,%20org.apache.hadoop.hbase.security.User)">compact</a>, <a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/DefaultCompactor.html#compactForTesting(java.util.Collection,%20boolean)">compactForTesting</a></code></li>
+<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/DefaultCompactor.html#compact(org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest,%20org.apache.hadoop.hbase.regionserver.throttle.ThroughputController,%20org.apache.hadoop.hbase.security.User)">compact</a>, <a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/DefaultCompactor.html#compactForTesting(java.util.Collection,%20boolean)">compactForTesting</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods_inherited_from_class_org.apache.hadoop.hbase.regionserver.compactions.Compactor">
@@ -350,7 +350,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd></dl>
</li>
</ul>
-<a name="performCompaction(org.apache.hadoop.hbase.regionserver.compactions.Compactor.FileDetails, org.apache.hadoop.hbase.regionserver.InternalScanner, org.apache.hadoop.hbase.regionserver.compactions.Compactor.CellSink, long, boolean, org.apache.hadoop.hbase.regionserver.compactions.CompactionThroughputController, boolean)">
+<a name="performCompaction(org.apache.hadoop.hbase.regionserver.compactions.Compactor.FileDetails, org.apache.hadoop.hbase.regionserver.InternalScanner, org.apache.hadoop.hbase.regionserver.compactions.Compactor.CellSink, long, boolean, org.apache.hadoop.hbase.regionserver.throttle.ThroughputController, boolean)">
<!-- -->
</a>
<ul class="blockListLast">
@@ -361,7 +361,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions
<a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.CellSink.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">Compactor.CellSink</a> writer,
long smallestReadPoint,
boolean cleanSeqId,
- <a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">CompactionThroughputController</a> throughputController,
+ <a href="../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a> throughputController,
boolean major)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Performs compaction on a column family with the mob flag enabled.
@@ -399,7 +399,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions
the scanner to filter the deleted cells.</div>
<dl>
<dt><strong>Overrides:</strong></dt>
-<dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.html#performCompaction(org.apache.hadoop.hbase.regionserver.compactions.Compactor.FileDetails,%20org.apache.hadoop.hbase.regionserver.InternalScanner,%20org.apache.hadoop.hbase.regionserver.compactions.Compactor.CellSink,%20long,%20boolean,%20org.apache.hadoop.hbase.regionserver.compactions.CompactionThroughputController,%20boolean)">performCompaction</a></code> in class <code><a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">Compactor</a></code></dd>
+<dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.html#performCompaction(org.apache.hadoop.hbase.regionserver.compactions.Compactor.FileDetails,%20org.apache.hadoop.hbase.regionserver.InternalScanner,%20org.apache.hadoop.hbase.regionserver.compactions.Compactor.CellSink,%20long,%20boolean,%20org.apache.hadoop.hbase.regionserver.throttle.ThroughputController,%20boolean)">performCompaction</a></code> in class <code><a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">Compactor</a></code></dd>
<dt><span class="strong">Parameters:</span></dt><dd><code>fd</code> - File details</dd><dd><code>scanner</code> - Where to read from.</dd><dd><code>writer</code> - Where to write to.</dd><dd><code>smallestReadPoint</code> - Smallest read point.</dd><dd><code>cleanSeqId</code> - When true, remove seqId(used to be mvcc) value which is <= smallestReadPoint</dd><dd><code>throughputController</code> - The compaction throughput controller.</dd><dd><code>major</code> - Is a major compaction.</dd>
<dt><span class="strong">Returns:</span></dt><dd>Whether compaction ended; false if it was interrupted for any reason.</dd>
<dt><span class="strong">Throws:</span></dt>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c6155501/devapidocs/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html b/devapidocs/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html
index fc65b0f..40dac89 100644
--- a/devapidocs/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html
+++ b/devapidocs/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html
@@ -106,7 +106,7 @@
<hr>
<br>
<pre><a href="../../../../../org/apache/hadoop/hbase/classification/InterfaceAudience.Private.html" title="annotation in org.apache.hadoop.hbase.classification">@InterfaceAudience.Private</a>
-public class <a href="../../../../../src-html/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html#line.64">DefaultMobStoreFlusher</a>
+public class <a href="../../../../../src-html/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html#line.65">DefaultMobStoreFlusher</a>
extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultStoreFlusher.html" title="class in org.apache.hadoop.hbase.regionserver">DefaultStoreFlusher</a></pre>
<div class="block">An implementation of the StoreFlusher. It extends the DefaultStoreFlusher.
If the store is not a mob store, the flusher flushes the MemStore the same with
@@ -200,9 +200,10 @@ extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultStor
</tr>
<tr class="altColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.fs.Path></code></td>
-<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html#flushSnapshot(org.apache.hadoop.hbase.regionserver.MemStoreSnapshot,%20long,%20org.apache.hadoop.hbase.monitoring.MonitoredTask)">flushSnapshot</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a> snapshot,
+<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html#flushSnapshot(org.apache.hadoop.hbase.regionserver.MemStoreSnapshot,%20long,%20org.apache.hadoop.hbase.monitoring.MonitoredTask,%20org.apache.hadoop.hbase.regionserver.throttle.ThroughputController)">flushSnapshot</a></strong>(<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a> snapshot,
long cacheFlushId,
- <a href="../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a> status)</code>
+ <a href="../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a> status,
+ <a href="../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a> throughputController)</code>
<div class="block">Flushes the snapshot of the MemStore.</div>
</td>
</tr>
@@ -222,7 +223,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultStor
<!-- -->
</a>
<h3>Methods inherited from class org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlusher.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFlusher</a></h3>
-<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlusher.html#createScanner(org.apache.hadoop.hbase.regionserver.KeyValueScanner,%20long)">createScanner</a>, <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlusher.html#finalizeWriter(org.apache.hadoop.hbase.regionserver.StoreFile.Writer,%20long,%20org.apache.hadoop.hbase.monitoring.MonitoredTask)">finalizeWriter</a>, <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlusher.html#performFlush(org.apache.hadoop.hbase.regionserver.InternalScanner,%20org.apache.hadoop.hbase.regionserver.compactions.Compactor.CellSink,%20long)">performFlush</a></code></li>
+<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlusher.html#createScanner(org.apache.hadoop.hbase.regionserver.KeyValueScanner,%20long)">createScanner</a>, <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlusher.html#finalizeWriter(org.apache.hadoop.hbase.regionserver.StoreFile.Writer,%20long,%20org.apache.hadoop.hbase.monitoring.MonitoredTask)">finalizeWriter</a>, <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlusher.html#performFlush(org.apache.hadoop.hbase.regionserver.InternalScanner,%20org.apache.hadoop.hbase.regionserver.compactions.Compactor.CellSink,%20long,%20org.apache.hadoop.hbase.regionserver.throttle.ThroughputController)">performFlush</a></code></li>
</ul>
<ul class="blockList">
<li class="blockList"><a name="methods_inherited_from_class_java.lang.Object">
@@ -251,7 +252,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultStor
<ul class="blockList">
<li class="blockList">
<h4>LOG</h4>
-<pre>private static final org.apache.commons.logging.Log <a href="../../../../../src-html/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html#line.66">LOG</a></pre>
+<pre>private static final org.apache.commons.logging.Log <a href="../../../../../src-html/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html#line.67">LOG</a></pre>
</li>
</ul>
<a name="flushLock">
@@ -260,7 +261,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultStor
<ul class="blockList">
<li class="blockList">
<h4>flushLock</h4>
-<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html#line.67">flushLock</a></pre>
+<pre>private final <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html#line.68">flushLock</a></pre>
</li>
</ul>
<a name="mobCellValueSizeThreshold">
@@ -269,7 +270,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultStor
<ul class="blockList">
<li class="blockList">
<h4>mobCellValueSizeThreshold</h4>
-<pre>private long <a href="../../../../../src-html/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html#line.68">mobCellValueSizeThreshold</a></pre>
+<pre>private long <a href="../../../../../src-html/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html#line.69">mobCellValueSizeThreshold</a></pre>
</li>
</ul>
<a name="targetPath">
@@ -278,7 +279,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultStor
<ul class="blockList">
<li class="blockList">
<h4>targetPath</h4>
-<pre>private org.apache.hadoop.fs.Path <a href="../../../../../src-html/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html#line.69">targetPath</a></pre>
+<pre>private org.apache.hadoop.fs.Path <a href="../../../../../src-html/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html#line.70">targetPath</a></pre>
</li>
</ul>
<a name="mobStore">
@@ -287,7 +288,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultStor
<ul class="blockListLast">
<li class="blockList">
<h4>mobStore</h4>
-<pre>private <a href="../../../../../org/apache/hadoop/hbase/regionserver/HMobStore.html" title="class in org.apache.hadoop.hbase.regionserver">HMobStore</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html#line.70">mobStore</a></pre>
+<pre>private <a href="../../../../../org/apache/hadoop/hbase/regionserver/HMobStore.html" title="class in org.apache.hadoop.hbase.regionserver">HMobStore</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html#line.71">mobStore</a></pre>
</li>
</ul>
</li>
@@ -304,7 +305,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultStor
<ul class="blockListLast">
<li class="blockList">
<h4>DefaultMobStoreFlusher</h4>
-<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html#line.72">DefaultMobStoreFlusher</a>(org.apache.hadoop.conf.Configuration conf,
+<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html#line.73">DefaultMobStoreFlusher</a>(org.apache.hadoop.conf.Configuration conf,
<a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a> store)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl><dt><span class="strong">Throws:</span></dt>
@@ -319,15 +320,16 @@ extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultStor
<!-- -->
</a>
<h3>Method Detail</h3>
-<a name="flushSnapshot(org.apache.hadoop.hbase.regionserver.MemStoreSnapshot, long, org.apache.hadoop.hbase.monitoring.MonitoredTask)">
+<a name="flushSnapshot(org.apache.hadoop.hbase.regionserver.MemStoreSnapshot, long, org.apache.hadoop.hbase.monitoring.MonitoredTask, org.apache.hadoop.hbase.regionserver.throttle.ThroughputController)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>flushSnapshot</h4>
-<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.fs.Path> <a href="../../../../../src-html/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html#line.98">flushSnapshot</a>(<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a> snapshot,
+<pre>public <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.fs.Path> <a href="../../../../../src-html/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html#line.99">flushSnapshot</a>(<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a> snapshot,
long cacheFlushId,
- <a href="../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a> status)
+ <a href="../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a> status,
+ <a href="../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a> throughputController)
throws <a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Flushes the snapshot of the MemStore.
If this store is not a mob store, flush the cells in the snapshot to store files of HBase.
@@ -343,8 +345,8 @@ extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultStor
</ol></div>
<dl>
<dt><strong>Overrides:</strong></dt>
-<dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultStoreFlusher.html#flushSnapshot(org.apache.hadoop.hbase.regionserver.MemStoreSnapshot,%20long,%20org.apache.hadoop.hbase.monitoring.MonitoredTask)">flushSnapshot</a></code> in class <code><a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultStoreFlusher.html" title="class in org.apache.hadoop.hbase.regionserver">DefaultStoreFlusher</a></code></dd>
-<dt><span class="strong">Parameters:</span></dt><dd><code>snapshot</code> - Memstore snapshot.</dd><dd><code>cacheFlushId</code> - Log cache flush sequence number.</dd><dd><code>status</code> - Task that represents the flush operation and may be updated with status.</dd>
+<dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultStoreFlusher.html#flushSnapshot(org.apache.hadoop.hbase.regionserver.MemStoreSnapshot,%20long,%20org.apache.hadoop.hbase.monitoring.MonitoredTask,%20org.apache.hadoop.hbase.regionserver.throttle.ThroughputController)">flushSnapshot</a></code> in class <code><a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultStoreFlusher.html" title="class in org.apache.hadoop.hbase.regionserver">DefaultStoreFlusher</a></code></dd>
+<dt><span class="strong">Parameters:</span></dt><dd><code>snapshot</code> - Memstore snapshot.</dd><dd><code>cacheFlushId</code> - Log cache flush sequence number.</dd><dd><code>status</code> - Task that represents the flush operation and may be updated with status.</dd><dd><code>throughputController</code> - A controller to avoid flush too fast</dd>
<dt><span class="strong">Returns:</span></dt><dd>List of files written. Can be empty; must not be null.</dd>
<dt><span class="strong">Throws:</span></dt>
<dd><code><a href="http://docs.oracle.com/javase/7/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd></dl>
@@ -356,7 +358,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultStor
<ul class="blockListLast">
<li class="blockList">
<h4>performMobFlush</h4>
-<pre>protected void <a href="../../../../../src-html/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html#line.156">performMobFlush</a>(<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a> snapshot,
+<pre>protected void <a href="../../../../../src-html/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html#line.157">performMobFlush</a>(<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a> snapshot,
long cacheFlushId,
<a href="../../../../../org/apache/hadoop/hbase/regionserver/InternalScanner.html" title="interface in org.apache.hadoop.hbase.regionserver">InternalScanner</a> scanner,
<a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.Writer.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFile.Writer</a> writer,
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c6155501/devapidocs/org/apache/hadoop/hbase/monitoring/class-use/MonitoredTask.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/monitoring/class-use/MonitoredTask.html b/devapidocs/org/apache/hadoop/hbase/monitoring/class-use/MonitoredTask.html
index 018f76a..d3c1bd1 100644
--- a/devapidocs/org/apache/hadoop/hbase/monitoring/class-use/MonitoredTask.html
+++ b/devapidocs/org/apache/hadoop/hbase/monitoring/class-use/MonitoredTask.html
@@ -192,9 +192,10 @@
<tbody>
<tr class="altColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.fs.Path></code></td>
-<td class="colLast"><span class="strong">DefaultMobStoreFlusher.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html#flushSnapshot(org.apache.hadoop.hbase.regionserver.MemStoreSnapshot,%20long,%20org.apache.hadoop.hbase.monitoring.MonitoredTask)">flushSnapshot</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a> snapshot,
+<td class="colLast"><span class="strong">DefaultMobStoreFlusher.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.html#flushSnapshot(org.apache.hadoop.hbase.regionserver.MemStoreSnapshot,%20long,%20org.apache.hadoop.hbase.monitoring.MonitoredTask,%20org.apache.hadoop.hbase.regionserver.throttle.ThroughputController)">flushSnapshot</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a> snapshot,
long cacheFlushId,
- <a href="../../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a> status)</code>
+ <a href="../../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a> status,
+ <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a> throughputController)</code>
<div class="block">Flushes the snapshot of the MemStore.</div>
</td>
</tr>
@@ -384,9 +385,10 @@
</tr>
<tr class="rowColor">
<td class="colFirst"><code>protected <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.fs.Path></code></td>
-<td class="colLast"><span class="strong">HStore.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#flushCache(long,%20org.apache.hadoop.hbase.regionserver.MemStoreSnapshot,%20org.apache.hadoop.hbase.monitoring.MonitoredTask)">flushCache</a></strong>(long logCacheFlushId,
+<td class="colLast"><span class="strong">HStore.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#flushCache(long,%20org.apache.hadoop.hbase.regionserver.MemStoreSnapshot,%20org.apache.hadoop.hbase.monitoring.MonitoredTask,%20org.apache.hadoop.hbase.regionserver.throttle.ThroughputController)">flushCache</a></strong>(long logCacheFlushId,
<a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a> snapshot,
- <a href="../../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a> status)</code>
+ <a href="../../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a> status,
+ <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a> throughputController)</code>
<div class="block">Write out current snapshot.</div>
</td>
</tr>
@@ -405,23 +407,26 @@
</tr>
<tr class="altColor">
<td class="colFirst"><code>abstract <a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.fs.Path></code></td>
-<td class="colLast"><span class="strong">StoreFlusher.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFlusher.html#flushSnapshot(org.apache.hadoop.hbase.regionserver.MemStoreSnapshot,%20long,%20org.apache.hadoop.hbase.monitoring.MonitoredTask)">flushSnapshot</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a> snapshot,
+<td class="colLast"><span class="strong">StoreFlusher.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFlusher.html#flushSnapshot(org.apache.hadoop.hbase.regionserver.MemStoreSnapshot,%20long,%20org.apache.hadoop.hbase.monitoring.MonitoredTask,%20org.apache.hadoop.hbase.regionserver.throttle.ThroughputController)">flushSnapshot</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a> snapshot,
long cacheFlushSeqNum,
- <a href="../../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a> status)</code>
+ <a href="../../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a> status,
+ <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a> throughputController)</code>
<div class="block">Turns a snapshot of memstore into a set of store files.</div>
</td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.fs.Path></code></td>
-<td class="colLast"><span class="strong">DefaultStoreFlusher.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/DefaultStoreFlusher.html#flushSnapshot(org.apache.hadoop.hbase.regionserver.MemStoreSnapshot,%20long,%20org.apache.hadoop.hbase.monitoring.MonitoredTask)">flushSnapshot</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a> snapshot,
+<td class="colLast"><span class="strong">DefaultStoreFlusher.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/DefaultStoreFlusher.html#flushSnapshot(org.apache.hadoop.hbase.regionserver.MemStoreSnapshot,%20long,%20org.apache.hadoop.hbase.monitoring.MonitoredTask,%20org.apache.hadoop.hbase.regionserver.throttle.ThroughputController)">flushSnapshot</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a> snapshot,
long cacheFlushId,
- <a href="../../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a> status)</code> </td>
+ <a href="../../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a> status,
+ <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a> throughputController)</code> </td>
</tr>
<tr class="altColor">
<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><org.apache.hadoop.fs.Path></code></td>
-<td class="colLast"><span class="strong">StripeStoreFlusher.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html#flushSnapshot(org.apache.hadoop.hbase.regionserver.MemStoreSnapshot,%20long,%20org.apache.hadoop.hbase.monitoring.MonitoredTask)">flushSnapshot</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a> snapshot,
+<td class="colLast"><span class="strong">StripeStoreFlusher.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html#flushSnapshot(org.apache.hadoop.hbase.regionserver.MemStoreSnapshot,%20long,%20org.apache.hadoop.hbase.monitoring.MonitoredTask,%20org.apache.hadoop.hbase.regionserver.throttle.ThroughputController)">flushSnapshot</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a> snapshot,
long cacheFlushSeqNum,
- <a href="../../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a> status)</code> </td>
+ <a href="../../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a> status,
+ <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a> throughputController)</code> </td>
</tr>
<tr class="rowColor">
<td class="colFirst"><code>private long</code></td>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c6155501/devapidocs/org/apache/hadoop/hbase/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/package-tree.html b/devapidocs/org/apache/hadoop/hbase/package-tree.html
index 35e1850..eca7b47 100644
--- a/devapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -361,14 +361,14 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/MetaTableAccessor.QueryType.html" title="enum in org.apache.hadoop.hbase"><span class="strong">MetaTableAccessor.QueryType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CompatibilitySingletonFactory.SingletonStorage.html" title="enum in org.apache.hadoop.hbase"><span class="strong">CompatibilitySingletonFactory.SingletonStorage</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HConstants.OperationStatusCode.html" title="enum in org.apache.hadoop.hbase"><span class="strong">HConstants.OperationStatusCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeepDeletedCells.html" title="enum in org.apache.hadoop.hbase"><span class="strong">KeepDeletedCells</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HealthChecker.HealthCheckerExitStatus.html" title="enum in org.apache.hadoop.hbase"><span class="strong">HealthChecker.HealthCheckerExitStatus</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CompatibilitySingletonFactory.SingletonStorage.html" title="enum in org.apache.hadoop.hbase"><span class="strong">CompatibilitySingletonFactory.SingletonStorage</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HConstants.Modify.html" title="enum in org.apache.hadoop.hbase"><span class="strong">HConstants.Modify</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeyValue.Type.html" title="enum in org.apache.hadoop.hbase"><span class="strong">KeyValue.Type</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeepDeletedCells.html" title="enum in org.apache.hadoop.hbase"><span class="strong">KeepDeletedCells</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/MetaTableAccessor.QueryType.html" title="enum in org.apache.hadoop.hbase"><span class="strong">MetaTableAccessor.QueryType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Coprocessor.State.html" title="enum in org.apache.hadoop.hbase"><span class="strong">Coprocessor.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeyValue.Type.html" title="enum in org.apache.hadoop.hbase"><span class="strong">KeyValue.Type</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c6155501/devapidocs/org/apache/hadoop/hbase/package-use.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/package-use.html b/devapidocs/org/apache/hadoop/hbase/package-use.html
index c397dab..0f1900f 100644
--- a/devapidocs/org/apache/hadoop/hbase/package-use.html
+++ b/devapidocs/org/apache/hadoop/hbase/package-use.html
@@ -283,104 +283,108 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
<td class="colLast"> </td>
</tr>
<tr class="altColor">
-<td class="colFirst"><a href="#org.apache.hadoop.hbase.regionserver.wal">org.apache.hadoop.hbase.regionserver.wal</a></td>
+<td class="colFirst"><a href="#org.apache.hadoop.hbase.regionserver.throttle">org.apache.hadoop.hbase.regionserver.throttle</a></td>
<td class="colLast"> </td>
</tr>
<tr class="rowColor">
+<td class="colFirst"><a href="#org.apache.hadoop.hbase.regionserver.wal">org.apache.hadoop.hbase.regionserver.wal</a></td>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
<td class="colFirst"><a href="#org.apache.hadoop.hbase.replication">org.apache.hadoop.hbase.replication</a></td>
<td class="colLast">
<div class="block">Multi Cluster Replication</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.apache.hadoop.hbase.replication.master">org.apache.hadoop.hbase.replication.master</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.apache.hadoop.hbase.replication.regionserver">org.apache.hadoop.hbase.replication.regionserver</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.apache.hadoop.hbase.rest">org.apache.hadoop.hbase.rest</a></td>
<td class="colLast">
<div class="block">HBase REST</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.apache.hadoop.hbase.rest.client">org.apache.hadoop.hbase.rest.client</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.apache.hadoop.hbase.rest.model">org.apache.hadoop.hbase.rest.model</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.apache.hadoop.hbase.security">org.apache.hadoop.hbase.security</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.apache.hadoop.hbase.security.access">org.apache.hadoop.hbase.security.access</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.apache.hadoop.hbase.security.token">org.apache.hadoop.hbase.security.token</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.apache.hadoop.hbase.security.visibility">org.apache.hadoop.hbase.security.visibility</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.apache.hadoop.hbase.snapshot">org.apache.hadoop.hbase.snapshot</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.apache.hadoop.hbase.thrift">org.apache.hadoop.hbase.thrift</a></td>
<td class="colLast">
<div class="block">Provides an HBase <a href="http://incubator.apache.org/thrift/">Thrift</a>
service.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.apache.hadoop.hbase.thrift2">org.apache.hadoop.hbase.thrift2</a></td>
<td class="colLast">
<div class="block">Provides an HBase <a href="http://thrift.apache.org/">Thrift</a>
service.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.apache.hadoop.hbase.tmpl.master">org.apache.hadoop.hbase.tmpl.master</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.apache.hadoop.hbase.tmpl.regionserver">org.apache.hadoop.hbase.tmpl.regionserver</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.apache.hadoop.hbase.tool">org.apache.hadoop.hbase.tool</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.apache.hadoop.hbase.util">org.apache.hadoop.hbase.util</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.apache.hadoop.hbase.util.hbck">org.apache.hadoop.hbase.util.hbck</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.apache.hadoop.hbase.util.test">org.apache.hadoop.hbase.util.test</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.apache.hadoop.hbase.wal">org.apache.hadoop.hbase.wal</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colFirst"><a href="#org.apache.hadoop.hbase.zookeeper">org.apache.hadoop.hbase.zookeeper</a></td>
<td class="colLast"> </td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colFirst"><a href="#org.apache.hadoop.hbase.zookeeper.lock">org.apache.hadoop.hbase.zookeeper.lock</a></td>
<td class="colLast"> </td>
</tr>
@@ -2737,11 +2741,6 @@ service.</div>
<br></div>
</td>
</tr>
-<tr class="rowColor">
-<td class="colOne"><a href="../../../../org/apache/hadoop/hbase/class-use/Stoppable.html#org.apache.hadoop.hbase.regionserver.compactions">Stoppable</a>
-<div class="block">Implementers are Stoppable.</div>
-</td>
-</tr>
</tbody>
</table>
</li>
@@ -2804,6 +2803,23 @@ service.</div>
</tbody>
</table>
</li>
+<li class="blockList"><a name="org.apache.hadoop.hbase.regionserver.throttle">
+<!-- -->
+</a>
+<table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing classes, and an explanation">
+<caption><span>Classes in <a href="../../../../org/apache/hadoop/hbase/package-summary.html">org.apache.hadoop.hbase</a> used by <a href="../../../../org/apache/hadoop/hbase/regionserver/throttle/package-summary.html">org.apache.hadoop.hbase.regionserver.throttle</a></span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colOne" scope="col">Class and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="../../../../org/apache/hadoop/hbase/class-use/Stoppable.html#org.apache.hadoop.hbase.regionserver.throttle">Stoppable</a>
+<div class="block">Implementers are Stoppable.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
<li class="blockList"><a name="org.apache.hadoop.hbase.regionserver.wal">
<!-- -->
</a>
@@ -3556,16 +3572,21 @@ service.</div>
</td>
</tr>
<tr class="altColor">
+<td class="colOne"><a href="../../../../org/apache/hadoop/hbase/class-use/HBaseIOException.html#org.apache.hadoop.hbase.util">HBaseIOException</a>
+<div class="block">All hbase specific IOExceptions should be subclasses of HBaseIOException</div>
+</td>
+</tr>
+<tr class="rowColor">
<td class="colOne"><a href="../../../../org/apache/hadoop/hbase/class-use/HDFSBlocksDistribution.html#org.apache.hadoop.hbase.util">HDFSBlocksDistribution</a>
<div class="block">Data structure to describe the distribution of HDFS blocks among hosts.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="../../../../org/apache/hadoop/hbase/class-use/HRegionInfo.html#org.apache.hadoop.hbase.util">HRegionInfo</a>
<div class="block">Information about a region.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="../../../../org/apache/hadoop/hbase/class-use/HTableDescriptor.html#org.apache.hadoop.hbase.util">HTableDescriptor</a>
<div class="block">HTableDescriptor contains the details about an HBase table such as the descriptors of
all the column families, is the table a catalog table, <code> -ROOT- </code> or
@@ -3573,42 +3594,42 @@ service.</div>
when the region split should occur, coprocessors associated with it etc...</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="../../../../org/apache/hadoop/hbase/class-use/MasterNotRunningException.html#org.apache.hadoop.hbase.util">MasterNotRunningException</a>
<div class="block">Thrown if the master is not running</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="../../../../org/apache/hadoop/hbase/class-use/ServerName.html#org.apache.hadoop.hbase.util">ServerName</a>
<div class="block">Instance of an HBase ServerName.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="../../../../org/apache/hadoop/hbase/class-use/Stoppable.html#org.apache.hadoop.hbase.util">Stoppable</a>
<div class="block">Implementers are Stoppable.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="../../../../org/apache/hadoop/hbase/class-use/TableDescriptor.html#org.apache.hadoop.hbase.util">TableDescriptor</a>
<div class="block">Class represents table state on HDFS.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="../../../../org/apache/hadoop/hbase/class-use/TableDescriptors.html#org.apache.hadoop.hbase.util">TableDescriptors</a>
<div class="block">Get, remove and modify table descriptors.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="../../../../org/apache/hadoop/hbase/class-use/TableName.html#org.apache.hadoop.hbase.util">TableName</a>
<div class="block">Immutable POJO class for representing a table name.</div>
</td>
</tr>
-<tr class="rowColor">
+<tr class="altColor">
<td class="colOne"><a href="../../../../org/apache/hadoop/hbase/class-use/VersionAnnotation.html#org.apache.hadoop.hbase.util">VersionAnnotation</a>
<div class="block">A package attribute that captures the version of hbase that was compiled.</div>
</td>
</tr>
-<tr class="altColor">
+<tr class="rowColor">
<td class="colOne"><a href="../../../../org/apache/hadoop/hbase/class-use/ZooKeeperConnectionException.html#org.apache.hadoop.hbase.util">ZooKeeperConnectionException</a>
<div class="block">Thrown if the client can't connect to zookeeper</div>
</td>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c6155501/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html b/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
index 19ef617..a73d0a7 100644
--- a/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
@@ -120,8 +120,8 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/StateMachineProcedure.Flow.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="strong">StateMachineProcedure.Flow</span></a></li>
<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/RootProcedureState.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="strong">RootProcedureState.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/StateMachineProcedure.Flow.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="strong">StateMachineProcedure.Flow</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c6155501/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html b/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
index 7bcb293..a7d60fe 100644
--- a/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
@@ -172,11 +172,11 @@
<ul>
<li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a><E> (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/OperationQuota.OperationType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="strong">OperationQuota.OperationType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaScope.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="strong">QuotaScope</span></a></li>
<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/ThrottlingException.Type.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="strong">ThrottlingException.Type</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="strong">QuotaType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="strong">ThrottleType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaScope.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="strong">QuotaScope</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="strong">QuotaType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/OperationQuota.OperationType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="strong">OperationQuota.OperationType</span></a></li>
</ul>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c6155501/devapidocs/org/apache/hadoop/hbase/regionserver/CompactSplitThread.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/CompactSplitThread.html b/devapidocs/org/apache/hadoop/hbase/regionserver/CompactSplitThread.html
index 600f0d3..296de04 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/CompactSplitThread.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/CompactSplitThread.html
@@ -148,7 +148,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/regionserver/Compacti
<th class="colLast" scope="col">Field and Description</th>
</tr>
<tr class="altColor">
-<td class="colFirst"><code>private <a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">CompactionThroughputController</a></code></td>
+<td class="colFirst"><code>private <a href="../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a></code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/regionserver/CompactSplitThread.html#compactionThroughputController">compactionThroughputController</a></strong></code> </td>
</tr>
<tr class="rowColor">
@@ -275,7 +275,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/regionserver/Compacti
</td>
</tr>
<tr class="rowColor">
-<td class="colFirst"><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">CompactionThroughputController</a></code></td>
+<td class="colFirst"><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a></code></td>
<td class="colLast"><code><strong><a href="../../../../../org/apache/hadoop/hbase/regionserver/CompactSplitThread.html#getCompactionThroughputController()">getCompactionThroughputController</a></strong>()</code> </td>
</tr>
<tr class="altColor">
@@ -637,7 +637,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/regionserver/Compacti
<ul class="blockList">
<li class="blockList">
<h4>compactionThroughputController</h4>
-<pre>private volatile <a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">CompactionThroughputController</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/CompactSplitThread.html#line.92">compactionThroughputController</a></pre>
+<pre>private volatile <a href="../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/CompactSplitThread.html#line.92">compactionThroughputController</a></pre>
</li>
</ul>
<a name="regionSplitLimit">
@@ -1104,7 +1104,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/regionserver/Compacti
<ul class="blockList">
<li class="blockList">
<h4>getCompactionThroughputController</h4>
-<pre>public <a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">CompactionThroughputController</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/CompactSplitThread.html#line.720">getCompactionThroughputController</a>()</pre>
+<pre>public <a href="../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/CompactSplitThread.html#line.720">getCompactionThroughputController</a>()</pre>
</li>
</ul>
<a name="shutdownLongCompactions()">