hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject [23/51] [partial] hbase-site git commit: Published site at 0de221a19d799ad515f8f4556cacd05e6b4e74f8.
Date Fri, 29 Jan 2016 17:13:42 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c6155501/devapidocs/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.StripeFlushRequest.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.StripeFlushRequest.html b/devapidocs/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.StripeFlushRequest.html
index 6b54309..993161d 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.StripeFlushRequest.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.StripeFlushRequest.html
@@ -103,7 +103,7 @@
 </dl>
 <hr>
 <br>
-<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html#line.124">StripeStoreFlusher.StripeFlushRequest</a>
+<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html#line.125">StripeStoreFlusher.StripeFlushRequest</a>
 extends <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></pre>
 <div class="block">Stripe flush request wrapper that writes a non-striped file.</div>
 </li>
@@ -173,7 +173,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>StripeStoreFlusher.StripeFlushRequest</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.StripeFlushRequest.html#line.124">StripeStoreFlusher.StripeFlushRequest</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.StripeFlushRequest.html#line.125">StripeStoreFlusher.StripeFlushRequest</a>()</pre>
 </li>
 </ul>
 </li>
@@ -190,7 +190,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>createWriter</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/StripeMultiFileWriter.html" title="class in org.apache.hadoop.hbase.regionserver">StripeMultiFileWriter</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.StripeFlushRequest.html#line.126">createWriter</a>()
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/StripeMultiFileWriter.html" title="class in org.apache.hadoop.hbase.regionserver">StripeMultiFileWriter</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.StripeFlushRequest.html#line.127">createWriter</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>
 <dl><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>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c6155501/devapidocs/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html b/devapidocs/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html
index 3c24b1e..256b151 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html
@@ -101,7 +101,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/regionserver/StripeStoreFlusher.html#line.44">StripeStoreFlusher</a>
+public class <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html#line.45">StripeStoreFlusher</a>
 extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlusher.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFlusher</a></pre>
 <div class="block">Stripe implementation of StoreFlusher. Flushes files either into L0 file w/o metadata, or
  into separate striped files, avoiding L0.</div>
@@ -221,9 +221,10 @@ extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlushe
 </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>&lt;org.apache.hadoop.fs.Path&gt;</code></td>
-<td class="colLast"><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>&nbsp;snapshot,
+<td class="colLast"><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>&nbsp;snapshot,
                           long&nbsp;cacheFlushSeqNum,
-                          <a href="../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a>&nbsp;status)</code>
+                          <a href="../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a>&nbsp;status,
+                          <a href="../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a>&nbsp;throughputController)</code>
 <div class="block">Turns a snapshot of memstore into a set of store files.</div>
 </td>
 </tr>
@@ -233,7 +234,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlushe
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;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">
@@ -262,7 +263,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlushe
 <ul class="blockList">
 <li class="blockList">
 <h4>LOG</h4>
-<pre>private static final&nbsp;org.apache.commons.logging.Log <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html#line.45">LOG</a></pre>
+<pre>private static final&nbsp;org.apache.commons.logging.Log <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html#line.46">LOG</a></pre>
 </li>
 </ul>
 <a name="flushLock">
@@ -271,7 +272,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlushe
 <ul class="blockList">
 <li class="blockList">
 <h4>flushLock</h4>
-<pre>private final&nbsp;<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/regionserver/StripeStoreFlusher.html#line.46">flushLock</a></pre>
+<pre>private final&nbsp;<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/regionserver/StripeStoreFlusher.html#line.47">flushLock</a></pre>
 </li>
 </ul>
 <a name="policy">
@@ -280,7 +281,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlushe
 <ul class="blockList">
 <li class="blockList">
 <h4>policy</h4>
-<pre>private final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/StripeCompactionPolicy.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">StripeCompactionPolicy</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html#line.47">policy</a></pre>
+<pre>private final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/StripeCompactionPolicy.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">StripeCompactionPolicy</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html#line.48">policy</a></pre>
 </li>
 </ul>
 <a name="stripes">
@@ -289,7 +290,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlushe
 <ul class="blockListLast">
 <li class="blockList">
 <h4>stripes</h4>
-<pre>private final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/StripeCompactionPolicy.StripeInformationProvider.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">StripeCompactionPolicy.StripeInformationProvider</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html#line.48">stripes</a></pre>
+<pre>private final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/StripeCompactionPolicy.StripeInformationProvider.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">StripeCompactionPolicy.StripeInformationProvider</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html#line.49">stripes</a></pre>
 </li>
 </ul>
 </li>
@@ -306,7 +307,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlushe
 <ul class="blockListLast">
 <li class="blockList">
 <h4>StripeStoreFlusher</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html#line.50">StripeStoreFlusher</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html#line.51">StripeStoreFlusher</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                   <a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a>&nbsp;store,
                   <a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/StripeCompactionPolicy.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">StripeCompactionPolicy</a>&nbsp;policy,
                   <a href="../../../../../org/apache/hadoop/hbase/regionserver/StripeStoreFileManager.html" title="class in org.apache.hadoop.hbase.regionserver">StripeStoreFileManager</a>&nbsp;stripes)</pre>
@@ -320,22 +321,23 @@ extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlushe
 <!--   -->
 </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&nbsp;<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>&lt;org.apache.hadoop.fs.Path&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html#line.58">flushSnapshot</a>(<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a>&nbsp;snapshot,
+<pre>public&nbsp;<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>&lt;org.apache.hadoop.fs.Path&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html#line.59">flushSnapshot</a>(<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a>&nbsp;snapshot,
                                             long&nbsp;cacheFlushSeqNum,
-                                            <a href="../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a>&nbsp;status)
+                                            <a href="../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a>&nbsp;status,
+                                            <a href="../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a>&nbsp;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"><strong>Description copied from class:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlusher.html#flushSnapshot(org.apache.hadoop.hbase.regionserver.MemStoreSnapshot,%20long,%20org.apache.hadoop.hbase.monitoring.MonitoredTask)">StoreFlusher</a></code></strong></div>
+<div class="block"><strong>Description copied from class:&nbsp;<code><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)">StoreFlusher</a></code></strong></div>
 <div class="block">Turns a snapshot of memstore into a set of store files.</div>
 <dl>
 <dt><strong>Specified by:</strong></dt>
-<dd><code><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></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlusher.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFlusher</a></code></dd>
-<dt><span class="strong">Parameters:</span></dt><dd><code>snapshot</code> - Memstore snapshot.</dd><dd><code>cacheFlushSeqNum</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/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></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlusher.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFlusher</a></code></dd>
+<dt><span class="strong">Parameters:</span></dt><dd><code>snapshot</code> - Memstore snapshot.</dd><dd><code>cacheFlushSeqNum</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>
@@ -347,7 +349,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlushe
 <ul class="blockListLast">
 <li class="blockList">
 <h4>createWriterFactory</h4>
-<pre>private&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/StripeMultiFileWriter.WriterFactory.html" title="interface in org.apache.hadoop.hbase.regionserver">StripeMultiFileWriter.WriterFactory</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html#line.106">createWriterFactory</a>(<a href="../../../../../org/apache/hadoop/hbase/regionserver/TimeRangeTracker.html" title="class in org.apache.hadoop.hbase.regionserver">TimeRangeTracker</a>&nbsp;tracker,
+<pre>private&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/StripeMultiFileWriter.WriterFactory.html" title="interface in org.apache.hadoop.hbase.regionserver">StripeMultiFileWriter.WriterFactory</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/StripeStoreFlusher.html#line.107">createWriterFactory</a>(<a href="../../../../../org/apache/hadoop/hbase/regionserver/TimeRangeTracker.html" title="class in org.apache.hadoop.hbase.regionserver">TimeRangeTracker</a>&nbsp;tracker,
                                                       long&nbsp;kvCount)</pre>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c6155501/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/InternalScanner.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/InternalScanner.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/InternalScanner.html
index 1dcb472..e4bc0ad 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/InternalScanner.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/InternalScanner.html
@@ -580,12 +580,12 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>protected boolean</code></td>
-<td class="colLast"><span class="strong">DefaultMobStoreCompactor.</span><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>&nbsp;fd,
+<td class="colLast"><span class="strong">DefaultMobStoreCompactor.</span><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>&nbsp;fd,
                                   <a href="../../../../../../org/apache/hadoop/hbase/regionserver/InternalScanner.html" title="interface in org.apache.hadoop.hbase.regionserver">InternalScanner</a>&nbsp;scanner,
                                   <a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.CellSink.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">Compactor.CellSink</a>&nbsp;writer,
                                   long&nbsp;smallestReadPoint,
                                   boolean&nbsp;cleanSeqId,
-                                  <a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">CompactionThroughputController</a>&nbsp;throughputController,
+                                  <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a>&nbsp;throughputController,
                                   boolean&nbsp;major)</code>
 <div class="block">Performs compaction on a column family with the mob flag enabled.</div>
 </td>
@@ -749,9 +749,10 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>protected void</code></td>
-<td class="colLast"><span class="strong">StoreFlusher.</span><code><strong><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></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/InternalScanner.html" title="interface in org.apache.hadoop.hbase.regionserver">InternalScanner</a>&nbsp;scanner,
+<td class="colLast"><span class="strong">StoreFlusher.</span><code><strong><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></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/InternalScanner.html" title="interface in org.apache.hadoop.hbase.regionserver">InternalScanner</a>&nbsp;scanner,
                         <a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.CellSink.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">Compactor.CellSink</a>&nbsp;sink,
-                        long&nbsp;smallestReadPoint)</code>
+                        long&nbsp;smallestReadPoint,
+                        <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a>&nbsp;throughputController)</code>
 <div class="block">Performs memstore flush, writing data from scanner into sink.</div>
 </td>
 </tr>
@@ -868,12 +869,12 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>protected boolean</code></td>
-<td class="colLast"><span class="strong">Compactor.</span><code><strong><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></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.FileDetails.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">Compactor.FileDetails</a>&nbsp;fd,
+<td class="colLast"><span class="strong">Compactor.</span><code><strong><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></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.FileDetails.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">Compactor.FileDetails</a>&nbsp;fd,
                                   <a href="../../../../../../org/apache/hadoop/hbase/regionserver/InternalScanner.html" title="interface in org.apache.hadoop.hbase.regionserver">InternalScanner</a>&nbsp;scanner,
                                   <a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/Compactor.CellSink.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">Compactor.CellSink</a>&nbsp;writer,
                                   long&nbsp;smallestReadPoint,
                                   boolean&nbsp;cleanSeqId,
-                                  <a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">CompactionThroughputController</a>&nbsp;throughputController,
+                                  <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a>&nbsp;throughputController,
                                   boolean&nbsp;major)</code>
 <div class="block">Performs the compaction.</div>
 </td>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c6155501/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemStoreSnapshot.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemStoreSnapshot.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemStoreSnapshot.html
index 5a1712e..660cb58 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemStoreSnapshot.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/MemStoreSnapshot.html
@@ -104,9 +104,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>&lt;org.apache.hadoop.fs.Path&gt;</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>&nbsp;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>&nbsp;snapshot,
                           long&nbsp;cacheFlushId,
-                          <a href="../../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a>&nbsp;status)</code>
+                          <a href="../../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a>&nbsp;status,
+                          <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a>&nbsp;throughputController)</code>
 <div class="block">Flushes the snapshot of the MemStore.</div>
 </td>
 </tr>
@@ -190,31 +191,35 @@
 <tbody>
 <tr class="altColor">
 <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>&lt;org.apache.hadoop.fs.Path&gt;</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&nbsp;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&nbsp;logCacheFlushId,
                     <a href="../../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a>&nbsp;snapshot,
-                    <a href="../../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a>&nbsp;status)</code>
+                    <a href="../../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a>&nbsp;status,
+                    <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a>&nbsp;throughputController)</code>
 <div class="block">Write out current snapshot.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <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>&lt;org.apache.hadoop.fs.Path&gt;</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>&nbsp;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>&nbsp;snapshot,
                           long&nbsp;cacheFlushSeqNum,
-                          <a href="../../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a>&nbsp;status)</code>
+                          <a href="../../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a>&nbsp;status,
+                          <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a>&nbsp;throughputController)</code>
 <div class="block">Turns a snapshot of memstore into a set of store files.</div>
 </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>&lt;org.apache.hadoop.fs.Path&gt;</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>&nbsp;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>&nbsp;snapshot,
                           long&nbsp;cacheFlushId,
-                          <a href="../../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a>&nbsp;status)</code>&nbsp;</td>
+                          <a href="../../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a>&nbsp;status,
+                          <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a>&nbsp;throughputController)</code>&nbsp;</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>&lt;org.apache.hadoop.fs.Path&gt;</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>&nbsp;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>&nbsp;snapshot,
                           long&nbsp;cacheFlushSeqNum,
-                          <a href="../../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a>&nbsp;status)</code>&nbsp;</td>
+                          <a href="../../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a>&nbsp;status,
+                          <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a>&nbsp;throughputController)</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c6155501/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.html
index 8c1bcff..4ded5b1 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/RegionServerServices.html
@@ -105,15 +105,15 @@
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="#org.apache.hadoop.hbase.regionserver.compactions">org.apache.hadoop.hbase.regionserver.compactions</a></td>
+<td class="colFirst"><a href="#org.apache.hadoop.hbase.regionserver.handler">org.apache.hadoop.hbase.regionserver.handler</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="#org.apache.hadoop.hbase.regionserver.handler">org.apache.hadoop.hbase.regionserver.handler</a></td>
+<td class="colFirst"><a href="#org.apache.hadoop.hbase.regionserver.snapshot">org.apache.hadoop.hbase.regionserver.snapshot</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="#org.apache.hadoop.hbase.regionserver.snapshot">org.apache.hadoop.hbase.regionserver.snapshot</a></td>
+<td class="colFirst"><a href="#org.apache.hadoop.hbase.regionserver.throttle">org.apache.hadoop.hbase.regionserver.throttle</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 </tbody>
@@ -786,39 +786,6 @@
 </tbody>
 </table>
 </li>
-<li class="blockList"><a name="org.apache.hadoop.hbase.regionserver.compactions">
-<!--   -->
-</a>
-<h3>Uses of <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a> in <a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/package-summary.html">org.apache.hadoop.hbase.regionserver.compactions</a></h3>
-<table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
-<caption><span>Methods in <a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/package-summary.html">org.apache.hadoop.hbase.regionserver.compactions</a> with parameters of type <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
-</tr>
-<tbody>
-<tr class="altColor">
-<td class="colFirst"><code>static <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="colLast"><span class="strong">CompactionThroughputControllerFactory.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionThroughputControllerFactory.html#create(org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.conf.Configuration)">create</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server,
-            org.apache.hadoop.conf.Configuration&nbsp;conf)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">NoLimitCompactionThroughputController.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/NoLimitCompactionThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">PressureAwareCompactionThroughputController.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/PressureAwareCompactionThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="strong">CompactionThroughputController.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>
-<div class="block">Setup controller for the given region server.</div>
-</td>
-</tr>
-</tbody>
-</table>
-</li>
 <li class="blockList"><a name="org.apache.hadoop.hbase.regionserver.handler">
 <!--   -->
 </a>
@@ -961,6 +928,52 @@
 </tbody>
 </table>
 </li>
+<li class="blockList"><a name="org.apache.hadoop.hbase.regionserver.throttle">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a> in <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/package-summary.html">org.apache.hadoop.hbase.regionserver.throttle</a></h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/package-summary.html">org.apache.hadoop.hbase.regionserver.throttle</a> with parameters of type <a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static <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"><span class="strong">CompactionThroughputControllerFactory.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/CompactionThroughputControllerFactory.html#create(org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.conf.Configuration)">create</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server,
+            org.apache.hadoop.conf.Configuration&nbsp;conf)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <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"><span class="strong">FlushThroughputControllerFactory.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/FlushThroughputControllerFactory.html#create(org.apache.hadoop.hbase.regionserver.RegionServerServices,%20org.apache.hadoop.conf.Configuration)">create</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server,
+            org.apache.hadoop.conf.Configuration&nbsp;conf)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>abstract void</code></td>
+<td class="colLast"><span class="strong">PressureAwareThroughputController.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/PressureAwareThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="strong">ThroughputController.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>
+<div class="block">Setup controller for the given region server.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="strong">NoLimitThroughputController.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/NoLimitThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="strong">PressureAwareCompactionThroughputController.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/PressureAwareCompactionThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="strong">PressureAwareFlushThroughputController.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/PressureAwareFlushThroughputController.html#setup(org.apache.hadoop.hbase.regionserver.RegionServerServices)">setup</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/RegionServerServices.html" title="interface in org.apache.hadoop.hbase.regionserver">RegionServerServices</a>&nbsp;server)</code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
 </ul>
 </li>
 </ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c6155501/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/Store.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/Store.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/Store.html
index 5f11407..ba661a9 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/Store.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/Store.html
@@ -97,6 +97,10 @@
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="#org.apache.hadoop.hbase.regionserver.throttle">org.apache.hadoop.hbase.regionserver.throttle</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="#org.apache.hadoop.hbase.security.access">org.apache.hadoop.hbase.security.access</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -590,15 +594,15 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="strong">HRegion.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#compact(org.apache.hadoop.hbase.regionserver.compactions.CompactionContext,%20org.apache.hadoop.hbase.regionserver.Store,%20org.apache.hadoop.hbase.regionserver.compactions.CompactionThroughputController)">compact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">CompactionContext</a>&nbsp;compaction,
+<td class="colLast"><span class="strong">HRegion.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#compact(org.apache.hadoop.hbase.regionserver.compactions.CompactionContext,%20org.apache.hadoop.hbase.regionserver.Store,%20org.apache.hadoop.hbase.regionserver.throttle.ThroughputController)">compact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">CompactionContext</a>&nbsp;compaction,
               <a href="../../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a>&nbsp;store,
-              <a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">CompactionThroughputController</a>&nbsp;throughputController)</code>&nbsp;</td>
+              <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a>&nbsp;throughputController)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><span class="strong">HRegion.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#compact(org.apache.hadoop.hbase.regionserver.compactions.CompactionContext,%20org.apache.hadoop.hbase.regionserver.Store,%20org.apache.hadoop.hbase.regionserver.compactions.CompactionThroughputController,%20org.apache.hadoop.hbase.security.User)">compact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">CompactionContext</a>&nbsp;compaction,
+<td class="colLast"><span class="strong">HRegion.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html#compact(org.apache.hadoop.hbase.regionserver.compactions.CompactionContext,%20org.apache.hadoop.hbase.regionserver.Store,%20org.apache.hadoop.hbase.regionserver.throttle.ThroughputController,%20org.apache.hadoop.hbase.security.User)">compact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">CompactionContext</a>&nbsp;compaction,
               <a href="../../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a>&nbsp;store,
-              <a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">CompactionThroughputController</a>&nbsp;throughputController,
+              <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a>&nbsp;throughputController,
               <a href="../../../../../../org/apache/hadoop/hbase/security/User.html" title="class in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
@@ -1142,6 +1146,28 @@
 </tbody>
 </table>
 </li>
+<li class="blockList"><a name="org.apache.hadoop.hbase.regionserver.throttle">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a> in <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/package-summary.html">org.apache.hadoop.hbase.regionserver.throttle</a></h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/package-summary.html">org.apache.hadoop.hbase.regionserver.throttle</a> with parameters of type <a href="../../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><span class="strong">ThroughputControlUtil.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputControlUtil.html#getNameForThrottling(org.apache.hadoop.hbase.regionserver.Store,%20java.lang.String)">getNameForThrottling</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a>&nbsp;store,
+                                        <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;opName)</code>
+<div class="block">Generate a name for throttling, to prevent name conflict when multiple IO operation running
+ parallel on the same store.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
 <li class="blockList"><a name="org.apache.hadoop.hbase.security.access">
 <!--   -->
 </a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c6155501/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/StoreFile.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/StoreFile.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/StoreFile.html
index 65543b0..6f309a3 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/StoreFile.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/StoreFile.html
@@ -641,37 +641,37 @@
 </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>&lt;<a href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFile</a>&gt;</code></td>
-<td class="colLast"><span class="strong">HMobStore.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HMobStore.html#compact(org.apache.hadoop.hbase.regionserver.compactions.CompactionContext,%20org.apache.hadoop.hbase.regionserver.compactions.CompactionThroughputController)">compact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">CompactionContext</a>&nbsp;compaction,
-              <a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">CompactionThroughputController</a>&nbsp;throughputController)</code>
+<td class="colLast"><span class="strong">HMobStore.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HMobStore.html#compact(org.apache.hadoop.hbase.regionserver.compactions.CompactionContext,%20org.apache.hadoop.hbase.regionserver.throttle.ThroughputController)">compact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">CompactionContext</a>&nbsp;compaction,
+              <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a>&nbsp;throughputController)</code>
 <div class="block">The compaction in the store of mob.</div>
 </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>&lt;<a href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFile</a>&gt;</code></td>
-<td class="colLast"><span class="strong">HStore.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#compact(org.apache.hadoop.hbase.regionserver.compactions.CompactionContext,%20org.apache.hadoop.hbase.regionserver.compactions.CompactionThroughputController)">compact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">CompactionContext</a>&nbsp;compaction,
-              <a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">CompactionThroughputController</a>&nbsp;throughputController)</code>
+<td class="colLast"><span class="strong">HStore.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#compact(org.apache.hadoop.hbase.regionserver.compactions.CompactionContext,%20org.apache.hadoop.hbase.regionserver.throttle.ThroughputController)">compact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">CompactionContext</a>&nbsp;compaction,
+              <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a>&nbsp;throughputController)</code>
 <div class="block">Compact the StoreFiles.</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>&lt;<a href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFile</a>&gt;</code></td>
-<td class="colLast"><span class="strong">Store.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/Store.html#compact(org.apache.hadoop.hbase.regionserver.compactions.CompactionContext,%20org.apache.hadoop.hbase.regionserver.compactions.CompactionThroughputController)">compact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">CompactionContext</a>&nbsp;compaction,
-              <a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">CompactionThroughputController</a>&nbsp;throughputController)</code>
+<td class="colLast"><span class="strong">Store.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/Store.html#compact(org.apache.hadoop.hbase.regionserver.compactions.CompactionContext,%20org.apache.hadoop.hbase.regionserver.throttle.ThroughputController)">compact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">CompactionContext</a>&nbsp;compaction,
+              <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a>&nbsp;throughputController)</code>
 <div class="block"><strong>Deprecated.</strong>&nbsp;
-<div class="block"><i>see compact(CompactionContext, CompactionThroughputController, User)</i></div>
+<div class="block"><i>see compact(CompactionContext, ThroughputController, User)</i></div>
 </div>
 </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>&lt;<a href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFile</a>&gt;</code></td>
-<td class="colLast"><span class="strong">HStore.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#compact(org.apache.hadoop.hbase.regionserver.compactions.CompactionContext,%20org.apache.hadoop.hbase.regionserver.compactions.CompactionThroughputController,%20org.apache.hadoop.hbase.security.User)">compact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">CompactionContext</a>&nbsp;compaction,
-              <a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">CompactionThroughputController</a>&nbsp;throughputController,
+<td class="colLast"><span class="strong">HStore.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/HStore.html#compact(org.apache.hadoop.hbase.regionserver.compactions.CompactionContext,%20org.apache.hadoop.hbase.regionserver.throttle.ThroughputController,%20org.apache.hadoop.hbase.security.User)">compact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">CompactionContext</a>&nbsp;compaction,
+              <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a>&nbsp;throughputController,
               <a href="../../../../../../org/apache/hadoop/hbase/security/User.html" title="class in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>&nbsp;</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>&lt;<a href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFile</a>&gt;</code></td>
-<td class="colLast"><span class="strong">Store.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/Store.html#compact(org.apache.hadoop.hbase.regionserver.compactions.CompactionContext,%20org.apache.hadoop.hbase.regionserver.compactions.CompactionThroughputController,%20org.apache.hadoop.hbase.security.User)">compact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">CompactionContext</a>&nbsp;compaction,
-              <a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">CompactionThroughputController</a>&nbsp;throughputController,
+<td class="colLast"><span class="strong">Store.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/Store.html#compact(org.apache.hadoop.hbase.regionserver.compactions.CompactionContext,%20org.apache.hadoop.hbase.regionserver.throttle.ThroughputController,%20org.apache.hadoop.hbase.security.User)">compact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">CompactionContext</a>&nbsp;compaction,
+              <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a>&nbsp;throughputController,
               <a href="../../../../../../org/apache/hadoop/hbase/security/User.html" title="class in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c6155501/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/StripeMultiFileWriter.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/StripeMultiFileWriter.html b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/StripeMultiFileWriter.html
index 6217468..2d19147 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/StripeMultiFileWriter.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/class-use/StripeMultiFileWriter.html
@@ -147,11 +147,11 @@
 <tbody>
 <tr class="altColor">
 <td class="colFirst"><code>private <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>&lt;org.apache.hadoop.fs.Path&gt;</code></td>
-<td class="colLast"><span class="strong">StripeCompactor.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/StripeCompactor.html#compactInternal(org.apache.hadoop.hbase.regionserver.StripeMultiFileWriter,%20org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest,%20byte[],%20byte[],%20org.apache.hadoop.hbase.regionserver.compactions.CompactionThroughputController,%20org.apache.hadoop.hbase.security.User)">compactInternal</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/StripeMultiFileWriter.html" title="class in org.apache.hadoop.hbase.regionserver">StripeMultiFileWriter</a>&nbsp;mw,
+<td class="colLast"><span class="strong">StripeCompactor.</span><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/StripeCompactor.html#compactInternal(org.apache.hadoop.hbase.regionserver.StripeMultiFileWriter,%20org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest,%20byte[],%20byte[],%20org.apache.hadoop.hbase.regionserver.throttle.ThroughputController,%20org.apache.hadoop.hbase.security.User)">compactInternal</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/StripeMultiFileWriter.html" title="class in org.apache.hadoop.hbase.regionserver">StripeMultiFileWriter</a>&nbsp;mw,
                               <a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">CompactionRequest</a>&nbsp;request,
                               byte[]&nbsp;majorRangeFromRow,
                               byte[]&nbsp;majorRangeToRow,
-                              <a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">CompactionThroughputController</a>&nbsp;throughputController,
+                              <a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a>&nbsp;throughputController,
                               <a href="../../../../../../org/apache/hadoop/hbase/security/User.html" title="class in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>&nbsp;</td>
 </tr>
 </tbody>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c6155501/devapidocs/org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html b/devapidocs/org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html
index db7214d..0d7d803 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html
@@ -100,7 +100,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 abstract class <a href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html#line.37">CompactionContext</a>
+public abstract class <a href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html#line.38">CompactionContext</a>
 extends <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></pre>
 <div class="block">This class holds all "physical" details necessary to run a compaction,
  and abstracts away the details specific to a particular compaction.
@@ -162,13 +162,13 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 </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>&lt;org.apache.hadoop.fs.Path&gt;</code></td>
-<td class="colLast"><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html#compact(org.apache.hadoop.hbase.regionserver.compactions.CompactionThroughputController)">compact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">CompactionThroughputController</a>&nbsp;throughputController)</code>
+<td class="colLast"><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html#compact(org.apache.hadoop.hbase.regionserver.throttle.ThroughputController)">compact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a>&nbsp;throughputController)</code>
 <div class="block">Runs the compaction based on current selection.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <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>&lt;org.apache.hadoop.fs.Path&gt;</code></td>
-<td class="colLast"><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html#compact(org.apache.hadoop.hbase.regionserver.compactions.CompactionThroughputController,%20org.apache.hadoop.hbase.security.User)">compact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">CompactionThroughputController</a>&nbsp;throughputController,
+<td class="colLast"><code><strong><a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html#compact(org.apache.hadoop.hbase.regionserver.throttle.ThroughputController,%20org.apache.hadoop.hbase.security.User)">compact</a></strong>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a>&nbsp;throughputController,
               <a href="../../../../../../org/apache/hadoop/hbase/security/User.html" title="class in org.apache.hadoop.hbase.security">User</a>&nbsp;user)</code>&nbsp;</td>
 </tr>
 <tr class="altColor">
@@ -229,7 +229,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>request</h4>
-<pre>protected&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">CompactionRequest</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html#line.38">request</a></pre>
+<pre>protected&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">CompactionRequest</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html#line.39">request</a></pre>
 </li>
 </ul>
 </li>
@@ -246,7 +246,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>CompactionContext</h4>
-<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html#line.37">CompactionContext</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html#line.38">CompactionContext</a>()</pre>
 </li>
 </ul>
 </li>
@@ -263,7 +263,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>preSelect</h4>
-<pre>public abstract&nbsp;<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>&lt;<a href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFile</a>&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html#line.46">preSelect</a>(<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>&lt;<a href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFile</a>&gt;&nbsp;filesCompacting)</pre>
+<pre>public abstract&nbsp;<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>&lt;<a href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFile</a>&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html#line.47">preSelect</a>(<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>&lt;<a href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFile</a>&gt;&nbsp;filesCompacting)</pre>
 <div class="block">Called before coprocessor preCompactSelection and should filter the candidates
  for coprocessor; i.e. exclude the files that definitely cannot be compacted at this time.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>filesCompacting</code> - files currently compacting</dd>
@@ -276,7 +276,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>select</h4>
-<pre>public abstract&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html#line.56">select</a>(<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>&lt;<a href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFile</a>&gt;&nbsp;filesCompacting,
+<pre>public abstract&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html#line.57">select</a>(<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>&lt;<a href="../../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFile</a>&gt;&nbsp;filesCompacting,
              boolean&nbsp;isUserCompaction,
              boolean&nbsp;mayUseOffPeak,
              boolean&nbsp;forceMajor)
@@ -294,18 +294,18 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>forceSelect</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html#line.64">forceSelect</a>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">CompactionRequest</a>&nbsp;request)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html#line.65">forceSelect</a>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">CompactionRequest</a>&nbsp;request)</pre>
 <div class="block">Forces external selection to be applied for this compaction.</div>
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>request</code> - The pre-cooked request with selection and other settings.</dd></dl>
 </li>
 </ul>
-<a name="compact(org.apache.hadoop.hbase.regionserver.compactions.CompactionThroughputController)">
+<a name="compact(org.apache.hadoop.hbase.regionserver.throttle.ThroughputController)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>compact</h4>
-<pre>public abstract&nbsp;<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>&lt;org.apache.hadoop.fs.Path&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html#line.72">compact</a>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">CompactionThroughputController</a>&nbsp;throughputController)
+<pre>public abstract&nbsp;<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>&lt;org.apache.hadoop.fs.Path&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html#line.73">compact</a>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a>&nbsp;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">Runs the compaction based on current selection. select/forceSelect must have been called.</div>
 <dl><dt><span class="strong">Returns:</span></dt><dd>The new file paths resulting from compaction.</dd>
@@ -313,13 +313,13 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <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="compact(org.apache.hadoop.hbase.regionserver.compactions.CompactionThroughputController, org.apache.hadoop.hbase.security.User)">
+<a name="compact(org.apache.hadoop.hbase.regionserver.throttle.ThroughputController, org.apache.hadoop.hbase.security.User)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>compact</h4>
-<pre>public abstract&nbsp;<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>&lt;org.apache.hadoop.fs.Path&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html#line.75">compact</a>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.compactions">CompactionThroughputController</a>&nbsp;throughputController,
+<pre>public abstract&nbsp;<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>&lt;org.apache.hadoop.fs.Path&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html#line.76">compact</a>(<a href="../../../../../../org/apache/hadoop/hbase/regionserver/throttle/ThroughputController.html" title="interface in org.apache.hadoop.hbase.regionserver.throttle">ThroughputController</a>&nbsp;throughputController,
                                       <a href="../../../../../../org/apache/hadoop/hbase/security/User.html" title="class in org.apache.hadoop.hbase.security">User</a>&nbsp;user)
                                                  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>
@@ -332,7 +332,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockList">
 <li class="blockList">
 <h4>getRequest</h4>
-<pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">CompactionRequest</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html#line.78">getRequest</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">CompactionRequest</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html#line.79">getRequest</a>()</pre>
 </li>
 </ul>
 <a name="hasSelection()">
@@ -341,7 +341,7 @@ extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 <ul class="blockListLast">
 <li class="blockList">
 <h4>hasSelection</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html#line.83">hasSelection</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/regionserver/compactions/CompactionContext.html#line.84">hasSelection</a>()</pre>
 </li>
 </ul>
 </li>


Mime
View raw message