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

[11/17] hbase-site git commit: Published site at 5cc845b713853645f1e25b29caa556d79cfdc551.

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/de8c44eb/devapidocs/src-html/org/apache/hadoop/hbase/quotas/DefaultOperationQuota.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/DefaultOperationQuota.html b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/DefaultOperationQuota.html
index 8d66107..7e55aa0 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/DefaultOperationQuota.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/DefaultOperationQuota.html
@@ -29,109 +29,148 @@
 <span class="sourceLineNo">021</span>import java.util.Arrays;<a name="line.21"></a>
 <span class="sourceLineNo">022</span>import java.util.List;<a name="line.22"></a>
 <span class="sourceLineNo">023</span><a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.yetus.audience.InterfaceStability;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.slf4j.Logger;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.slf4j.LoggerFactory;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.client.Mutation;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.client.Result;<a name="line.29"></a>
-<span class="sourceLineNo">030</span><a name="line.30"></a>
-<span class="sourceLineNo">031</span>@InterfaceAudience.Private<a name="line.31"></a>
-<span class="sourceLineNo">032</span>@InterfaceStability.Evolving<a name="line.32"></a>
-<span class="sourceLineNo">033</span>public class DefaultOperationQuota implements OperationQuota {<a name="line.33"></a>
-<span class="sourceLineNo">034</span>  private static final Logger LOG = LoggerFactory.getLogger(DefaultOperationQuota.class);<a name="line.34"></a>
-<span class="sourceLineNo">035</span><a name="line.35"></a>
-<span class="sourceLineNo">036</span>  private final List&lt;QuotaLimiter&gt; limiters;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>  private long writeAvailable = 0;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>  private long readAvailable = 0;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>  private long writeConsumed = 0;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>  private long readConsumed = 0;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>  private final long[] operationSize;<a name="line.41"></a>
-<span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span>  public DefaultOperationQuota(final QuotaLimiter... limiters) {<a name="line.43"></a>
-<span class="sourceLineNo">044</span>    this(Arrays.asList(limiters));<a name="line.44"></a>
-<span class="sourceLineNo">045</span>  }<a name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span>  /**<a name="line.47"></a>
-<span class="sourceLineNo">048</span>   * NOTE: The order matters. It should be something like [user, table, namespace, global]<a name="line.48"></a>
-<span class="sourceLineNo">049</span>   */<a name="line.49"></a>
-<span class="sourceLineNo">050</span>  public DefaultOperationQuota(final List&lt;QuotaLimiter&gt; limiters) {<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    this.limiters = limiters;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    int size = OperationType.values().length;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    operationSize = new long[size];<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span>    for (int i = 0; i &lt; size; ++i) {<a name="line.55"></a>
-<span class="sourceLineNo">056</span>      operationSize[i] = 0;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    }<a name="line.57"></a>
-<span class="sourceLineNo">058</span>  }<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>  @Override<a name="line.60"></a>
-<span class="sourceLineNo">061</span>  public void checkQuota(int numWrites, int numReads, int numScans)<a name="line.61"></a>
-<span class="sourceLineNo">062</span>      throws RpcThrottlingException {<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    writeConsumed = estimateConsume(OperationType.MUTATE, numWrites, 100);<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    readConsumed  = estimateConsume(OperationType.GET, numReads, 100);<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    readConsumed += estimateConsume(OperationType.SCAN, numScans, 1000);<a name="line.65"></a>
-<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span>    writeAvailable = Long.MAX_VALUE;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    readAvailable = Long.MAX_VALUE;<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    for (final QuotaLimiter limiter: limiters) {<a name="line.69"></a>
-<span class="sourceLineNo">070</span>      if (limiter.isBypass()) continue;<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span>      limiter.checkQuota(numWrites, writeConsumed, numReads + numScans, readConsumed);<a name="line.72"></a>
-<span class="sourceLineNo">073</span>      readAvailable = Math.min(readAvailable, limiter.getReadAvailable());<a name="line.73"></a>
-<span class="sourceLineNo">074</span>      writeAvailable = Math.min(writeAvailable, limiter.getWriteAvailable());<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    }<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span>    for (final QuotaLimiter limiter: limiters) {<a name="line.77"></a>
-<span class="sourceLineNo">078</span>      limiter.grabQuota(numWrites, writeConsumed, numReads + numScans, readConsumed);<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    }<a name="line.79"></a>
-<span class="sourceLineNo">080</span>  }<a name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span>  @Override<a name="line.82"></a>
-<span class="sourceLineNo">083</span>  public void close() {<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    // Adjust the quota consumed for the specified operation<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    long writeDiff = operationSize[OperationType.MUTATE.ordinal()] - writeConsumed;<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    long readDiff = operationSize[OperationType.GET.ordinal()] +<a name="line.86"></a>
-<span class="sourceLineNo">087</span>        operationSize[OperationType.SCAN.ordinal()] - readConsumed;<a name="line.87"></a>
-<span class="sourceLineNo">088</span><a name="line.88"></a>
-<span class="sourceLineNo">089</span>    for (final QuotaLimiter limiter: limiters) {<a name="line.89"></a>
-<span class="sourceLineNo">090</span>      if (writeDiff != 0) limiter.consumeWrite(writeDiff);<a name="line.90"></a>
-<span class="sourceLineNo">091</span>      if (readDiff != 0) limiter.consumeRead(readDiff);<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    }<a name="line.92"></a>
-<span class="sourceLineNo">093</span>  }<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span>  @Override<a name="line.95"></a>
-<span class="sourceLineNo">096</span>  public long getReadAvailable() {<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    return readAvailable;<a name="line.97"></a>
-<span class="sourceLineNo">098</span>  }<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span>  @Override<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  public long getWriteAvailable() {<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    return writeAvailable;<a name="line.102"></a>
-<span class="sourceLineNo">103</span>  }<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span>  @Override<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  public void addGetResult(final Result result) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    operationSize[OperationType.GET.ordinal()] += QuotaUtil.calculateResultSize(result);<a name="line.107"></a>
-<span class="sourceLineNo">108</span>  }<a name="line.108"></a>
-<span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span>  @Override<a name="line.110"></a>
-<span class="sourceLineNo">111</span>  public void addScanResult(final List&lt;Result&gt; results) {<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    operationSize[OperationType.SCAN.ordinal()] += QuotaUtil.calculateResultSize(results);<a name="line.112"></a>
-<span class="sourceLineNo">113</span>  }<a name="line.113"></a>
-<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span>  @Override<a name="line.115"></a>
-<span class="sourceLineNo">116</span>  public void addMutation(final Mutation mutation) {<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    operationSize[OperationType.MUTATE.ordinal()] += QuotaUtil.calculateMutationSize(mutation);<a name="line.117"></a>
-<span class="sourceLineNo">118</span>  }<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span>  private long estimateConsume(final OperationType type, int numReqs, long avgSize) {<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    if (numReqs &gt; 0) {<a name="line.121"></a>
-<span class="sourceLineNo">122</span>      return avgSize * numReqs;<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    }<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    return 0;<a name="line.124"></a>
-<span class="sourceLineNo">125</span>  }<a name="line.125"></a>
-<span class="sourceLineNo">126</span>}<a name="line.126"></a>
+<span class="sourceLineNo">024</span>import org.apache.hadoop.conf.Configuration;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.yetus.audience.InterfaceStability;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.slf4j.Logger;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.slf4j.LoggerFactory;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.client.Mutation;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.client.Result;<a name="line.30"></a>
+<span class="sourceLineNo">031</span><a name="line.31"></a>
+<span class="sourceLineNo">032</span>@InterfaceAudience.Private<a name="line.32"></a>
+<span class="sourceLineNo">033</span>@InterfaceStability.Evolving<a name="line.33"></a>
+<span class="sourceLineNo">034</span>public class DefaultOperationQuota implements OperationQuota {<a name="line.34"></a>
+<span class="sourceLineNo">035</span>  private static final Logger LOG = LoggerFactory.getLogger(DefaultOperationQuota.class);<a name="line.35"></a>
+<span class="sourceLineNo">036</span><a name="line.36"></a>
+<span class="sourceLineNo">037</span>  private final List&lt;QuotaLimiter&gt; limiters;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>  private final long writeCapacityUnit;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>  private final long readCapacityUnit;<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span>  private long writeAvailable = 0;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>  private long readAvailable = 0;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>  private long writeConsumed = 0;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>  private long readConsumed = 0;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>  private long writeCapacityUnitConsumed = 0;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>  private long readCapacityUnitConsumed = 0;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>  private final long[] operationSize;<a name="line.47"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span>  public DefaultOperationQuota(final Configuration conf, final QuotaLimiter... limiters) {<a name="line.49"></a>
+<span class="sourceLineNo">050</span>    this(conf, Arrays.asList(limiters));<a name="line.50"></a>
+<span class="sourceLineNo">051</span>  }<a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span>  /**<a name="line.53"></a>
+<span class="sourceLineNo">054</span>   * NOTE: The order matters. It should be something like [user, table, namespace, global]<a name="line.54"></a>
+<span class="sourceLineNo">055</span>   */<a name="line.55"></a>
+<span class="sourceLineNo">056</span>  public DefaultOperationQuota(final Configuration conf, final List&lt;QuotaLimiter&gt; limiters) {<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    this.writeCapacityUnit =<a name="line.57"></a>
+<span class="sourceLineNo">058</span>        conf.getLong(QuotaUtil.WRITE_CAPACITY_UNIT_CONF_KEY, QuotaUtil.DEFAULT_WRITE_CAPACITY_UNIT);<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    this.readCapacityUnit =<a name="line.59"></a>
+<span class="sourceLineNo">060</span>        conf.getLong(QuotaUtil.READ_CAPACITY_UNIT_CONF_KEY, QuotaUtil.DEFAULT_READ_CAPACITY_UNIT);<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    this.limiters = limiters;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    int size = OperationType.values().length;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    operationSize = new long[size];<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span>    for (int i = 0; i &lt; size; ++i) {<a name="line.65"></a>
+<span class="sourceLineNo">066</span>      operationSize[i] = 0;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    }<a name="line.67"></a>
+<span class="sourceLineNo">068</span>  }<a name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span>  @Override<a name="line.70"></a>
+<span class="sourceLineNo">071</span>  public void checkQuota(int numWrites, int numReads, int numScans) throws RpcThrottlingException {<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    writeConsumed = estimateConsume(OperationType.MUTATE, numWrites, 100);<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    readConsumed = estimateConsume(OperationType.GET, numReads, 100);<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    readConsumed += estimateConsume(OperationType.SCAN, numScans, 1000);<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span>    writeCapacityUnitConsumed = calculateWriteCapacityUnit(writeConsumed);<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    readCapacityUnitConsumed = calculateReadCapacityUnit(readConsumed);<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span>    writeAvailable = Long.MAX_VALUE;<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    readAvailable = Long.MAX_VALUE;<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    for (final QuotaLimiter limiter : limiters) {<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      if (limiter.isBypass()) continue;<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span>      limiter.checkQuota(numWrites, writeConsumed, numReads + numScans, readConsumed,<a name="line.84"></a>
+<span class="sourceLineNo">085</span>        writeCapacityUnitConsumed, readCapacityUnitConsumed);<a name="line.85"></a>
+<span class="sourceLineNo">086</span>      readAvailable = Math.min(readAvailable, limiter.getReadAvailable());<a name="line.86"></a>
+<span class="sourceLineNo">087</span>      writeAvailable = Math.min(writeAvailable, limiter.getWriteAvailable());<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    }<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span>    for (final QuotaLimiter limiter : limiters) {<a name="line.90"></a>
+<span class="sourceLineNo">091</span>      limiter.grabQuota(numWrites, writeConsumed, numReads + numScans, readConsumed,<a name="line.91"></a>
+<span class="sourceLineNo">092</span>        writeCapacityUnitConsumed, readCapacityUnitConsumed);<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    }<a name="line.93"></a>
+<span class="sourceLineNo">094</span>  }<a name="line.94"></a>
+<span class="sourceLineNo">095</span><a name="line.95"></a>
+<span class="sourceLineNo">096</span>  @Override<a name="line.96"></a>
+<span class="sourceLineNo">097</span>  public void close() {<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    // Adjust the quota consumed for the specified operation<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    long writeDiff = operationSize[OperationType.MUTATE.ordinal()] - writeConsumed;<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    long readDiff = operationSize[OperationType.GET.ordinal()]<a name="line.100"></a>
+<span class="sourceLineNo">101</span>        + operationSize[OperationType.SCAN.ordinal()] - readConsumed;<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    long writeCapacityUnitDiff = calculateWriteCapacityUnitDiff(<a name="line.102"></a>
+<span class="sourceLineNo">103</span>      operationSize[OperationType.MUTATE.ordinal()], writeConsumed);<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    long readCapacityUnitDiff = calculateReadCapacityUnitDiff(<a name="line.104"></a>
+<span class="sourceLineNo">105</span>      operationSize[OperationType.GET.ordinal()] + operationSize[OperationType.SCAN.ordinal()],<a name="line.105"></a>
+<span class="sourceLineNo">106</span>      readConsumed);<a name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span>    for (final QuotaLimiter limiter : limiters) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span>      if (writeDiff != 0) {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>        limiter.consumeWrite(writeDiff, writeCapacityUnitDiff);<a name="line.110"></a>
+<span class="sourceLineNo">111</span>      }<a name="line.111"></a>
+<span class="sourceLineNo">112</span>      if (readDiff != 0) {<a name="line.112"></a>
+<span class="sourceLineNo">113</span>        limiter.consumeRead(readDiff, readCapacityUnitDiff);<a name="line.113"></a>
+<span class="sourceLineNo">114</span>      }<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    }<a name="line.115"></a>
+<span class="sourceLineNo">116</span>  }<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span>  @Override<a name="line.118"></a>
+<span class="sourceLineNo">119</span>  public long getReadAvailable() {<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    return readAvailable;<a name="line.120"></a>
+<span class="sourceLineNo">121</span>  }<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span>  @Override<a name="line.123"></a>
+<span class="sourceLineNo">124</span>  public long getWriteAvailable() {<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    return writeAvailable;<a name="line.125"></a>
+<span class="sourceLineNo">126</span>  }<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span>  @Override<a name="line.128"></a>
+<span class="sourceLineNo">129</span>  public void addGetResult(final Result result) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    operationSize[OperationType.GET.ordinal()] += QuotaUtil.calculateResultSize(result);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>  }<a name="line.131"></a>
+<span class="sourceLineNo">132</span><a name="line.132"></a>
+<span class="sourceLineNo">133</span>  @Override<a name="line.133"></a>
+<span class="sourceLineNo">134</span>  public void addScanResult(final List&lt;Result&gt; results) {<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    operationSize[OperationType.SCAN.ordinal()] += QuotaUtil.calculateResultSize(results);<a name="line.135"></a>
+<span class="sourceLineNo">136</span>  }<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span>  @Override<a name="line.138"></a>
+<span class="sourceLineNo">139</span>  public void addMutation(final Mutation mutation) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    operationSize[OperationType.MUTATE.ordinal()] += QuotaUtil.calculateMutationSize(mutation);<a name="line.140"></a>
+<span class="sourceLineNo">141</span>  }<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span>  private long estimateConsume(final OperationType type, int numReqs, long avgSize) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    if (numReqs &gt; 0) {<a name="line.144"></a>
+<span class="sourceLineNo">145</span>      return avgSize * numReqs;<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    }<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    return 0;<a name="line.147"></a>
+<span class="sourceLineNo">148</span>  }<a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span>  private long calculateWriteCapacityUnit(final long size) {<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    return (long) Math.ceil(size * 1.0 / this.writeCapacityUnit);<a name="line.151"></a>
+<span class="sourceLineNo">152</span>  }<a name="line.152"></a>
+<span class="sourceLineNo">153</span><a name="line.153"></a>
+<span class="sourceLineNo">154</span>  private long calculateReadCapacityUnit(final long size) {<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    return (long) Math.ceil(size * 1.0 / this.readCapacityUnit);<a name="line.155"></a>
+<span class="sourceLineNo">156</span>  }<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span>  private long calculateWriteCapacityUnitDiff(final long actualSize, final long estimateSize) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    return calculateWriteCapacityUnit(actualSize) - calculateWriteCapacityUnit(estimateSize);<a name="line.159"></a>
+<span class="sourceLineNo">160</span>  }<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span>  private long calculateReadCapacityUnitDiff(final long actualSize, final long estimateSize) {<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    return calculateReadCapacityUnit(actualSize) - calculateReadCapacityUnit(estimateSize);<a name="line.163"></a>
+<span class="sourceLineNo">164</span>  }<a name="line.164"></a>
+<span class="sourceLineNo">165</span>}<a name="line.165"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/de8c44eb/devapidocs/src-html/org/apache/hadoop/hbase/quotas/GlobalQuotaSettingsImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/GlobalQuotaSettingsImpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/GlobalQuotaSettingsImpl.html
index 55e5099..80a2ae7 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/GlobalQuotaSettingsImpl.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/GlobalQuotaSettingsImpl.html
@@ -157,158 +157,185 @@
 <span class="sourceLineNo">149</span>          case READ_SIZE:<a name="line.149"></a>
 <span class="sourceLineNo">150</span>            throttleBuilder.setReadSize(otherProto.getTimedQuota());<a name="line.150"></a>
 <span class="sourceLineNo">151</span>            break;<a name="line.151"></a>
-<span class="sourceLineNo">152</span>        }<a name="line.152"></a>
-<span class="sourceLineNo">153</span>      }<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    }<a name="line.154"></a>
-<span class="sourceLineNo">155</span><a name="line.155"></a>
-<span class="sourceLineNo">156</span>    // Propagate the space quota portion<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    QuotaProtos.SpaceQuota.Builder spaceBuilder = (spaceProto == null<a name="line.157"></a>
-<span class="sourceLineNo">158</span>        ? null : spaceProto.toBuilder());<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    if (other instanceof SpaceLimitSettings) {<a name="line.159"></a>
-<span class="sourceLineNo">160</span>      if (spaceBuilder == null) {<a name="line.160"></a>
-<span class="sourceLineNo">161</span>        spaceBuilder = QuotaProtos.SpaceQuota.newBuilder();<a name="line.161"></a>
-<span class="sourceLineNo">162</span>      }<a name="line.162"></a>
-<span class="sourceLineNo">163</span>      SpaceLimitSettings settingsToMerge = (SpaceLimitSettings) other;<a name="line.163"></a>
-<span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span>      QuotaProtos.SpaceLimitRequest spaceRequest = settingsToMerge.getProto();<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span>      // The message contained the expect SpaceQuota object<a name="line.167"></a>
-<span class="sourceLineNo">168</span>      if (spaceRequest.hasQuota()) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span>        SpaceQuota quotaToMerge = spaceRequest.getQuota();<a name="line.169"></a>
-<span class="sourceLineNo">170</span>        // Validate that the two settings are for the same target.<a name="line.170"></a>
-<span class="sourceLineNo">171</span>        // SpaceQuotas either apply to a table or a namespace (no user spacequota).<a name="line.171"></a>
-<span class="sourceLineNo">172</span>        if (!Objects.equals(getTableName(), settingsToMerge.getTableName())<a name="line.172"></a>
-<span class="sourceLineNo">173</span>            &amp;&amp; !Objects.equals(getNamespace(), settingsToMerge.getNamespace())) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span>          throw new IllegalArgumentException(<a name="line.174"></a>
-<span class="sourceLineNo">175</span>              "Cannot merge " + settingsToMerge + " into " + this);<a name="line.175"></a>
-<span class="sourceLineNo">176</span>        }<a name="line.176"></a>
-<span class="sourceLineNo">177</span><a name="line.177"></a>
-<span class="sourceLineNo">178</span>        if (quotaToMerge.getRemove()) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span>          // Update the builder to propagate the removal<a name="line.179"></a>
-<span class="sourceLineNo">180</span>          spaceBuilder.setRemove(true).clearSoftLimit().clearViolationPolicy();<a name="line.180"></a>
-<span class="sourceLineNo">181</span>        } else {<a name="line.181"></a>
-<span class="sourceLineNo">182</span>          // Add the new settings to the existing settings<a name="line.182"></a>
-<span class="sourceLineNo">183</span>          spaceBuilder.mergeFrom(quotaToMerge);<a name="line.183"></a>
-<span class="sourceLineNo">184</span>        }<a name="line.184"></a>
-<span class="sourceLineNo">185</span>      }<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    }<a name="line.186"></a>
+<span class="sourceLineNo">152</span>          case REQUEST_CAPACITY_UNIT:<a name="line.152"></a>
+<span class="sourceLineNo">153</span>            throttleBuilder.setReqCapacityUnit(otherProto.getTimedQuota());<a name="line.153"></a>
+<span class="sourceLineNo">154</span>            break;<a name="line.154"></a>
+<span class="sourceLineNo">155</span>          case READ_CAPACITY_UNIT:<a name="line.155"></a>
+<span class="sourceLineNo">156</span>            throttleBuilder.setReadCapacityUnit(otherProto.getTimedQuota());<a name="line.156"></a>
+<span class="sourceLineNo">157</span>            break;<a name="line.157"></a>
+<span class="sourceLineNo">158</span>          case WRITE_CAPACITY_UNIT:<a name="line.158"></a>
+<span class="sourceLineNo">159</span>            throttleBuilder.setWriteCapacityUnit(otherProto.getTimedQuota());<a name="line.159"></a>
+<span class="sourceLineNo">160</span>            break;<a name="line.160"></a>
+<span class="sourceLineNo">161</span>          default:<a name="line.161"></a>
+<span class="sourceLineNo">162</span>        }<a name="line.162"></a>
+<span class="sourceLineNo">163</span>      }<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    }<a name="line.164"></a>
+<span class="sourceLineNo">165</span><a name="line.165"></a>
+<span class="sourceLineNo">166</span>    // Propagate the space quota portion<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    QuotaProtos.SpaceQuota.Builder spaceBuilder = (spaceProto == null<a name="line.167"></a>
+<span class="sourceLineNo">168</span>        ? null : spaceProto.toBuilder());<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    if (other instanceof SpaceLimitSettings) {<a name="line.169"></a>
+<span class="sourceLineNo">170</span>      if (spaceBuilder == null) {<a name="line.170"></a>
+<span class="sourceLineNo">171</span>        spaceBuilder = QuotaProtos.SpaceQuota.newBuilder();<a name="line.171"></a>
+<span class="sourceLineNo">172</span>      }<a name="line.172"></a>
+<span class="sourceLineNo">173</span>      SpaceLimitSettings settingsToMerge = (SpaceLimitSettings) other;<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span>      QuotaProtos.SpaceLimitRequest spaceRequest = settingsToMerge.getProto();<a name="line.175"></a>
+<span class="sourceLineNo">176</span><a name="line.176"></a>
+<span class="sourceLineNo">177</span>      // The message contained the expect SpaceQuota object<a name="line.177"></a>
+<span class="sourceLineNo">178</span>      if (spaceRequest.hasQuota()) {<a name="line.178"></a>
+<span class="sourceLineNo">179</span>        SpaceQuota quotaToMerge = spaceRequest.getQuota();<a name="line.179"></a>
+<span class="sourceLineNo">180</span>        // Validate that the two settings are for the same target.<a name="line.180"></a>
+<span class="sourceLineNo">181</span>        // SpaceQuotas either apply to a table or a namespace (no user spacequota).<a name="line.181"></a>
+<span class="sourceLineNo">182</span>        if (!Objects.equals(getTableName(), settingsToMerge.getTableName())<a name="line.182"></a>
+<span class="sourceLineNo">183</span>            &amp;&amp; !Objects.equals(getNamespace(), settingsToMerge.getNamespace())) {<a name="line.183"></a>
+<span class="sourceLineNo">184</span>          throw new IllegalArgumentException(<a name="line.184"></a>
+<span class="sourceLineNo">185</span>              "Cannot merge " + settingsToMerge + " into " + this);<a name="line.185"></a>
+<span class="sourceLineNo">186</span>        }<a name="line.186"></a>
 <span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span>    Boolean bypassGlobals = this.bypassGlobals;<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    if (other instanceof QuotaGlobalsSettingsBypass) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      bypassGlobals = ((QuotaGlobalsSettingsBypass) other).getBypass();<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    }<a name="line.191"></a>
-<span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span>    if (throttleBuilder == null &amp;&amp;<a name="line.193"></a>
-<span class="sourceLineNo">194</span>        (spaceBuilder == null || (spaceBuilder.hasRemove() &amp;&amp; spaceBuilder.getRemove()))<a name="line.194"></a>
-<span class="sourceLineNo">195</span>        &amp;&amp; bypassGlobals == null) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      return null;<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    }<a name="line.197"></a>
-<span class="sourceLineNo">198</span><a name="line.198"></a>
-<span class="sourceLineNo">199</span>    return new GlobalQuotaSettingsImpl(<a name="line.199"></a>
-<span class="sourceLineNo">200</span>        getUserName(), getTableName(), getNamespace(),<a name="line.200"></a>
-<span class="sourceLineNo">201</span>        (throttleBuilder == null ? null : throttleBuilder.build()), bypassGlobals,<a name="line.201"></a>
-<span class="sourceLineNo">202</span>        (spaceBuilder == null ? null : spaceBuilder.build()));<a name="line.202"></a>
-<span class="sourceLineNo">203</span>  }<a name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span>  private void validateTimedQuota(final TimedQuota timedQuota) throws IOException {<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    if (timedQuota.getSoftLimit() &lt; 1) {<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      throw new DoNotRetryIOException(new UnsupportedOperationException(<a name="line.207"></a>
-<span class="sourceLineNo">208</span>          "The throttle limit must be greater then 0, got " + timedQuota.getSoftLimit()));<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    }<a name="line.209"></a>
-<span class="sourceLineNo">210</span>  }<a name="line.210"></a>
-<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span>  @Override<a name="line.212"></a>
-<span class="sourceLineNo">213</span>  public String toString() {<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    StringBuilder builder = new StringBuilder();<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    builder.append("GlobalQuota: ");<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    if (throttleProto != null) {<a name="line.216"></a>
-<span class="sourceLineNo">217</span>      Map&lt;ThrottleType,TimedQuota&gt; throttleQuotas = buildThrottleQuotas(throttleProto);<a name="line.217"></a>
-<span class="sourceLineNo">218</span>      builder.append(" { TYPE =&gt; THROTTLE ");<a name="line.218"></a>
-<span class="sourceLineNo">219</span>      for (Entry&lt;ThrottleType,TimedQuota&gt; entry : throttleQuotas.entrySet()) {<a name="line.219"></a>
-<span class="sourceLineNo">220</span>        final ThrottleType type = entry.getKey();<a name="line.220"></a>
-<span class="sourceLineNo">221</span>        final TimedQuota timedQuota = entry.getValue();<a name="line.221"></a>
-<span class="sourceLineNo">222</span>        builder.append("{THROTTLE_TYPE =&gt; ").append(type.name()).append(", LIMIT =&gt; ");<a name="line.222"></a>
-<span class="sourceLineNo">223</span>        if (timedQuota.hasSoftLimit()) {<a name="line.223"></a>
-<span class="sourceLineNo">224</span>          switch (type) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>            case REQUEST_NUMBER:<a name="line.225"></a>
-<span class="sourceLineNo">226</span>            case WRITE_NUMBER:<a name="line.226"></a>
-<span class="sourceLineNo">227</span>            case READ_NUMBER:<a name="line.227"></a>
-<span class="sourceLineNo">228</span>              builder.append(String.format("%dreq", timedQuota.getSoftLimit()));<a name="line.228"></a>
-<span class="sourceLineNo">229</span>              break;<a name="line.229"></a>
-<span class="sourceLineNo">230</span>            case REQUEST_SIZE:<a name="line.230"></a>
-<span class="sourceLineNo">231</span>            case WRITE_SIZE:<a name="line.231"></a>
-<span class="sourceLineNo">232</span>            case READ_SIZE:<a name="line.232"></a>
-<span class="sourceLineNo">233</span>              builder.append(sizeToString(timedQuota.getSoftLimit()));<a name="line.233"></a>
-<span class="sourceLineNo">234</span>              break;<a name="line.234"></a>
-<span class="sourceLineNo">235</span>          }<a name="line.235"></a>
-<span class="sourceLineNo">236</span>        } else if (timedQuota.hasShare()) {<a name="line.236"></a>
-<span class="sourceLineNo">237</span>          builder.append(String.format("%.2f%%", timedQuota.getShare()));<a name="line.237"></a>
-<span class="sourceLineNo">238</span>        }<a name="line.238"></a>
-<span class="sourceLineNo">239</span>        builder.append('/');<a name="line.239"></a>
-<span class="sourceLineNo">240</span>        builder.append(timeToString(ProtobufUtil.toTimeUnit(timedQuota.getTimeUnit())));<a name="line.240"></a>
-<span class="sourceLineNo">241</span>        if (timedQuota.hasScope()) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span>          builder.append(", SCOPE =&gt; ");<a name="line.242"></a>
-<span class="sourceLineNo">243</span>          builder.append(timedQuota.getScope().toString());<a name="line.243"></a>
-<span class="sourceLineNo">244</span>        }<a name="line.244"></a>
-<span class="sourceLineNo">245</span>      }<a name="line.245"></a>
-<span class="sourceLineNo">246</span>      builder.append( "} } ");<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    } else {<a name="line.247"></a>
-<span class="sourceLineNo">248</span>      builder.append(" {} ");<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    }<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    if (bypassGlobals != null) {<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      builder.append(" { GLOBAL_BYPASS =&gt; " + bypassGlobals + " } ");<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    }<a name="line.252"></a>
-<span class="sourceLineNo">253</span>    if (spaceProto != null) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span>      builder.append(" { TYPE =&gt; SPACE");<a name="line.254"></a>
-<span class="sourceLineNo">255</span>      if (getTableName() != null) {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>        builder.append(", TABLE =&gt; ").append(getTableName());<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      }<a name="line.257"></a>
-<span class="sourceLineNo">258</span>      if (getNamespace() != null) {<a name="line.258"></a>
-<span class="sourceLineNo">259</span>        builder.append(", NAMESPACE =&gt; ").append(getNamespace());<a name="line.259"></a>
+<span class="sourceLineNo">188</span>        if (quotaToMerge.getRemove()) {<a name="line.188"></a>
+<span class="sourceLineNo">189</span>          // Update the builder to propagate the removal<a name="line.189"></a>
+<span class="sourceLineNo">190</span>          spaceBuilder.setRemove(true).clearSoftLimit().clearViolationPolicy();<a name="line.190"></a>
+<span class="sourceLineNo">191</span>        } else {<a name="line.191"></a>
+<span class="sourceLineNo">192</span>          // Add the new settings to the existing settings<a name="line.192"></a>
+<span class="sourceLineNo">193</span>          spaceBuilder.mergeFrom(quotaToMerge);<a name="line.193"></a>
+<span class="sourceLineNo">194</span>        }<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      }<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    }<a name="line.196"></a>
+<span class="sourceLineNo">197</span><a name="line.197"></a>
+<span class="sourceLineNo">198</span>    Boolean bypassGlobals = this.bypassGlobals;<a name="line.198"></a>
+<span class="sourceLineNo">199</span>    if (other instanceof QuotaGlobalsSettingsBypass) {<a name="line.199"></a>
+<span class="sourceLineNo">200</span>      bypassGlobals = ((QuotaGlobalsSettingsBypass) other).getBypass();<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    }<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span>    if (throttleBuilder == null &amp;&amp;<a name="line.203"></a>
+<span class="sourceLineNo">204</span>        (spaceBuilder == null || (spaceBuilder.hasRemove() &amp;&amp; spaceBuilder.getRemove()))<a name="line.204"></a>
+<span class="sourceLineNo">205</span>        &amp;&amp; bypassGlobals == null) {<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      return null;<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    }<a name="line.207"></a>
+<span class="sourceLineNo">208</span><a name="line.208"></a>
+<span class="sourceLineNo">209</span>    return new GlobalQuotaSettingsImpl(<a name="line.209"></a>
+<span class="sourceLineNo">210</span>        getUserName(), getTableName(), getNamespace(),<a name="line.210"></a>
+<span class="sourceLineNo">211</span>        (throttleBuilder == null ? null : throttleBuilder.build()), bypassGlobals,<a name="line.211"></a>
+<span class="sourceLineNo">212</span>        (spaceBuilder == null ? null : spaceBuilder.build()));<a name="line.212"></a>
+<span class="sourceLineNo">213</span>  }<a name="line.213"></a>
+<span class="sourceLineNo">214</span><a name="line.214"></a>
+<span class="sourceLineNo">215</span>  private void validateTimedQuota(final TimedQuota timedQuota) throws IOException {<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    if (timedQuota.getSoftLimit() &lt; 1) {<a name="line.216"></a>
+<span class="sourceLineNo">217</span>      throw new DoNotRetryIOException(new UnsupportedOperationException(<a name="line.217"></a>
+<span class="sourceLineNo">218</span>          "The throttle limit must be greater then 0, got " + timedQuota.getSoftLimit()));<a name="line.218"></a>
+<span class="sourceLineNo">219</span>    }<a name="line.219"></a>
+<span class="sourceLineNo">220</span>  }<a name="line.220"></a>
+<span class="sourceLineNo">221</span><a name="line.221"></a>
+<span class="sourceLineNo">222</span>  @Override<a name="line.222"></a>
+<span class="sourceLineNo">223</span>  public String toString() {<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    StringBuilder builder = new StringBuilder();<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    builder.append("GlobalQuota: ");<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    if (throttleProto != null) {<a name="line.226"></a>
+<span class="sourceLineNo">227</span>      Map&lt;ThrottleType,TimedQuota&gt; throttleQuotas = buildThrottleQuotas(throttleProto);<a name="line.227"></a>
+<span class="sourceLineNo">228</span>      builder.append(" { TYPE =&gt; THROTTLE ");<a name="line.228"></a>
+<span class="sourceLineNo">229</span>      for (Entry&lt;ThrottleType,TimedQuota&gt; entry : throttleQuotas.entrySet()) {<a name="line.229"></a>
+<span class="sourceLineNo">230</span>        final ThrottleType type = entry.getKey();<a name="line.230"></a>
+<span class="sourceLineNo">231</span>        final TimedQuota timedQuota = entry.getValue();<a name="line.231"></a>
+<span class="sourceLineNo">232</span>        builder.append("{THROTTLE_TYPE =&gt; ").append(type.name()).append(", LIMIT =&gt; ");<a name="line.232"></a>
+<span class="sourceLineNo">233</span>        if (timedQuota.hasSoftLimit()) {<a name="line.233"></a>
+<span class="sourceLineNo">234</span>          switch (type) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span>            case REQUEST_NUMBER:<a name="line.235"></a>
+<span class="sourceLineNo">236</span>            case WRITE_NUMBER:<a name="line.236"></a>
+<span class="sourceLineNo">237</span>            case READ_NUMBER:<a name="line.237"></a>
+<span class="sourceLineNo">238</span>              builder.append(String.format("%dreq", timedQuota.getSoftLimit()));<a name="line.238"></a>
+<span class="sourceLineNo">239</span>              break;<a name="line.239"></a>
+<span class="sourceLineNo">240</span>            case REQUEST_SIZE:<a name="line.240"></a>
+<span class="sourceLineNo">241</span>            case WRITE_SIZE:<a name="line.241"></a>
+<span class="sourceLineNo">242</span>            case READ_SIZE:<a name="line.242"></a>
+<span class="sourceLineNo">243</span>              builder.append(sizeToString(timedQuota.getSoftLimit()));<a name="line.243"></a>
+<span class="sourceLineNo">244</span>              break;<a name="line.244"></a>
+<span class="sourceLineNo">245</span>            case REQUEST_CAPACITY_UNIT:<a name="line.245"></a>
+<span class="sourceLineNo">246</span>            case READ_CAPACITY_UNIT:<a name="line.246"></a>
+<span class="sourceLineNo">247</span>            case WRITE_CAPACITY_UNIT:<a name="line.247"></a>
+<span class="sourceLineNo">248</span>              builder.append(String.format("%dCU", timedQuota.getSoftLimit()));<a name="line.248"></a>
+<span class="sourceLineNo">249</span>            default:<a name="line.249"></a>
+<span class="sourceLineNo">250</span>          }<a name="line.250"></a>
+<span class="sourceLineNo">251</span>        } else if (timedQuota.hasShare()) {<a name="line.251"></a>
+<span class="sourceLineNo">252</span>          builder.append(String.format("%.2f%%", timedQuota.getShare()));<a name="line.252"></a>
+<span class="sourceLineNo">253</span>        }<a name="line.253"></a>
+<span class="sourceLineNo">254</span>        builder.append('/');<a name="line.254"></a>
+<span class="sourceLineNo">255</span>        builder.append(timeToString(ProtobufUtil.toTimeUnit(timedQuota.getTimeUnit())));<a name="line.255"></a>
+<span class="sourceLineNo">256</span>        if (timedQuota.hasScope()) {<a name="line.256"></a>
+<span class="sourceLineNo">257</span>          builder.append(", SCOPE =&gt; ");<a name="line.257"></a>
+<span class="sourceLineNo">258</span>          builder.append(timedQuota.getScope().toString());<a name="line.258"></a>
+<span class="sourceLineNo">259</span>        }<a name="line.259"></a>
 <span class="sourceLineNo">260</span>      }<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      if (spaceProto.getRemove()) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span>        builder.append(", REMOVE =&gt; ").append(spaceProto.getRemove());<a name="line.262"></a>
-<span class="sourceLineNo">263</span>      } else {<a name="line.263"></a>
-<span class="sourceLineNo">264</span>        builder.append(", LIMIT =&gt; ").append(spaceProto.getSoftLimit());<a name="line.264"></a>
-<span class="sourceLineNo">265</span>        builder.append(", VIOLATION_POLICY =&gt; ").append(spaceProto.getViolationPolicy());<a name="line.265"></a>
-<span class="sourceLineNo">266</span>      }<a name="line.266"></a>
-<span class="sourceLineNo">267</span>      builder.append(" } ");<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    }<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    return builder.toString();<a name="line.269"></a>
-<span class="sourceLineNo">270</span>  }<a name="line.270"></a>
-<span class="sourceLineNo">271</span><a name="line.271"></a>
-<span class="sourceLineNo">272</span>  private Map&lt;ThrottleType,TimedQuota&gt; buildThrottleQuotas(Throttle proto) {<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    HashMap&lt;ThrottleType,TimedQuota&gt; quotas = new HashMap&lt;&gt;();<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    if (proto.hasReadNum()) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>      quotas.put(ThrottleType.READ_NUMBER, proto.getReadNum());<a name="line.275"></a>
-<span class="sourceLineNo">276</span>    }<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    if (proto.hasReadSize()) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span>      quotas.put(ThrottleType.READ_SIZE, proto.getReadSize());<a name="line.278"></a>
-<span class="sourceLineNo">279</span>    }<a name="line.279"></a>
-<span class="sourceLineNo">280</span>    if (proto.hasReqNum()) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      quotas.put(ThrottleType.REQUEST_NUMBER, proto.getReqNum());<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    }<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    if (proto.hasReqSize()) {<a name="line.283"></a>
-<span class="sourceLineNo">284</span>      quotas.put(ThrottleType.REQUEST_SIZE, proto.getReqSize());<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    }<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    if (proto.hasWriteNum()) {<a name="line.286"></a>
-<span class="sourceLineNo">287</span>      quotas.put(ThrottleType.WRITE_NUMBER, proto.getWriteNum());<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    }<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    if (proto.hasWriteSize()) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      quotas.put(ThrottleType.WRITE_SIZE, proto.getWriteSize());<a name="line.290"></a>
+<span class="sourceLineNo">261</span>      builder.append( "} } ");<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    } else {<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      builder.append(" {} ");<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    }<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    if (bypassGlobals != null) {<a name="line.265"></a>
+<span class="sourceLineNo">266</span>      builder.append(" { GLOBAL_BYPASS =&gt; " + bypassGlobals + " } ");<a name="line.266"></a>
+<span class="sourceLineNo">267</span>    }<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    if (spaceProto != null) {<a name="line.268"></a>
+<span class="sourceLineNo">269</span>      builder.append(" { TYPE =&gt; SPACE");<a name="line.269"></a>
+<span class="sourceLineNo">270</span>      if (getTableName() != null) {<a name="line.270"></a>
+<span class="sourceLineNo">271</span>        builder.append(", TABLE =&gt; ").append(getTableName());<a name="line.271"></a>
+<span class="sourceLineNo">272</span>      }<a name="line.272"></a>
+<span class="sourceLineNo">273</span>      if (getNamespace() != null) {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>        builder.append(", NAMESPACE =&gt; ").append(getNamespace());<a name="line.274"></a>
+<span class="sourceLineNo">275</span>      }<a name="line.275"></a>
+<span class="sourceLineNo">276</span>      if (spaceProto.getRemove()) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>        builder.append(", REMOVE =&gt; ").append(spaceProto.getRemove());<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      } else {<a name="line.278"></a>
+<span class="sourceLineNo">279</span>        builder.append(", LIMIT =&gt; ").append(spaceProto.getSoftLimit());<a name="line.279"></a>
+<span class="sourceLineNo">280</span>        builder.append(", VIOLATION_POLICY =&gt; ").append(spaceProto.getViolationPolicy());<a name="line.280"></a>
+<span class="sourceLineNo">281</span>      }<a name="line.281"></a>
+<span class="sourceLineNo">282</span>      builder.append(" } ");<a name="line.282"></a>
+<span class="sourceLineNo">283</span>    }<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    return builder.toString();<a name="line.284"></a>
+<span class="sourceLineNo">285</span>  }<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
+<span class="sourceLineNo">287</span>  private Map&lt;ThrottleType,TimedQuota&gt; buildThrottleQuotas(Throttle proto) {<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    HashMap&lt;ThrottleType,TimedQuota&gt; quotas = new HashMap&lt;&gt;();<a name="line.288"></a>
+<span class="sourceLineNo">289</span>    if (proto.hasReadNum()) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span>      quotas.put(ThrottleType.READ_NUMBER, proto.getReadNum());<a name="line.290"></a>
 <span class="sourceLineNo">291</span>    }<a name="line.291"></a>
-<span class="sourceLineNo">292</span>    return quotas;<a name="line.292"></a>
-<span class="sourceLineNo">293</span>  }<a name="line.293"></a>
-<span class="sourceLineNo">294</span><a name="line.294"></a>
-<span class="sourceLineNo">295</span>  private void clearThrottleBuilder(QuotaProtos.Throttle.Builder builder) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span>    builder.clearReadNum();<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    builder.clearReadSize();<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    builder.clearReqNum();<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    builder.clearReqSize();<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    builder.clearWriteNum();<a name="line.300"></a>
-<span class="sourceLineNo">301</span>    builder.clearWriteSize();<a name="line.301"></a>
-<span class="sourceLineNo">302</span>  }<a name="line.302"></a>
-<span class="sourceLineNo">303</span>}<a name="line.303"></a>
+<span class="sourceLineNo">292</span>    if (proto.hasReadSize()) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>      quotas.put(ThrottleType.READ_SIZE, proto.getReadSize());<a name="line.293"></a>
+<span class="sourceLineNo">294</span>    }<a name="line.294"></a>
+<span class="sourceLineNo">295</span>    if (proto.hasReqNum()) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      quotas.put(ThrottleType.REQUEST_NUMBER, proto.getReqNum());<a name="line.296"></a>
+<span class="sourceLineNo">297</span>    }<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    if (proto.hasReqSize()) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span>      quotas.put(ThrottleType.REQUEST_SIZE, proto.getReqSize());<a name="line.299"></a>
+<span class="sourceLineNo">300</span>    }<a name="line.300"></a>
+<span class="sourceLineNo">301</span>    if (proto.hasWriteNum()) {<a name="line.301"></a>
+<span class="sourceLineNo">302</span>      quotas.put(ThrottleType.WRITE_NUMBER, proto.getWriteNum());<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    }<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    if (proto.hasWriteSize()) {<a name="line.304"></a>
+<span class="sourceLineNo">305</span>      quotas.put(ThrottleType.WRITE_SIZE, proto.getWriteSize());<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    }<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    if (proto.hasReqCapacityUnit()) {<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      quotas.put(ThrottleType.REQUEST_CAPACITY_UNIT, proto.getReqCapacityUnit());<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    }<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    if (proto.hasReadCapacityUnit()) {<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      quotas.put(ThrottleType.READ_CAPACITY_UNIT, proto.getReqCapacityUnit());<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    }<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    if (proto.hasWriteCapacityUnit()) {<a name="line.313"></a>
+<span class="sourceLineNo">314</span>      quotas.put(ThrottleType.WRITE_CAPACITY_UNIT, proto.getWriteCapacityUnit());<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    }<a name="line.315"></a>
+<span class="sourceLineNo">316</span>    return quotas;<a name="line.316"></a>
+<span class="sourceLineNo">317</span>  }<a name="line.317"></a>
+<span class="sourceLineNo">318</span><a name="line.318"></a>
+<span class="sourceLineNo">319</span>  private void clearThrottleBuilder(QuotaProtos.Throttle.Builder builder) {<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    builder.clearReadNum();<a name="line.320"></a>
+<span class="sourceLineNo">321</span>    builder.clearReadSize();<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    builder.clearReqNum();<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    builder.clearReqSize();<a name="line.323"></a>
+<span class="sourceLineNo">324</span>    builder.clearWriteNum();<a name="line.324"></a>
+<span class="sourceLineNo">325</span>    builder.clearWriteSize();<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    builder.clearReadCapacityUnit();<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    builder.clearReadCapacityUnit();<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    builder.clearWriteCapacityUnit();<a name="line.328"></a>
+<span class="sourceLineNo">329</span>  }<a name="line.329"></a>
+<span class="sourceLineNo">330</span>}<a name="line.330"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/de8c44eb/devapidocs/src-html/org/apache/hadoop/hbase/quotas/NoopQuotaLimiter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/NoopQuotaLimiter.html b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/NoopQuotaLimiter.html
index b110a2c..b4ae98c 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/NoopQuotaLimiter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/NoopQuotaLimiter.html
@@ -28,65 +28,66 @@
 <span class="sourceLineNo">020</span><a name="line.20"></a>
 <span class="sourceLineNo">021</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.21"></a>
 <span class="sourceLineNo">022</span>import org.apache.yetus.audience.InterfaceStability;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.quotas.OperationQuota.OperationType;<a name="line.23"></a>
-<span class="sourceLineNo">024</span><a name="line.24"></a>
-<span class="sourceLineNo">025</span>/**<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * Noop quota limiter returned when no limiter is associated to the user/table<a name="line.26"></a>
-<span class="sourceLineNo">027</span> */<a name="line.27"></a>
-<span class="sourceLineNo">028</span>@InterfaceAudience.Private<a name="line.28"></a>
-<span class="sourceLineNo">029</span>@InterfaceStability.Evolving<a name="line.29"></a>
-<span class="sourceLineNo">030</span>class NoopQuotaLimiter implements QuotaLimiter {<a name="line.30"></a>
-<span class="sourceLineNo">031</span>  private static QuotaLimiter instance = new NoopQuotaLimiter();<a name="line.31"></a>
-<span class="sourceLineNo">032</span><a name="line.32"></a>
-<span class="sourceLineNo">033</span>  private NoopQuotaLimiter() {<a name="line.33"></a>
-<span class="sourceLineNo">034</span>    // no-op<a name="line.34"></a>
-<span class="sourceLineNo">035</span>  }<a name="line.35"></a>
-<span class="sourceLineNo">036</span><a name="line.36"></a>
-<span class="sourceLineNo">037</span>  @Override<a name="line.37"></a>
-<span class="sourceLineNo">038</span>  public void checkQuota(long writeReqs, long estimateWriteSize, long readReqs,<a name="line.38"></a>
-<span class="sourceLineNo">039</span>      long estimateReadSize) throws RpcThrottlingException {<a name="line.39"></a>
+<span class="sourceLineNo">023</span><a name="line.23"></a>
+<span class="sourceLineNo">024</span>/**<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * Noop quota limiter returned when no limiter is associated to the user/table<a name="line.25"></a>
+<span class="sourceLineNo">026</span> */<a name="line.26"></a>
+<span class="sourceLineNo">027</span>@InterfaceAudience.Private<a name="line.27"></a>
+<span class="sourceLineNo">028</span>@InterfaceStability.Evolving<a name="line.28"></a>
+<span class="sourceLineNo">029</span>class NoopQuotaLimiter implements QuotaLimiter {<a name="line.29"></a>
+<span class="sourceLineNo">030</span>  private static QuotaLimiter instance = new NoopQuotaLimiter();<a name="line.30"></a>
+<span class="sourceLineNo">031</span><a name="line.31"></a>
+<span class="sourceLineNo">032</span>  private NoopQuotaLimiter() {<a name="line.32"></a>
+<span class="sourceLineNo">033</span>    // no-op<a name="line.33"></a>
+<span class="sourceLineNo">034</span>  }<a name="line.34"></a>
+<span class="sourceLineNo">035</span><a name="line.35"></a>
+<span class="sourceLineNo">036</span>  @Override<a name="line.36"></a>
+<span class="sourceLineNo">037</span>  public void checkQuota(long writeReqs, long estimateWriteSize, long readReqs,<a name="line.37"></a>
+<span class="sourceLineNo">038</span>      long estimateReadSize, long estimateWriteCapacityUnit, long estimateReadCapacityUnit)<a name="line.38"></a>
+<span class="sourceLineNo">039</span>      throws RpcThrottlingException {<a name="line.39"></a>
 <span class="sourceLineNo">040</span>    // no-op<a name="line.40"></a>
 <span class="sourceLineNo">041</span>  }<a name="line.41"></a>
 <span class="sourceLineNo">042</span><a name="line.42"></a>
 <span class="sourceLineNo">043</span>  @Override<a name="line.43"></a>
-<span class="sourceLineNo">044</span>  public void grabQuota(long writeReqs, long writeSize, long readReqs, long readSize) {<a name="line.44"></a>
-<span class="sourceLineNo">045</span>    // no-op<a name="line.45"></a>
-<span class="sourceLineNo">046</span>  }<a name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>  @Override<a name="line.48"></a>
-<span class="sourceLineNo">049</span>  public void consumeWrite(final long size) {<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    // no-op<a name="line.50"></a>
-<span class="sourceLineNo">051</span>  }<a name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span>  @Override<a name="line.53"></a>
-<span class="sourceLineNo">054</span>  public void consumeRead(final long size) {<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    // no-op<a name="line.55"></a>
-<span class="sourceLineNo">056</span>  }<a name="line.56"></a>
-<span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>  @Override<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  public boolean isBypass() {<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    return true;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>  }<a name="line.61"></a>
-<span class="sourceLineNo">062</span><a name="line.62"></a>
-<span class="sourceLineNo">063</span>  @Override<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  public long getWriteAvailable() {<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    throw new UnsupportedOperationException();<a name="line.65"></a>
-<span class="sourceLineNo">066</span>  }<a name="line.66"></a>
-<span class="sourceLineNo">067</span><a name="line.67"></a>
-<span class="sourceLineNo">068</span>  @Override<a name="line.68"></a>
-<span class="sourceLineNo">069</span>  public long getReadAvailable() {<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    throw new UnsupportedOperationException();<a name="line.70"></a>
-<span class="sourceLineNo">071</span>  }<a name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span>  @Override<a name="line.73"></a>
-<span class="sourceLineNo">074</span>  public String toString() {<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    return "NoopQuotaLimiter";<a name="line.75"></a>
-<span class="sourceLineNo">076</span>  }<a name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span>  public static QuotaLimiter get() {<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    return instance;<a name="line.79"></a>
-<span class="sourceLineNo">080</span>  }<a name="line.80"></a>
-<span class="sourceLineNo">081</span>}<a name="line.81"></a>
+<span class="sourceLineNo">044</span>  public void grabQuota(long writeReqs, long writeSize, long readReqs, long readSize,<a name="line.44"></a>
+<span class="sourceLineNo">045</span>      long writeCapacityUnit, long readCapacityUnit) {<a name="line.45"></a>
+<span class="sourceLineNo">046</span>    // no-op<a name="line.46"></a>
+<span class="sourceLineNo">047</span>  }<a name="line.47"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span>  @Override<a name="line.49"></a>
+<span class="sourceLineNo">050</span>  public void consumeWrite(final long size, long capacityUnit) {<a name="line.50"></a>
+<span class="sourceLineNo">051</span>    // no-op<a name="line.51"></a>
+<span class="sourceLineNo">052</span>  }<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span>  @Override<a name="line.54"></a>
+<span class="sourceLineNo">055</span>  public void consumeRead(final long size, long capacityUnit) {<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    // no-op<a name="line.56"></a>
+<span class="sourceLineNo">057</span>  }<a name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span>  @Override<a name="line.59"></a>
+<span class="sourceLineNo">060</span>  public boolean isBypass() {<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    return true;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>  }<a name="line.62"></a>
+<span class="sourceLineNo">063</span><a name="line.63"></a>
+<span class="sourceLineNo">064</span>  @Override<a name="line.64"></a>
+<span class="sourceLineNo">065</span>  public long getWriteAvailable() {<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    throw new UnsupportedOperationException();<a name="line.66"></a>
+<span class="sourceLineNo">067</span>  }<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span>  @Override<a name="line.69"></a>
+<span class="sourceLineNo">070</span>  public long getReadAvailable() {<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    throw new UnsupportedOperationException();<a name="line.71"></a>
+<span class="sourceLineNo">072</span>  }<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span>  @Override<a name="line.74"></a>
+<span class="sourceLineNo">075</span>  public String toString() {<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    return "NoopQuotaLimiter";<a name="line.76"></a>
+<span class="sourceLineNo">077</span>  }<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span>  public static QuotaLimiter get() {<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    return instance;<a name="line.80"></a>
+<span class="sourceLineNo">081</span>  }<a name="line.81"></a>
+<span class="sourceLineNo">082</span>}<a name="line.82"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/de8c44eb/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaLimiter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaLimiter.html b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaLimiter.html
index ee8178a..878091b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaLimiter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaLimiter.html
@@ -28,59 +28,65 @@
 <span class="sourceLineNo">020</span><a name="line.20"></a>
 <span class="sourceLineNo">021</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.21"></a>
 <span class="sourceLineNo">022</span>import org.apache.yetus.audience.InterfaceStability;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.quotas.OperationQuota.OperationType;<a name="line.23"></a>
-<span class="sourceLineNo">024</span><a name="line.24"></a>
-<span class="sourceLineNo">025</span>/**<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * Internal interface used to interact with the user/table quota.<a name="line.26"></a>
-<span class="sourceLineNo">027</span> */<a name="line.27"></a>
-<span class="sourceLineNo">028</span>@InterfaceAudience.Private<a name="line.28"></a>
-<span class="sourceLineNo">029</span>@InterfaceStability.Evolving<a name="line.29"></a>
-<span class="sourceLineNo">030</span>public interface QuotaLimiter {<a name="line.30"></a>
-<span class="sourceLineNo">031</span>  /**<a name="line.31"></a>
-<span class="sourceLineNo">032</span>   * Checks if it is possible to execute the specified operation.<a name="line.32"></a>
-<span class="sourceLineNo">033</span>   *<a name="line.33"></a>
-<span class="sourceLineNo">034</span>   * @param writeReqs the write requests that will be checked against the available quota<a name="line.34"></a>
-<span class="sourceLineNo">035</span>   * @param estimateWriteSize the write size that will be checked against the available quota<a name="line.35"></a>
-<span class="sourceLineNo">036</span>   * @param readReqs the read requests that will be checked against the available quota<a name="line.36"></a>
-<span class="sourceLineNo">037</span>   * @param estimateReadSize the read size that will be checked against the available quota<a name="line.37"></a>
-<span class="sourceLineNo">038</span>   * @throws RpcThrottlingException thrown if not enough available resources to perform operation.<a name="line.38"></a>
-<span class="sourceLineNo">039</span>   */<a name="line.39"></a>
-<span class="sourceLineNo">040</span>  void checkQuota(long writeReqs, long estimateWriteSize, long readReqs, long estimateReadSize)<a name="line.40"></a>
-<span class="sourceLineNo">041</span>      throws RpcThrottlingException;<a name="line.41"></a>
-<span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span>  /**<a name="line.43"></a>
-<span class="sourceLineNo">044</span>   * Removes the specified write and read amount from the quota.<a name="line.44"></a>
-<span class="sourceLineNo">045</span>   * At this point the write and read amount will be an estimate,<a name="line.45"></a>
-<span class="sourceLineNo">046</span>   * that will be later adjusted with a consumeWrite()/consumeRead() call.<a name="line.46"></a>
-<span class="sourceLineNo">047</span>   *<a name="line.47"></a>
-<span class="sourceLineNo">048</span>   * @param writeReqs the write requests that will be removed from the current quota<a name="line.48"></a>
-<span class="sourceLineNo">049</span>   * @param writeSize the write size that will be removed from the current quota<a name="line.49"></a>
-<span class="sourceLineNo">050</span>   * @param readReqs the read requests that will be removed from the current quota<a name="line.50"></a>
-<span class="sourceLineNo">051</span>   * @param readSize the read size that will be removed from the current quota<a name="line.51"></a>
-<span class="sourceLineNo">052</span>   */<a name="line.52"></a>
-<span class="sourceLineNo">053</span>  void grabQuota(long writeReqs, long writeSize, long readReqs, long readSize);<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span>  /**<a name="line.55"></a>
-<span class="sourceLineNo">056</span>   * Removes or add back some write amount to the quota.<a name="line.56"></a>
-<span class="sourceLineNo">057</span>   * (called at the end of an operation in case the estimate quota was off)<a name="line.57"></a>
-<span class="sourceLineNo">058</span>   */<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  void consumeWrite(long size);<a name="line.59"></a>
+<span class="sourceLineNo">023</span><a name="line.23"></a>
+<span class="sourceLineNo">024</span>/**<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * Internal interface used to interact with the user/table quota.<a name="line.25"></a>
+<span class="sourceLineNo">026</span> */<a name="line.26"></a>
+<span class="sourceLineNo">027</span>@InterfaceAudience.Private<a name="line.27"></a>
+<span class="sourceLineNo">028</span>@InterfaceStability.Evolving<a name="line.28"></a>
+<span class="sourceLineNo">029</span>public interface QuotaLimiter {<a name="line.29"></a>
+<span class="sourceLineNo">030</span>  /**<a name="line.30"></a>
+<span class="sourceLineNo">031</span>   * Checks if it is possible to execute the specified operation.<a name="line.31"></a>
+<span class="sourceLineNo">032</span>   *<a name="line.32"></a>
+<span class="sourceLineNo">033</span>   * @param writeReqs the write requests that will be checked against the available quota<a name="line.33"></a>
+<span class="sourceLineNo">034</span>   * @param estimateWriteSize the write size that will be checked against the available quota<a name="line.34"></a>
+<span class="sourceLineNo">035</span>   * @param readReqs the read requests that will be checked against the available quota<a name="line.35"></a>
+<span class="sourceLineNo">036</span>   * @param estimateReadSize the read size that will be checked against the available quota<a name="line.36"></a>
+<span class="sourceLineNo">037</span>   * @param estimateWriteCapacityUnit the write capacity unit that will be checked against the<a name="line.37"></a>
+<span class="sourceLineNo">038</span>   *          available quota<a name="line.38"></a>
+<span class="sourceLineNo">039</span>   * @param estimateReadCapacityUnit the read capacity unit that will be checked against the<a name="line.39"></a>
+<span class="sourceLineNo">040</span>   *          available quota<a name="line.40"></a>
+<span class="sourceLineNo">041</span>   * @throws RpcThrottlingException thrown if not enough available resources to perform operation.<a name="line.41"></a>
+<span class="sourceLineNo">042</span>   */<a name="line.42"></a>
+<span class="sourceLineNo">043</span>  void checkQuota(long writeReqs, long estimateWriteSize, long readReqs, long estimateReadSize,<a name="line.43"></a>
+<span class="sourceLineNo">044</span>      long estimateWriteCapacityUnit, long estimateReadCapacityUnit) throws RpcThrottlingException;<a name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span>  /**<a name="line.46"></a>
+<span class="sourceLineNo">047</span>   * Removes the specified write and read amount from the quota.<a name="line.47"></a>
+<span class="sourceLineNo">048</span>   * At this point the write and read amount will be an estimate,<a name="line.48"></a>
+<span class="sourceLineNo">049</span>   * that will be later adjusted with a consumeWrite()/consumeRead() call.<a name="line.49"></a>
+<span class="sourceLineNo">050</span>   *<a name="line.50"></a>
+<span class="sourceLineNo">051</span>   * @param writeReqs the write requests that will be removed from the current quota<a name="line.51"></a>
+<span class="sourceLineNo">052</span>   * @param writeSize the write size that will be removed from the current quota<a name="line.52"></a>
+<span class="sourceLineNo">053</span>   * @param readReqs the read requests that will be removed from the current quota<a name="line.53"></a>
+<span class="sourceLineNo">054</span>   * @param readSize the read size that will be removed from the current quota<a name="line.54"></a>
+<span class="sourceLineNo">055</span>   * @param writeCapacityUnit the write capacity unit that will be removed from the current quota<a name="line.55"></a>
+<span class="sourceLineNo">056</span>   * @param readCapacityUnit the read capacity unit num that will be removed from the current quota<a name="line.56"></a>
+<span class="sourceLineNo">057</span>   */<a name="line.57"></a>
+<span class="sourceLineNo">058</span>  void grabQuota(long writeReqs, long writeSize, long readReqs, long readSize,<a name="line.58"></a>
+<span class="sourceLineNo">059</span>      long writeCapacityUnit, long readCapacityUnit);<a name="line.59"></a>
 <span class="sourceLineNo">060</span><a name="line.60"></a>
 <span class="sourceLineNo">061</span>  /**<a name="line.61"></a>
-<span class="sourceLineNo">062</span>   * Removes or add back some read amount to the quota.<a name="line.62"></a>
+<span class="sourceLineNo">062</span>   * Removes or add back some write amount to the quota.<a name="line.62"></a>
 <span class="sourceLineNo">063</span>   * (called at the end of an operation in case the estimate quota was off)<a name="line.63"></a>
 <span class="sourceLineNo">064</span>   */<a name="line.64"></a>
-<span class="sourceLineNo">065</span>  void consumeRead(long size);<a name="line.65"></a>
+<span class="sourceLineNo">065</span>  void consumeWrite(long size, long capacityUnit);<a name="line.65"></a>
 <span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span>  /** @return true if the limiter is a noop */<a name="line.67"></a>
-<span class="sourceLineNo">068</span>  boolean isBypass();<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>    /** @return the number of bytes available to read to avoid exceeding the quota */<a name="line.70"></a>
-<span class="sourceLineNo">071</span>  long getReadAvailable();<a name="line.71"></a>
+<span class="sourceLineNo">067</span>  /**<a name="line.67"></a>
+<span class="sourceLineNo">068</span>   * Removes or add back some read amount to the quota.<a name="line.68"></a>
+<span class="sourceLineNo">069</span>   * (called at the end of an operation in case the estimate quota was off)<a name="line.69"></a>
+<span class="sourceLineNo">070</span>   */<a name="line.70"></a>
+<span class="sourceLineNo">071</span>  void consumeRead(long size, long capacityUnit);<a name="line.71"></a>
 <span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span>  /** @return the number of bytes available to write to avoid exceeding the quota */<a name="line.73"></a>
-<span class="sourceLineNo">074</span>  long getWriteAvailable();<a name="line.74"></a>
-<span class="sourceLineNo">075</span>}<a name="line.75"></a>
+<span class="sourceLineNo">073</span>  /** @return true if the limiter is a noop */<a name="line.73"></a>
+<span class="sourceLineNo">074</span>  boolean isBypass();<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span>    /** @return the number of bytes available to read to avoid exceeding the quota */<a name="line.76"></a>
+<span class="sourceLineNo">077</span>  long getReadAvailable();<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span>  /** @return the number of bytes available to write to avoid exceeding the quota */<a name="line.79"></a>
+<span class="sourceLineNo">080</span>  long getWriteAvailable();<a name="line.80"></a>
+<span class="sourceLineNo">081</span>}<a name="line.81"></a>