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/05/24 14:48:47 UTC
[27/51] [partial] hbase-site git commit: Published site at
f3d1c021de2264301f68eadb9ef126ff83d7ef53.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/883dde2f/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.PrepareFlushResult.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.PrepareFlushResult.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.PrepareFlushResult.html
index 7d27402..3da432b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.PrepareFlushResult.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.PrepareFlushResult.html
@@ -2560,8 +2560,8 @@
<span class="sourceLineNo">2552</span> }<a name="line.2552"></a>
<span class="sourceLineNo">2553</span> MemStoreSize mss = this.memStoreSizing.getMemStoreSize();<a name="line.2553"></a>
<span class="sourceLineNo">2554</span> LOG.info("Flushing " + + storesToFlush.size() + "/" + stores.size() + " column families," +<a name="line.2554"></a>
-<span class="sourceLineNo">2555</span> " memstore data size=" + StringUtils.byteDesc(mss.getDataSize()) +<a name="line.2555"></a>
-<span class="sourceLineNo">2556</span> " memstore heap size=" + StringUtils.byteDesc(mss.getHeapSize()) +<a name="line.2556"></a>
+<span class="sourceLineNo">2555</span> " dataSize=" + StringUtils.byteDesc(mss.getDataSize()) +<a name="line.2555"></a>
+<span class="sourceLineNo">2556</span> " heapSize=" + StringUtils.byteDesc(mss.getHeapSize()) +<a name="line.2556"></a>
<span class="sourceLineNo">2557</span> ((perCfExtras != null && perCfExtras.length() > 0)? perCfExtras.toString(): "") +<a name="line.2557"></a>
<span class="sourceLineNo">2558</span> ((wal != null) ? "" : "; WAL is null, using passed sequenceid=" + sequenceId));<a name="line.2558"></a>
<span class="sourceLineNo">2559</span> }<a name="line.2559"></a>
@@ -2761,10 +2761,10 @@
<span class="sourceLineNo">2753</span> long time = EnvironmentEdgeManager.currentTime() - startTime;<a name="line.2753"></a>
<span class="sourceLineNo">2754</span> MemStoreSize mss = prepareResult.totalFlushableSize.getMemStoreSize();<a name="line.2754"></a>
<span class="sourceLineNo">2755</span> long memstoresize = this.memStoreSizing.getMemStoreSize().getDataSize();<a name="line.2755"></a>
-<span class="sourceLineNo">2756</span> String msg = "Finished memstore flush;"<a name="line.2756"></a>
-<span class="sourceLineNo">2757</span> + " data size ~" + StringUtils.byteDesc(mss.getDataSize()) + "/" + mss.getDataSize()<a name="line.2757"></a>
-<span class="sourceLineNo">2758</span> + ", heap size ~" + StringUtils.byteDesc(mss.getHeapSize()) + "/" + mss.getHeapSize()<a name="line.2758"></a>
-<span class="sourceLineNo">2759</span> + ", currentsize=" + StringUtils.byteDesc(memstoresize) + "/" + memstoresize<a name="line.2759"></a>
+<span class="sourceLineNo">2756</span> String msg = "Finished flush of"<a name="line.2756"></a>
+<span class="sourceLineNo">2757</span> + " dataSize ~" + StringUtils.byteDesc(mss.getDataSize()) + "/" + mss.getDataSize()<a name="line.2757"></a>
+<span class="sourceLineNo">2758</span> + ", heapSize ~" + StringUtils.byteDesc(mss.getHeapSize()) + "/" + mss.getHeapSize()<a name="line.2758"></a>
+<span class="sourceLineNo">2759</span> + ", currentSize=" + StringUtils.byteDesc(memstoresize) + "/" + memstoresize<a name="line.2759"></a>
<span class="sourceLineNo">2760</span> + " for " + this.getRegionInfo().getEncodedName() + " in " + time + "ms, sequenceid="<a name="line.2760"></a>
<span class="sourceLineNo">2761</span> + flushOpSeqId + ", compaction requested=" + compactionRequested<a name="line.2761"></a>
<span class="sourceLineNo">2762</span> + ((wal == null) ? "; wal=null" : "");<a name="line.2762"></a>
@@ -4244,7 +4244,7 @@
<span class="sourceLineNo">4236</span> * @param cellItr<a name="line.4236"></a>
<span class="sourceLineNo">4237</span> * @param now<a name="line.4237"></a>
<span class="sourceLineNo">4238</span> */<a name="line.4238"></a>
-<span class="sourceLineNo">4239</span> public void updateCellTimestamps(final Iterable<List<Cell>> cellItr, final byte[] now)<a name="line.4239"></a>
+<span class="sourceLineNo">4239</span> private static void updateCellTimestamps(final Iterable<List<Cell>> cellItr, final byte[] now)<a name="line.4239"></a>
<span class="sourceLineNo">4240</span> throws IOException {<a name="line.4240"></a>
<span class="sourceLineNo">4241</span> for (List<Cell> cells: cellItr) {<a name="line.4241"></a>
<span class="sourceLineNo">4242</span> if (cells == null) continue;<a name="line.4242"></a>
@@ -4299,12 +4299,12 @@
<span class="sourceLineNo">4291</span> requestFlush();<a name="line.4291"></a>
<span class="sourceLineNo">4292</span> // Don't print current limit because it will vary too much. The message is used as a key<a name="line.4292"></a>
<span class="sourceLineNo">4293</span> // over in RetriesExhaustedWithDetailsException processing.<a name="line.4293"></a>
-<span class="sourceLineNo">4294</span> throw new RegionTooBusyException("Over memstore limit; regionName=" +<a name="line.4294"></a>
-<span class="sourceLineNo">4295</span> (this.getRegionInfo() == null? "unknown": this.getRegionInfo().getEncodedName()) +<a name="line.4295"></a>
-<span class="sourceLineNo">4296</span> ", server=" + (this.getRegionServerServices() == null ? "unknown":<a name="line.4296"></a>
-<span class="sourceLineNo">4297</span> this.getRegionServerServices().getServerName()) +<a name="line.4297"></a>
-<span class="sourceLineNo">4298</span> ", blockingMemStoreSize=" +<a name="line.4298"></a>
-<span class="sourceLineNo">4299</span> org.apache.hadoop.hbase.procedure2.util.StringUtils.humanSize(blockingMemStoreSize));<a name="line.4299"></a>
+<span class="sourceLineNo">4294</span> throw new RegionTooBusyException("Over memstore limit=" +<a name="line.4294"></a>
+<span class="sourceLineNo">4295</span> org.apache.hadoop.hbase.procedure2.util.StringUtils.humanSize(this.blockingMemStoreSize) +<a name="line.4295"></a>
+<span class="sourceLineNo">4296</span> ", regionName=" +<a name="line.4296"></a>
+<span class="sourceLineNo">4297</span> (this.getRegionInfo() == null? "unknown": this.getRegionInfo().getEncodedName()) +<a name="line.4297"></a>
+<span class="sourceLineNo">4298</span> ", server=" + (this.getRegionServerServices() == null? "unknown":<a name="line.4298"></a>
+<span class="sourceLineNo">4299</span> this.getRegionServerServices().getServerName()));<a name="line.4299"></a>
<span class="sourceLineNo">4300</span> }<a name="line.4300"></a>
<span class="sourceLineNo">4301</span> }<a name="line.4301"></a>
<span class="sourceLineNo">4302</span><a name="line.4302"></a>
@@ -8610,7 +8610,8 @@
<span class="sourceLineNo">8602</span> public void requestFlush(FlushLifeCycleTracker tracker) throws IOException {<a name="line.8602"></a>
<span class="sourceLineNo">8603</span> requestFlush0(tracker);<a name="line.8603"></a>
<span class="sourceLineNo">8604</span> }<a name="line.8604"></a>
-<span class="sourceLineNo">8605</span>}<a name="line.8605"></a>
+<span class="sourceLineNo">8605</span><a name="line.8605"></a>
+<span class="sourceLineNo">8606</span>}<a name="line.8606"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/883dde2f/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RegionScannerImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RegionScannerImpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RegionScannerImpl.html
index 7d27402..3da432b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RegionScannerImpl.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RegionScannerImpl.html
@@ -2560,8 +2560,8 @@
<span class="sourceLineNo">2552</span> }<a name="line.2552"></a>
<span class="sourceLineNo">2553</span> MemStoreSize mss = this.memStoreSizing.getMemStoreSize();<a name="line.2553"></a>
<span class="sourceLineNo">2554</span> LOG.info("Flushing " + + storesToFlush.size() + "/" + stores.size() + " column families," +<a name="line.2554"></a>
-<span class="sourceLineNo">2555</span> " memstore data size=" + StringUtils.byteDesc(mss.getDataSize()) +<a name="line.2555"></a>
-<span class="sourceLineNo">2556</span> " memstore heap size=" + StringUtils.byteDesc(mss.getHeapSize()) +<a name="line.2556"></a>
+<span class="sourceLineNo">2555</span> " dataSize=" + StringUtils.byteDesc(mss.getDataSize()) +<a name="line.2555"></a>
+<span class="sourceLineNo">2556</span> " heapSize=" + StringUtils.byteDesc(mss.getHeapSize()) +<a name="line.2556"></a>
<span class="sourceLineNo">2557</span> ((perCfExtras != null && perCfExtras.length() > 0)? perCfExtras.toString(): "") +<a name="line.2557"></a>
<span class="sourceLineNo">2558</span> ((wal != null) ? "" : "; WAL is null, using passed sequenceid=" + sequenceId));<a name="line.2558"></a>
<span class="sourceLineNo">2559</span> }<a name="line.2559"></a>
@@ -2761,10 +2761,10 @@
<span class="sourceLineNo">2753</span> long time = EnvironmentEdgeManager.currentTime() - startTime;<a name="line.2753"></a>
<span class="sourceLineNo">2754</span> MemStoreSize mss = prepareResult.totalFlushableSize.getMemStoreSize();<a name="line.2754"></a>
<span class="sourceLineNo">2755</span> long memstoresize = this.memStoreSizing.getMemStoreSize().getDataSize();<a name="line.2755"></a>
-<span class="sourceLineNo">2756</span> String msg = "Finished memstore flush;"<a name="line.2756"></a>
-<span class="sourceLineNo">2757</span> + " data size ~" + StringUtils.byteDesc(mss.getDataSize()) + "/" + mss.getDataSize()<a name="line.2757"></a>
-<span class="sourceLineNo">2758</span> + ", heap size ~" + StringUtils.byteDesc(mss.getHeapSize()) + "/" + mss.getHeapSize()<a name="line.2758"></a>
-<span class="sourceLineNo">2759</span> + ", currentsize=" + StringUtils.byteDesc(memstoresize) + "/" + memstoresize<a name="line.2759"></a>
+<span class="sourceLineNo">2756</span> String msg = "Finished flush of"<a name="line.2756"></a>
+<span class="sourceLineNo">2757</span> + " dataSize ~" + StringUtils.byteDesc(mss.getDataSize()) + "/" + mss.getDataSize()<a name="line.2757"></a>
+<span class="sourceLineNo">2758</span> + ", heapSize ~" + StringUtils.byteDesc(mss.getHeapSize()) + "/" + mss.getHeapSize()<a name="line.2758"></a>
+<span class="sourceLineNo">2759</span> + ", currentSize=" + StringUtils.byteDesc(memstoresize) + "/" + memstoresize<a name="line.2759"></a>
<span class="sourceLineNo">2760</span> + " for " + this.getRegionInfo().getEncodedName() + " in " + time + "ms, sequenceid="<a name="line.2760"></a>
<span class="sourceLineNo">2761</span> + flushOpSeqId + ", compaction requested=" + compactionRequested<a name="line.2761"></a>
<span class="sourceLineNo">2762</span> + ((wal == null) ? "; wal=null" : "");<a name="line.2762"></a>
@@ -4244,7 +4244,7 @@
<span class="sourceLineNo">4236</span> * @param cellItr<a name="line.4236"></a>
<span class="sourceLineNo">4237</span> * @param now<a name="line.4237"></a>
<span class="sourceLineNo">4238</span> */<a name="line.4238"></a>
-<span class="sourceLineNo">4239</span> public void updateCellTimestamps(final Iterable<List<Cell>> cellItr, final byte[] now)<a name="line.4239"></a>
+<span class="sourceLineNo">4239</span> private static void updateCellTimestamps(final Iterable<List<Cell>> cellItr, final byte[] now)<a name="line.4239"></a>
<span class="sourceLineNo">4240</span> throws IOException {<a name="line.4240"></a>
<span class="sourceLineNo">4241</span> for (List<Cell> cells: cellItr) {<a name="line.4241"></a>
<span class="sourceLineNo">4242</span> if (cells == null) continue;<a name="line.4242"></a>
@@ -4299,12 +4299,12 @@
<span class="sourceLineNo">4291</span> requestFlush();<a name="line.4291"></a>
<span class="sourceLineNo">4292</span> // Don't print current limit because it will vary too much. The message is used as a key<a name="line.4292"></a>
<span class="sourceLineNo">4293</span> // over in RetriesExhaustedWithDetailsException processing.<a name="line.4293"></a>
-<span class="sourceLineNo">4294</span> throw new RegionTooBusyException("Over memstore limit; regionName=" +<a name="line.4294"></a>
-<span class="sourceLineNo">4295</span> (this.getRegionInfo() == null? "unknown": this.getRegionInfo().getEncodedName()) +<a name="line.4295"></a>
-<span class="sourceLineNo">4296</span> ", server=" + (this.getRegionServerServices() == null ? "unknown":<a name="line.4296"></a>
-<span class="sourceLineNo">4297</span> this.getRegionServerServices().getServerName()) +<a name="line.4297"></a>
-<span class="sourceLineNo">4298</span> ", blockingMemStoreSize=" +<a name="line.4298"></a>
-<span class="sourceLineNo">4299</span> org.apache.hadoop.hbase.procedure2.util.StringUtils.humanSize(blockingMemStoreSize));<a name="line.4299"></a>
+<span class="sourceLineNo">4294</span> throw new RegionTooBusyException("Over memstore limit=" +<a name="line.4294"></a>
+<span class="sourceLineNo">4295</span> org.apache.hadoop.hbase.procedure2.util.StringUtils.humanSize(this.blockingMemStoreSize) +<a name="line.4295"></a>
+<span class="sourceLineNo">4296</span> ", regionName=" +<a name="line.4296"></a>
+<span class="sourceLineNo">4297</span> (this.getRegionInfo() == null? "unknown": this.getRegionInfo().getEncodedName()) +<a name="line.4297"></a>
+<span class="sourceLineNo">4298</span> ", server=" + (this.getRegionServerServices() == null? "unknown":<a name="line.4298"></a>
+<span class="sourceLineNo">4299</span> this.getRegionServerServices().getServerName()));<a name="line.4299"></a>
<span class="sourceLineNo">4300</span> }<a name="line.4300"></a>
<span class="sourceLineNo">4301</span> }<a name="line.4301"></a>
<span class="sourceLineNo">4302</span><a name="line.4302"></a>
@@ -8610,7 +8610,8 @@
<span class="sourceLineNo">8602</span> public void requestFlush(FlushLifeCycleTracker tracker) throws IOException {<a name="line.8602"></a>
<span class="sourceLineNo">8603</span> requestFlush0(tracker);<a name="line.8603"></a>
<span class="sourceLineNo">8604</span> }<a name="line.8604"></a>
-<span class="sourceLineNo">8605</span>}<a name="line.8605"></a>
+<span class="sourceLineNo">8605</span><a name="line.8605"></a>
+<span class="sourceLineNo">8606</span>}<a name="line.8606"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/883dde2f/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.ReplayBatchOperation.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.ReplayBatchOperation.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.ReplayBatchOperation.html
index 7d27402..3da432b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.ReplayBatchOperation.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.ReplayBatchOperation.html
@@ -2560,8 +2560,8 @@
<span class="sourceLineNo">2552</span> }<a name="line.2552"></a>
<span class="sourceLineNo">2553</span> MemStoreSize mss = this.memStoreSizing.getMemStoreSize();<a name="line.2553"></a>
<span class="sourceLineNo">2554</span> LOG.info("Flushing " + + storesToFlush.size() + "/" + stores.size() + " column families," +<a name="line.2554"></a>
-<span class="sourceLineNo">2555</span> " memstore data size=" + StringUtils.byteDesc(mss.getDataSize()) +<a name="line.2555"></a>
-<span class="sourceLineNo">2556</span> " memstore heap size=" + StringUtils.byteDesc(mss.getHeapSize()) +<a name="line.2556"></a>
+<span class="sourceLineNo">2555</span> " dataSize=" + StringUtils.byteDesc(mss.getDataSize()) +<a name="line.2555"></a>
+<span class="sourceLineNo">2556</span> " heapSize=" + StringUtils.byteDesc(mss.getHeapSize()) +<a name="line.2556"></a>
<span class="sourceLineNo">2557</span> ((perCfExtras != null && perCfExtras.length() > 0)? perCfExtras.toString(): "") +<a name="line.2557"></a>
<span class="sourceLineNo">2558</span> ((wal != null) ? "" : "; WAL is null, using passed sequenceid=" + sequenceId));<a name="line.2558"></a>
<span class="sourceLineNo">2559</span> }<a name="line.2559"></a>
@@ -2761,10 +2761,10 @@
<span class="sourceLineNo">2753</span> long time = EnvironmentEdgeManager.currentTime() - startTime;<a name="line.2753"></a>
<span class="sourceLineNo">2754</span> MemStoreSize mss = prepareResult.totalFlushableSize.getMemStoreSize();<a name="line.2754"></a>
<span class="sourceLineNo">2755</span> long memstoresize = this.memStoreSizing.getMemStoreSize().getDataSize();<a name="line.2755"></a>
-<span class="sourceLineNo">2756</span> String msg = "Finished memstore flush;"<a name="line.2756"></a>
-<span class="sourceLineNo">2757</span> + " data size ~" + StringUtils.byteDesc(mss.getDataSize()) + "/" + mss.getDataSize()<a name="line.2757"></a>
-<span class="sourceLineNo">2758</span> + ", heap size ~" + StringUtils.byteDesc(mss.getHeapSize()) + "/" + mss.getHeapSize()<a name="line.2758"></a>
-<span class="sourceLineNo">2759</span> + ", currentsize=" + StringUtils.byteDesc(memstoresize) + "/" + memstoresize<a name="line.2759"></a>
+<span class="sourceLineNo">2756</span> String msg = "Finished flush of"<a name="line.2756"></a>
+<span class="sourceLineNo">2757</span> + " dataSize ~" + StringUtils.byteDesc(mss.getDataSize()) + "/" + mss.getDataSize()<a name="line.2757"></a>
+<span class="sourceLineNo">2758</span> + ", heapSize ~" + StringUtils.byteDesc(mss.getHeapSize()) + "/" + mss.getHeapSize()<a name="line.2758"></a>
+<span class="sourceLineNo">2759</span> + ", currentSize=" + StringUtils.byteDesc(memstoresize) + "/" + memstoresize<a name="line.2759"></a>
<span class="sourceLineNo">2760</span> + " for " + this.getRegionInfo().getEncodedName() + " in " + time + "ms, sequenceid="<a name="line.2760"></a>
<span class="sourceLineNo">2761</span> + flushOpSeqId + ", compaction requested=" + compactionRequested<a name="line.2761"></a>
<span class="sourceLineNo">2762</span> + ((wal == null) ? "; wal=null" : "");<a name="line.2762"></a>
@@ -4244,7 +4244,7 @@
<span class="sourceLineNo">4236</span> * @param cellItr<a name="line.4236"></a>
<span class="sourceLineNo">4237</span> * @param now<a name="line.4237"></a>
<span class="sourceLineNo">4238</span> */<a name="line.4238"></a>
-<span class="sourceLineNo">4239</span> public void updateCellTimestamps(final Iterable<List<Cell>> cellItr, final byte[] now)<a name="line.4239"></a>
+<span class="sourceLineNo">4239</span> private static void updateCellTimestamps(final Iterable<List<Cell>> cellItr, final byte[] now)<a name="line.4239"></a>
<span class="sourceLineNo">4240</span> throws IOException {<a name="line.4240"></a>
<span class="sourceLineNo">4241</span> for (List<Cell> cells: cellItr) {<a name="line.4241"></a>
<span class="sourceLineNo">4242</span> if (cells == null) continue;<a name="line.4242"></a>
@@ -4299,12 +4299,12 @@
<span class="sourceLineNo">4291</span> requestFlush();<a name="line.4291"></a>
<span class="sourceLineNo">4292</span> // Don't print current limit because it will vary too much. The message is used as a key<a name="line.4292"></a>
<span class="sourceLineNo">4293</span> // over in RetriesExhaustedWithDetailsException processing.<a name="line.4293"></a>
-<span class="sourceLineNo">4294</span> throw new RegionTooBusyException("Over memstore limit; regionName=" +<a name="line.4294"></a>
-<span class="sourceLineNo">4295</span> (this.getRegionInfo() == null? "unknown": this.getRegionInfo().getEncodedName()) +<a name="line.4295"></a>
-<span class="sourceLineNo">4296</span> ", server=" + (this.getRegionServerServices() == null ? "unknown":<a name="line.4296"></a>
-<span class="sourceLineNo">4297</span> this.getRegionServerServices().getServerName()) +<a name="line.4297"></a>
-<span class="sourceLineNo">4298</span> ", blockingMemStoreSize=" +<a name="line.4298"></a>
-<span class="sourceLineNo">4299</span> org.apache.hadoop.hbase.procedure2.util.StringUtils.humanSize(blockingMemStoreSize));<a name="line.4299"></a>
+<span class="sourceLineNo">4294</span> throw new RegionTooBusyException("Over memstore limit=" +<a name="line.4294"></a>
+<span class="sourceLineNo">4295</span> org.apache.hadoop.hbase.procedure2.util.StringUtils.humanSize(this.blockingMemStoreSize) +<a name="line.4295"></a>
+<span class="sourceLineNo">4296</span> ", regionName=" +<a name="line.4296"></a>
+<span class="sourceLineNo">4297</span> (this.getRegionInfo() == null? "unknown": this.getRegionInfo().getEncodedName()) +<a name="line.4297"></a>
+<span class="sourceLineNo">4298</span> ", server=" + (this.getRegionServerServices() == null? "unknown":<a name="line.4298"></a>
+<span class="sourceLineNo">4299</span> this.getRegionServerServices().getServerName()));<a name="line.4299"></a>
<span class="sourceLineNo">4300</span> }<a name="line.4300"></a>
<span class="sourceLineNo">4301</span> }<a name="line.4301"></a>
<span class="sourceLineNo">4302</span><a name="line.4302"></a>
@@ -8610,7 +8610,8 @@
<span class="sourceLineNo">8602</span> public void requestFlush(FlushLifeCycleTracker tracker) throws IOException {<a name="line.8602"></a>
<span class="sourceLineNo">8603</span> requestFlush0(tracker);<a name="line.8603"></a>
<span class="sourceLineNo">8604</span> }<a name="line.8604"></a>
-<span class="sourceLineNo">8605</span>}<a name="line.8605"></a>
+<span class="sourceLineNo">8605</span><a name="line.8605"></a>
+<span class="sourceLineNo">8606</span>}<a name="line.8606"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/883dde2f/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RowLockContext.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RowLockContext.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RowLockContext.html
index 7d27402..3da432b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RowLockContext.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RowLockContext.html
@@ -2560,8 +2560,8 @@
<span class="sourceLineNo">2552</span> }<a name="line.2552"></a>
<span class="sourceLineNo">2553</span> MemStoreSize mss = this.memStoreSizing.getMemStoreSize();<a name="line.2553"></a>
<span class="sourceLineNo">2554</span> LOG.info("Flushing " + + storesToFlush.size() + "/" + stores.size() + " column families," +<a name="line.2554"></a>
-<span class="sourceLineNo">2555</span> " memstore data size=" + StringUtils.byteDesc(mss.getDataSize()) +<a name="line.2555"></a>
-<span class="sourceLineNo">2556</span> " memstore heap size=" + StringUtils.byteDesc(mss.getHeapSize()) +<a name="line.2556"></a>
+<span class="sourceLineNo">2555</span> " dataSize=" + StringUtils.byteDesc(mss.getDataSize()) +<a name="line.2555"></a>
+<span class="sourceLineNo">2556</span> " heapSize=" + StringUtils.byteDesc(mss.getHeapSize()) +<a name="line.2556"></a>
<span class="sourceLineNo">2557</span> ((perCfExtras != null && perCfExtras.length() > 0)? perCfExtras.toString(): "") +<a name="line.2557"></a>
<span class="sourceLineNo">2558</span> ((wal != null) ? "" : "; WAL is null, using passed sequenceid=" + sequenceId));<a name="line.2558"></a>
<span class="sourceLineNo">2559</span> }<a name="line.2559"></a>
@@ -2761,10 +2761,10 @@
<span class="sourceLineNo">2753</span> long time = EnvironmentEdgeManager.currentTime() - startTime;<a name="line.2753"></a>
<span class="sourceLineNo">2754</span> MemStoreSize mss = prepareResult.totalFlushableSize.getMemStoreSize();<a name="line.2754"></a>
<span class="sourceLineNo">2755</span> long memstoresize = this.memStoreSizing.getMemStoreSize().getDataSize();<a name="line.2755"></a>
-<span class="sourceLineNo">2756</span> String msg = "Finished memstore flush;"<a name="line.2756"></a>
-<span class="sourceLineNo">2757</span> + " data size ~" + StringUtils.byteDesc(mss.getDataSize()) + "/" + mss.getDataSize()<a name="line.2757"></a>
-<span class="sourceLineNo">2758</span> + ", heap size ~" + StringUtils.byteDesc(mss.getHeapSize()) + "/" + mss.getHeapSize()<a name="line.2758"></a>
-<span class="sourceLineNo">2759</span> + ", currentsize=" + StringUtils.byteDesc(memstoresize) + "/" + memstoresize<a name="line.2759"></a>
+<span class="sourceLineNo">2756</span> String msg = "Finished flush of"<a name="line.2756"></a>
+<span class="sourceLineNo">2757</span> + " dataSize ~" + StringUtils.byteDesc(mss.getDataSize()) + "/" + mss.getDataSize()<a name="line.2757"></a>
+<span class="sourceLineNo">2758</span> + ", heapSize ~" + StringUtils.byteDesc(mss.getHeapSize()) + "/" + mss.getHeapSize()<a name="line.2758"></a>
+<span class="sourceLineNo">2759</span> + ", currentSize=" + StringUtils.byteDesc(memstoresize) + "/" + memstoresize<a name="line.2759"></a>
<span class="sourceLineNo">2760</span> + " for " + this.getRegionInfo().getEncodedName() + " in " + time + "ms, sequenceid="<a name="line.2760"></a>
<span class="sourceLineNo">2761</span> + flushOpSeqId + ", compaction requested=" + compactionRequested<a name="line.2761"></a>
<span class="sourceLineNo">2762</span> + ((wal == null) ? "; wal=null" : "");<a name="line.2762"></a>
@@ -4244,7 +4244,7 @@
<span class="sourceLineNo">4236</span> * @param cellItr<a name="line.4236"></a>
<span class="sourceLineNo">4237</span> * @param now<a name="line.4237"></a>
<span class="sourceLineNo">4238</span> */<a name="line.4238"></a>
-<span class="sourceLineNo">4239</span> public void updateCellTimestamps(final Iterable<List<Cell>> cellItr, final byte[] now)<a name="line.4239"></a>
+<span class="sourceLineNo">4239</span> private static void updateCellTimestamps(final Iterable<List<Cell>> cellItr, final byte[] now)<a name="line.4239"></a>
<span class="sourceLineNo">4240</span> throws IOException {<a name="line.4240"></a>
<span class="sourceLineNo">4241</span> for (List<Cell> cells: cellItr) {<a name="line.4241"></a>
<span class="sourceLineNo">4242</span> if (cells == null) continue;<a name="line.4242"></a>
@@ -4299,12 +4299,12 @@
<span class="sourceLineNo">4291</span> requestFlush();<a name="line.4291"></a>
<span class="sourceLineNo">4292</span> // Don't print current limit because it will vary too much. The message is used as a key<a name="line.4292"></a>
<span class="sourceLineNo">4293</span> // over in RetriesExhaustedWithDetailsException processing.<a name="line.4293"></a>
-<span class="sourceLineNo">4294</span> throw new RegionTooBusyException("Over memstore limit; regionName=" +<a name="line.4294"></a>
-<span class="sourceLineNo">4295</span> (this.getRegionInfo() == null? "unknown": this.getRegionInfo().getEncodedName()) +<a name="line.4295"></a>
-<span class="sourceLineNo">4296</span> ", server=" + (this.getRegionServerServices() == null ? "unknown":<a name="line.4296"></a>
-<span class="sourceLineNo">4297</span> this.getRegionServerServices().getServerName()) +<a name="line.4297"></a>
-<span class="sourceLineNo">4298</span> ", blockingMemStoreSize=" +<a name="line.4298"></a>
-<span class="sourceLineNo">4299</span> org.apache.hadoop.hbase.procedure2.util.StringUtils.humanSize(blockingMemStoreSize));<a name="line.4299"></a>
+<span class="sourceLineNo">4294</span> throw new RegionTooBusyException("Over memstore limit=" +<a name="line.4294"></a>
+<span class="sourceLineNo">4295</span> org.apache.hadoop.hbase.procedure2.util.StringUtils.humanSize(this.blockingMemStoreSize) +<a name="line.4295"></a>
+<span class="sourceLineNo">4296</span> ", regionName=" +<a name="line.4296"></a>
+<span class="sourceLineNo">4297</span> (this.getRegionInfo() == null? "unknown": this.getRegionInfo().getEncodedName()) +<a name="line.4297"></a>
+<span class="sourceLineNo">4298</span> ", server=" + (this.getRegionServerServices() == null? "unknown":<a name="line.4298"></a>
+<span class="sourceLineNo">4299</span> this.getRegionServerServices().getServerName()));<a name="line.4299"></a>
<span class="sourceLineNo">4300</span> }<a name="line.4300"></a>
<span class="sourceLineNo">4301</span> }<a name="line.4301"></a>
<span class="sourceLineNo">4302</span><a name="line.4302"></a>
@@ -8610,7 +8610,8 @@
<span class="sourceLineNo">8602</span> public void requestFlush(FlushLifeCycleTracker tracker) throws IOException {<a name="line.8602"></a>
<span class="sourceLineNo">8603</span> requestFlush0(tracker);<a name="line.8603"></a>
<span class="sourceLineNo">8604</span> }<a name="line.8604"></a>
-<span class="sourceLineNo">8605</span>}<a name="line.8605"></a>
+<span class="sourceLineNo">8605</span><a name="line.8605"></a>
+<span class="sourceLineNo">8606</span>}<a name="line.8606"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/883dde2f/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RowLockImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RowLockImpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RowLockImpl.html
index 7d27402..3da432b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RowLockImpl.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.RowLockImpl.html
@@ -2560,8 +2560,8 @@
<span class="sourceLineNo">2552</span> }<a name="line.2552"></a>
<span class="sourceLineNo">2553</span> MemStoreSize mss = this.memStoreSizing.getMemStoreSize();<a name="line.2553"></a>
<span class="sourceLineNo">2554</span> LOG.info("Flushing " + + storesToFlush.size() + "/" + stores.size() + " column families," +<a name="line.2554"></a>
-<span class="sourceLineNo">2555</span> " memstore data size=" + StringUtils.byteDesc(mss.getDataSize()) +<a name="line.2555"></a>
-<span class="sourceLineNo">2556</span> " memstore heap size=" + StringUtils.byteDesc(mss.getHeapSize()) +<a name="line.2556"></a>
+<span class="sourceLineNo">2555</span> " dataSize=" + StringUtils.byteDesc(mss.getDataSize()) +<a name="line.2555"></a>
+<span class="sourceLineNo">2556</span> " heapSize=" + StringUtils.byteDesc(mss.getHeapSize()) +<a name="line.2556"></a>
<span class="sourceLineNo">2557</span> ((perCfExtras != null && perCfExtras.length() > 0)? perCfExtras.toString(): "") +<a name="line.2557"></a>
<span class="sourceLineNo">2558</span> ((wal != null) ? "" : "; WAL is null, using passed sequenceid=" + sequenceId));<a name="line.2558"></a>
<span class="sourceLineNo">2559</span> }<a name="line.2559"></a>
@@ -2761,10 +2761,10 @@
<span class="sourceLineNo">2753</span> long time = EnvironmentEdgeManager.currentTime() - startTime;<a name="line.2753"></a>
<span class="sourceLineNo">2754</span> MemStoreSize mss = prepareResult.totalFlushableSize.getMemStoreSize();<a name="line.2754"></a>
<span class="sourceLineNo">2755</span> long memstoresize = this.memStoreSizing.getMemStoreSize().getDataSize();<a name="line.2755"></a>
-<span class="sourceLineNo">2756</span> String msg = "Finished memstore flush;"<a name="line.2756"></a>
-<span class="sourceLineNo">2757</span> + " data size ~" + StringUtils.byteDesc(mss.getDataSize()) + "/" + mss.getDataSize()<a name="line.2757"></a>
-<span class="sourceLineNo">2758</span> + ", heap size ~" + StringUtils.byteDesc(mss.getHeapSize()) + "/" + mss.getHeapSize()<a name="line.2758"></a>
-<span class="sourceLineNo">2759</span> + ", currentsize=" + StringUtils.byteDesc(memstoresize) + "/" + memstoresize<a name="line.2759"></a>
+<span class="sourceLineNo">2756</span> String msg = "Finished flush of"<a name="line.2756"></a>
+<span class="sourceLineNo">2757</span> + " dataSize ~" + StringUtils.byteDesc(mss.getDataSize()) + "/" + mss.getDataSize()<a name="line.2757"></a>
+<span class="sourceLineNo">2758</span> + ", heapSize ~" + StringUtils.byteDesc(mss.getHeapSize()) + "/" + mss.getHeapSize()<a name="line.2758"></a>
+<span class="sourceLineNo">2759</span> + ", currentSize=" + StringUtils.byteDesc(memstoresize) + "/" + memstoresize<a name="line.2759"></a>
<span class="sourceLineNo">2760</span> + " for " + this.getRegionInfo().getEncodedName() + " in " + time + "ms, sequenceid="<a name="line.2760"></a>
<span class="sourceLineNo">2761</span> + flushOpSeqId + ", compaction requested=" + compactionRequested<a name="line.2761"></a>
<span class="sourceLineNo">2762</span> + ((wal == null) ? "; wal=null" : "");<a name="line.2762"></a>
@@ -4244,7 +4244,7 @@
<span class="sourceLineNo">4236</span> * @param cellItr<a name="line.4236"></a>
<span class="sourceLineNo">4237</span> * @param now<a name="line.4237"></a>
<span class="sourceLineNo">4238</span> */<a name="line.4238"></a>
-<span class="sourceLineNo">4239</span> public void updateCellTimestamps(final Iterable<List<Cell>> cellItr, final byte[] now)<a name="line.4239"></a>
+<span class="sourceLineNo">4239</span> private static void updateCellTimestamps(final Iterable<List<Cell>> cellItr, final byte[] now)<a name="line.4239"></a>
<span class="sourceLineNo">4240</span> throws IOException {<a name="line.4240"></a>
<span class="sourceLineNo">4241</span> for (List<Cell> cells: cellItr) {<a name="line.4241"></a>
<span class="sourceLineNo">4242</span> if (cells == null) continue;<a name="line.4242"></a>
@@ -4299,12 +4299,12 @@
<span class="sourceLineNo">4291</span> requestFlush();<a name="line.4291"></a>
<span class="sourceLineNo">4292</span> // Don't print current limit because it will vary too much. The message is used as a key<a name="line.4292"></a>
<span class="sourceLineNo">4293</span> // over in RetriesExhaustedWithDetailsException processing.<a name="line.4293"></a>
-<span class="sourceLineNo">4294</span> throw new RegionTooBusyException("Over memstore limit; regionName=" +<a name="line.4294"></a>
-<span class="sourceLineNo">4295</span> (this.getRegionInfo() == null? "unknown": this.getRegionInfo().getEncodedName()) +<a name="line.4295"></a>
-<span class="sourceLineNo">4296</span> ", server=" + (this.getRegionServerServices() == null ? "unknown":<a name="line.4296"></a>
-<span class="sourceLineNo">4297</span> this.getRegionServerServices().getServerName()) +<a name="line.4297"></a>
-<span class="sourceLineNo">4298</span> ", blockingMemStoreSize=" +<a name="line.4298"></a>
-<span class="sourceLineNo">4299</span> org.apache.hadoop.hbase.procedure2.util.StringUtils.humanSize(blockingMemStoreSize));<a name="line.4299"></a>
+<span class="sourceLineNo">4294</span> throw new RegionTooBusyException("Over memstore limit=" +<a name="line.4294"></a>
+<span class="sourceLineNo">4295</span> org.apache.hadoop.hbase.procedure2.util.StringUtils.humanSize(this.blockingMemStoreSize) +<a name="line.4295"></a>
+<span class="sourceLineNo">4296</span> ", regionName=" +<a name="line.4296"></a>
+<span class="sourceLineNo">4297</span> (this.getRegionInfo() == null? "unknown": this.getRegionInfo().getEncodedName()) +<a name="line.4297"></a>
+<span class="sourceLineNo">4298</span> ", server=" + (this.getRegionServerServices() == null? "unknown":<a name="line.4298"></a>
+<span class="sourceLineNo">4299</span> this.getRegionServerServices().getServerName()));<a name="line.4299"></a>
<span class="sourceLineNo">4300</span> }<a name="line.4300"></a>
<span class="sourceLineNo">4301</span> }<a name="line.4301"></a>
<span class="sourceLineNo">4302</span><a name="line.4302"></a>
@@ -8610,7 +8610,8 @@
<span class="sourceLineNo">8602</span> public void requestFlush(FlushLifeCycleTracker tracker) throws IOException {<a name="line.8602"></a>
<span class="sourceLineNo">8603</span> requestFlush0(tracker);<a name="line.8603"></a>
<span class="sourceLineNo">8604</span> }<a name="line.8604"></a>
-<span class="sourceLineNo">8605</span>}<a name="line.8605"></a>
+<span class="sourceLineNo">8605</span><a name="line.8605"></a>
+<span class="sourceLineNo">8606</span>}<a name="line.8606"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/883dde2f/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.WriteState.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.WriteState.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.WriteState.html
index 7d27402..3da432b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.WriteState.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.WriteState.html
@@ -2560,8 +2560,8 @@
<span class="sourceLineNo">2552</span> }<a name="line.2552"></a>
<span class="sourceLineNo">2553</span> MemStoreSize mss = this.memStoreSizing.getMemStoreSize();<a name="line.2553"></a>
<span class="sourceLineNo">2554</span> LOG.info("Flushing " + + storesToFlush.size() + "/" + stores.size() + " column families," +<a name="line.2554"></a>
-<span class="sourceLineNo">2555</span> " memstore data size=" + StringUtils.byteDesc(mss.getDataSize()) +<a name="line.2555"></a>
-<span class="sourceLineNo">2556</span> " memstore heap size=" + StringUtils.byteDesc(mss.getHeapSize()) +<a name="line.2556"></a>
+<span class="sourceLineNo">2555</span> " dataSize=" + StringUtils.byteDesc(mss.getDataSize()) +<a name="line.2555"></a>
+<span class="sourceLineNo">2556</span> " heapSize=" + StringUtils.byteDesc(mss.getHeapSize()) +<a name="line.2556"></a>
<span class="sourceLineNo">2557</span> ((perCfExtras != null && perCfExtras.length() > 0)? perCfExtras.toString(): "") +<a name="line.2557"></a>
<span class="sourceLineNo">2558</span> ((wal != null) ? "" : "; WAL is null, using passed sequenceid=" + sequenceId));<a name="line.2558"></a>
<span class="sourceLineNo">2559</span> }<a name="line.2559"></a>
@@ -2761,10 +2761,10 @@
<span class="sourceLineNo">2753</span> long time = EnvironmentEdgeManager.currentTime() - startTime;<a name="line.2753"></a>
<span class="sourceLineNo">2754</span> MemStoreSize mss = prepareResult.totalFlushableSize.getMemStoreSize();<a name="line.2754"></a>
<span class="sourceLineNo">2755</span> long memstoresize = this.memStoreSizing.getMemStoreSize().getDataSize();<a name="line.2755"></a>
-<span class="sourceLineNo">2756</span> String msg = "Finished memstore flush;"<a name="line.2756"></a>
-<span class="sourceLineNo">2757</span> + " data size ~" + StringUtils.byteDesc(mss.getDataSize()) + "/" + mss.getDataSize()<a name="line.2757"></a>
-<span class="sourceLineNo">2758</span> + ", heap size ~" + StringUtils.byteDesc(mss.getHeapSize()) + "/" + mss.getHeapSize()<a name="line.2758"></a>
-<span class="sourceLineNo">2759</span> + ", currentsize=" + StringUtils.byteDesc(memstoresize) + "/" + memstoresize<a name="line.2759"></a>
+<span class="sourceLineNo">2756</span> String msg = "Finished flush of"<a name="line.2756"></a>
+<span class="sourceLineNo">2757</span> + " dataSize ~" + StringUtils.byteDesc(mss.getDataSize()) + "/" + mss.getDataSize()<a name="line.2757"></a>
+<span class="sourceLineNo">2758</span> + ", heapSize ~" + StringUtils.byteDesc(mss.getHeapSize()) + "/" + mss.getHeapSize()<a name="line.2758"></a>
+<span class="sourceLineNo">2759</span> + ", currentSize=" + StringUtils.byteDesc(memstoresize) + "/" + memstoresize<a name="line.2759"></a>
<span class="sourceLineNo">2760</span> + " for " + this.getRegionInfo().getEncodedName() + " in " + time + "ms, sequenceid="<a name="line.2760"></a>
<span class="sourceLineNo">2761</span> + flushOpSeqId + ", compaction requested=" + compactionRequested<a name="line.2761"></a>
<span class="sourceLineNo">2762</span> + ((wal == null) ? "; wal=null" : "");<a name="line.2762"></a>
@@ -4244,7 +4244,7 @@
<span class="sourceLineNo">4236</span> * @param cellItr<a name="line.4236"></a>
<span class="sourceLineNo">4237</span> * @param now<a name="line.4237"></a>
<span class="sourceLineNo">4238</span> */<a name="line.4238"></a>
-<span class="sourceLineNo">4239</span> public void updateCellTimestamps(final Iterable<List<Cell>> cellItr, final byte[] now)<a name="line.4239"></a>
+<span class="sourceLineNo">4239</span> private static void updateCellTimestamps(final Iterable<List<Cell>> cellItr, final byte[] now)<a name="line.4239"></a>
<span class="sourceLineNo">4240</span> throws IOException {<a name="line.4240"></a>
<span class="sourceLineNo">4241</span> for (List<Cell> cells: cellItr) {<a name="line.4241"></a>
<span class="sourceLineNo">4242</span> if (cells == null) continue;<a name="line.4242"></a>
@@ -4299,12 +4299,12 @@
<span class="sourceLineNo">4291</span> requestFlush();<a name="line.4291"></a>
<span class="sourceLineNo">4292</span> // Don't print current limit because it will vary too much. The message is used as a key<a name="line.4292"></a>
<span class="sourceLineNo">4293</span> // over in RetriesExhaustedWithDetailsException processing.<a name="line.4293"></a>
-<span class="sourceLineNo">4294</span> throw new RegionTooBusyException("Over memstore limit; regionName=" +<a name="line.4294"></a>
-<span class="sourceLineNo">4295</span> (this.getRegionInfo() == null? "unknown": this.getRegionInfo().getEncodedName()) +<a name="line.4295"></a>
-<span class="sourceLineNo">4296</span> ", server=" + (this.getRegionServerServices() == null ? "unknown":<a name="line.4296"></a>
-<span class="sourceLineNo">4297</span> this.getRegionServerServices().getServerName()) +<a name="line.4297"></a>
-<span class="sourceLineNo">4298</span> ", blockingMemStoreSize=" +<a name="line.4298"></a>
-<span class="sourceLineNo">4299</span> org.apache.hadoop.hbase.procedure2.util.StringUtils.humanSize(blockingMemStoreSize));<a name="line.4299"></a>
+<span class="sourceLineNo">4294</span> throw new RegionTooBusyException("Over memstore limit=" +<a name="line.4294"></a>
+<span class="sourceLineNo">4295</span> org.apache.hadoop.hbase.procedure2.util.StringUtils.humanSize(this.blockingMemStoreSize) +<a name="line.4295"></a>
+<span class="sourceLineNo">4296</span> ", regionName=" +<a name="line.4296"></a>
+<span class="sourceLineNo">4297</span> (this.getRegionInfo() == null? "unknown": this.getRegionInfo().getEncodedName()) +<a name="line.4297"></a>
+<span class="sourceLineNo">4298</span> ", server=" + (this.getRegionServerServices() == null? "unknown":<a name="line.4298"></a>
+<span class="sourceLineNo">4299</span> this.getRegionServerServices().getServerName()));<a name="line.4299"></a>
<span class="sourceLineNo">4300</span> }<a name="line.4300"></a>
<span class="sourceLineNo">4301</span> }<a name="line.4301"></a>
<span class="sourceLineNo">4302</span><a name="line.4302"></a>
@@ -8610,7 +8610,8 @@
<span class="sourceLineNo">8602</span> public void requestFlush(FlushLifeCycleTracker tracker) throws IOException {<a name="line.8602"></a>
<span class="sourceLineNo">8603</span> requestFlush0(tracker);<a name="line.8603"></a>
<span class="sourceLineNo">8604</span> }<a name="line.8604"></a>
-<span class="sourceLineNo">8605</span>}<a name="line.8605"></a>
+<span class="sourceLineNo">8605</span><a name="line.8605"></a>
+<span class="sourceLineNo">8606</span>}<a name="line.8606"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/883dde2f/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.html
index 7d27402..3da432b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.html
@@ -2560,8 +2560,8 @@
<span class="sourceLineNo">2552</span> }<a name="line.2552"></a>
<span class="sourceLineNo">2553</span> MemStoreSize mss = this.memStoreSizing.getMemStoreSize();<a name="line.2553"></a>
<span class="sourceLineNo">2554</span> LOG.info("Flushing " + + storesToFlush.size() + "/" + stores.size() + " column families," +<a name="line.2554"></a>
-<span class="sourceLineNo">2555</span> " memstore data size=" + StringUtils.byteDesc(mss.getDataSize()) +<a name="line.2555"></a>
-<span class="sourceLineNo">2556</span> " memstore heap size=" + StringUtils.byteDesc(mss.getHeapSize()) +<a name="line.2556"></a>
+<span class="sourceLineNo">2555</span> " dataSize=" + StringUtils.byteDesc(mss.getDataSize()) +<a name="line.2555"></a>
+<span class="sourceLineNo">2556</span> " heapSize=" + StringUtils.byteDesc(mss.getHeapSize()) +<a name="line.2556"></a>
<span class="sourceLineNo">2557</span> ((perCfExtras != null && perCfExtras.length() > 0)? perCfExtras.toString(): "") +<a name="line.2557"></a>
<span class="sourceLineNo">2558</span> ((wal != null) ? "" : "; WAL is null, using passed sequenceid=" + sequenceId));<a name="line.2558"></a>
<span class="sourceLineNo">2559</span> }<a name="line.2559"></a>
@@ -2761,10 +2761,10 @@
<span class="sourceLineNo">2753</span> long time = EnvironmentEdgeManager.currentTime() - startTime;<a name="line.2753"></a>
<span class="sourceLineNo">2754</span> MemStoreSize mss = prepareResult.totalFlushableSize.getMemStoreSize();<a name="line.2754"></a>
<span class="sourceLineNo">2755</span> long memstoresize = this.memStoreSizing.getMemStoreSize().getDataSize();<a name="line.2755"></a>
-<span class="sourceLineNo">2756</span> String msg = "Finished memstore flush;"<a name="line.2756"></a>
-<span class="sourceLineNo">2757</span> + " data size ~" + StringUtils.byteDesc(mss.getDataSize()) + "/" + mss.getDataSize()<a name="line.2757"></a>
-<span class="sourceLineNo">2758</span> + ", heap size ~" + StringUtils.byteDesc(mss.getHeapSize()) + "/" + mss.getHeapSize()<a name="line.2758"></a>
-<span class="sourceLineNo">2759</span> + ", currentsize=" + StringUtils.byteDesc(memstoresize) + "/" + memstoresize<a name="line.2759"></a>
+<span class="sourceLineNo">2756</span> String msg = "Finished flush of"<a name="line.2756"></a>
+<span class="sourceLineNo">2757</span> + " dataSize ~" + StringUtils.byteDesc(mss.getDataSize()) + "/" + mss.getDataSize()<a name="line.2757"></a>
+<span class="sourceLineNo">2758</span> + ", heapSize ~" + StringUtils.byteDesc(mss.getHeapSize()) + "/" + mss.getHeapSize()<a name="line.2758"></a>
+<span class="sourceLineNo">2759</span> + ", currentSize=" + StringUtils.byteDesc(memstoresize) + "/" + memstoresize<a name="line.2759"></a>
<span class="sourceLineNo">2760</span> + " for " + this.getRegionInfo().getEncodedName() + " in " + time + "ms, sequenceid="<a name="line.2760"></a>
<span class="sourceLineNo">2761</span> + flushOpSeqId + ", compaction requested=" + compactionRequested<a name="line.2761"></a>
<span class="sourceLineNo">2762</span> + ((wal == null) ? "; wal=null" : "");<a name="line.2762"></a>
@@ -4244,7 +4244,7 @@
<span class="sourceLineNo">4236</span> * @param cellItr<a name="line.4236"></a>
<span class="sourceLineNo">4237</span> * @param now<a name="line.4237"></a>
<span class="sourceLineNo">4238</span> */<a name="line.4238"></a>
-<span class="sourceLineNo">4239</span> public void updateCellTimestamps(final Iterable<List<Cell>> cellItr, final byte[] now)<a name="line.4239"></a>
+<span class="sourceLineNo">4239</span> private static void updateCellTimestamps(final Iterable<List<Cell>> cellItr, final byte[] now)<a name="line.4239"></a>
<span class="sourceLineNo">4240</span> throws IOException {<a name="line.4240"></a>
<span class="sourceLineNo">4241</span> for (List<Cell> cells: cellItr) {<a name="line.4241"></a>
<span class="sourceLineNo">4242</span> if (cells == null) continue;<a name="line.4242"></a>
@@ -4299,12 +4299,12 @@
<span class="sourceLineNo">4291</span> requestFlush();<a name="line.4291"></a>
<span class="sourceLineNo">4292</span> // Don't print current limit because it will vary too much. The message is used as a key<a name="line.4292"></a>
<span class="sourceLineNo">4293</span> // over in RetriesExhaustedWithDetailsException processing.<a name="line.4293"></a>
-<span class="sourceLineNo">4294</span> throw new RegionTooBusyException("Over memstore limit; regionName=" +<a name="line.4294"></a>
-<span class="sourceLineNo">4295</span> (this.getRegionInfo() == null? "unknown": this.getRegionInfo().getEncodedName()) +<a name="line.4295"></a>
-<span class="sourceLineNo">4296</span> ", server=" + (this.getRegionServerServices() == null ? "unknown":<a name="line.4296"></a>
-<span class="sourceLineNo">4297</span> this.getRegionServerServices().getServerName()) +<a name="line.4297"></a>
-<span class="sourceLineNo">4298</span> ", blockingMemStoreSize=" +<a name="line.4298"></a>
-<span class="sourceLineNo">4299</span> org.apache.hadoop.hbase.procedure2.util.StringUtils.humanSize(blockingMemStoreSize));<a name="line.4299"></a>
+<span class="sourceLineNo">4294</span> throw new RegionTooBusyException("Over memstore limit=" +<a name="line.4294"></a>
+<span class="sourceLineNo">4295</span> org.apache.hadoop.hbase.procedure2.util.StringUtils.humanSize(this.blockingMemStoreSize) +<a name="line.4295"></a>
+<span class="sourceLineNo">4296</span> ", regionName=" +<a name="line.4296"></a>
+<span class="sourceLineNo">4297</span> (this.getRegionInfo() == null? "unknown": this.getRegionInfo().getEncodedName()) +<a name="line.4297"></a>
+<span class="sourceLineNo">4298</span> ", server=" + (this.getRegionServerServices() == null? "unknown":<a name="line.4298"></a>
+<span class="sourceLineNo">4299</span> this.getRegionServerServices().getServerName()));<a name="line.4299"></a>
<span class="sourceLineNo">4300</span> }<a name="line.4300"></a>
<span class="sourceLineNo">4301</span> }<a name="line.4301"></a>
<span class="sourceLineNo">4302</span><a name="line.4302"></a>
@@ -8610,7 +8610,8 @@
<span class="sourceLineNo">8602</span> public void requestFlush(FlushLifeCycleTracker tracker) throws IOException {<a name="line.8602"></a>
<span class="sourceLineNo">8603</span> requestFlush0(tracker);<a name="line.8603"></a>
<span class="sourceLineNo">8604</span> }<a name="line.8604"></a>
-<span class="sourceLineNo">8605</span>}<a name="line.8605"></a>
+<span class="sourceLineNo">8605</span><a name="line.8605"></a>
+<span class="sourceLineNo">8606</span>}<a name="line.8606"></a>