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:48 UTC
[28/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/master/balancer/BaseLoadBalancer.Cluster.MoveRegionAction.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.MoveRegionAction.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.MoveRegionAction.html
index 65b5edb..7f42212 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.MoveRegionAction.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.MoveRegionAction.html
@@ -1413,7 +1413,7 @@
<span class="sourceLineNo">1405</span> ArrayListMultimap<String, ServerName> serversByHostname = ArrayListMultimap.create();<a name="line.1405"></a>
<span class="sourceLineNo">1406</span> for (ServerName server : servers) {<a name="line.1406"></a>
<span class="sourceLineNo">1407</span> assignments.put(server, new ArrayList<>());<a name="line.1407"></a>
-<span class="sourceLineNo">1408</span> serversByHostname.put(server.getHostname(), server);<a name="line.1408"></a>
+<span class="sourceLineNo">1408</span> serversByHostname.put(server.getHostnameLowerCase(), server);<a name="line.1408"></a>
<span class="sourceLineNo">1409</span> }<a name="line.1409"></a>
<span class="sourceLineNo">1410</span><a name="line.1410"></a>
<span class="sourceLineNo">1411</span> // Collection of the hostnames that used to have regions<a name="line.1411"></a>
@@ -1434,13 +1434,13 @@
<span class="sourceLineNo">1426</span> ServerName oldServerName = entry.getValue();<a name="line.1426"></a>
<span class="sourceLineNo">1427</span> List<ServerName> localServers = new ArrayList<>();<a name="line.1427"></a>
<span class="sourceLineNo">1428</span> if (oldServerName != null) {<a name="line.1428"></a>
-<span class="sourceLineNo">1429</span> localServers = serversByHostname.get(oldServerName.getHostname());<a name="line.1429"></a>
+<span class="sourceLineNo">1429</span> localServers = serversByHostname.get(oldServerName.getHostnameLowerCase());<a name="line.1429"></a>
<span class="sourceLineNo">1430</span> }<a name="line.1430"></a>
<span class="sourceLineNo">1431</span> if (localServers.isEmpty()) {<a name="line.1431"></a>
<span class="sourceLineNo">1432</span> // No servers on the new cluster match up with this hostname, assign randomly, later.<a name="line.1432"></a>
<span class="sourceLineNo">1433</span> randomAssignRegions.add(region);<a name="line.1433"></a>
<span class="sourceLineNo">1434</span> if (oldServerName != null) {<a name="line.1434"></a>
-<span class="sourceLineNo">1435</span> oldHostsNoLongerPresent.add(oldServerName.getHostname());<a name="line.1435"></a>
+<span class="sourceLineNo">1435</span> oldHostsNoLongerPresent.add(oldServerName.getHostnameLowerCase());<a name="line.1435"></a>
<span class="sourceLineNo">1436</span> }<a name="line.1436"></a>
<span class="sourceLineNo">1437</span> } else if (localServers.size() == 1) {<a name="line.1437"></a>
<span class="sourceLineNo">1438</span> // the usual case - one new server on same host<a name="line.1438"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/883dde2f/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.SwapRegionsAction.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.SwapRegionsAction.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.SwapRegionsAction.html
index 65b5edb..7f42212 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.SwapRegionsAction.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.SwapRegionsAction.html
@@ -1413,7 +1413,7 @@
<span class="sourceLineNo">1405</span> ArrayListMultimap<String, ServerName> serversByHostname = ArrayListMultimap.create();<a name="line.1405"></a>
<span class="sourceLineNo">1406</span> for (ServerName server : servers) {<a name="line.1406"></a>
<span class="sourceLineNo">1407</span> assignments.put(server, new ArrayList<>());<a name="line.1407"></a>
-<span class="sourceLineNo">1408</span> serversByHostname.put(server.getHostname(), server);<a name="line.1408"></a>
+<span class="sourceLineNo">1408</span> serversByHostname.put(server.getHostnameLowerCase(), server);<a name="line.1408"></a>
<span class="sourceLineNo">1409</span> }<a name="line.1409"></a>
<span class="sourceLineNo">1410</span><a name="line.1410"></a>
<span class="sourceLineNo">1411</span> // Collection of the hostnames that used to have regions<a name="line.1411"></a>
@@ -1434,13 +1434,13 @@
<span class="sourceLineNo">1426</span> ServerName oldServerName = entry.getValue();<a name="line.1426"></a>
<span class="sourceLineNo">1427</span> List<ServerName> localServers = new ArrayList<>();<a name="line.1427"></a>
<span class="sourceLineNo">1428</span> if (oldServerName != null) {<a name="line.1428"></a>
-<span class="sourceLineNo">1429</span> localServers = serversByHostname.get(oldServerName.getHostname());<a name="line.1429"></a>
+<span class="sourceLineNo">1429</span> localServers = serversByHostname.get(oldServerName.getHostnameLowerCase());<a name="line.1429"></a>
<span class="sourceLineNo">1430</span> }<a name="line.1430"></a>
<span class="sourceLineNo">1431</span> if (localServers.isEmpty()) {<a name="line.1431"></a>
<span class="sourceLineNo">1432</span> // No servers on the new cluster match up with this hostname, assign randomly, later.<a name="line.1432"></a>
<span class="sourceLineNo">1433</span> randomAssignRegions.add(region);<a name="line.1433"></a>
<span class="sourceLineNo">1434</span> if (oldServerName != null) {<a name="line.1434"></a>
-<span class="sourceLineNo">1435</span> oldHostsNoLongerPresent.add(oldServerName.getHostname());<a name="line.1435"></a>
+<span class="sourceLineNo">1435</span> oldHostsNoLongerPresent.add(oldServerName.getHostnameLowerCase());<a name="line.1435"></a>
<span class="sourceLineNo">1436</span> }<a name="line.1436"></a>
<span class="sourceLineNo">1437</span> } else if (localServers.size() == 1) {<a name="line.1437"></a>
<span class="sourceLineNo">1438</span> // the usual case - one new server on same host<a name="line.1438"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/883dde2f/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html
index 65b5edb..7f42212 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.Cluster.html
@@ -1413,7 +1413,7 @@
<span class="sourceLineNo">1405</span> ArrayListMultimap<String, ServerName> serversByHostname = ArrayListMultimap.create();<a name="line.1405"></a>
<span class="sourceLineNo">1406</span> for (ServerName server : servers) {<a name="line.1406"></a>
<span class="sourceLineNo">1407</span> assignments.put(server, new ArrayList<>());<a name="line.1407"></a>
-<span class="sourceLineNo">1408</span> serversByHostname.put(server.getHostname(), server);<a name="line.1408"></a>
+<span class="sourceLineNo">1408</span> serversByHostname.put(server.getHostnameLowerCase(), server);<a name="line.1408"></a>
<span class="sourceLineNo">1409</span> }<a name="line.1409"></a>
<span class="sourceLineNo">1410</span><a name="line.1410"></a>
<span class="sourceLineNo">1411</span> // Collection of the hostnames that used to have regions<a name="line.1411"></a>
@@ -1434,13 +1434,13 @@
<span class="sourceLineNo">1426</span> ServerName oldServerName = entry.getValue();<a name="line.1426"></a>
<span class="sourceLineNo">1427</span> List<ServerName> localServers = new ArrayList<>();<a name="line.1427"></a>
<span class="sourceLineNo">1428</span> if (oldServerName != null) {<a name="line.1428"></a>
-<span class="sourceLineNo">1429</span> localServers = serversByHostname.get(oldServerName.getHostname());<a name="line.1429"></a>
+<span class="sourceLineNo">1429</span> localServers = serversByHostname.get(oldServerName.getHostnameLowerCase());<a name="line.1429"></a>
<span class="sourceLineNo">1430</span> }<a name="line.1430"></a>
<span class="sourceLineNo">1431</span> if (localServers.isEmpty()) {<a name="line.1431"></a>
<span class="sourceLineNo">1432</span> // No servers on the new cluster match up with this hostname, assign randomly, later.<a name="line.1432"></a>
<span class="sourceLineNo">1433</span> randomAssignRegions.add(region);<a name="line.1433"></a>
<span class="sourceLineNo">1434</span> if (oldServerName != null) {<a name="line.1434"></a>
-<span class="sourceLineNo">1435</span> oldHostsNoLongerPresent.add(oldServerName.getHostname());<a name="line.1435"></a>
+<span class="sourceLineNo">1435</span> oldHostsNoLongerPresent.add(oldServerName.getHostnameLowerCase());<a name="line.1435"></a>
<span class="sourceLineNo">1436</span> }<a name="line.1436"></a>
<span class="sourceLineNo">1437</span> } else if (localServers.size() == 1) {<a name="line.1437"></a>
<span class="sourceLineNo">1438</span> // the usual case - one new server on same host<a name="line.1438"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/883dde2f/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.DefaultRackManager.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.DefaultRackManager.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.DefaultRackManager.html
index 65b5edb..7f42212 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.DefaultRackManager.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.DefaultRackManager.html
@@ -1413,7 +1413,7 @@
<span class="sourceLineNo">1405</span> ArrayListMultimap<String, ServerName> serversByHostname = ArrayListMultimap.create();<a name="line.1405"></a>
<span class="sourceLineNo">1406</span> for (ServerName server : servers) {<a name="line.1406"></a>
<span class="sourceLineNo">1407</span> assignments.put(server, new ArrayList<>());<a name="line.1407"></a>
-<span class="sourceLineNo">1408</span> serversByHostname.put(server.getHostname(), server);<a name="line.1408"></a>
+<span class="sourceLineNo">1408</span> serversByHostname.put(server.getHostnameLowerCase(), server);<a name="line.1408"></a>
<span class="sourceLineNo">1409</span> }<a name="line.1409"></a>
<span class="sourceLineNo">1410</span><a name="line.1410"></a>
<span class="sourceLineNo">1411</span> // Collection of the hostnames that used to have regions<a name="line.1411"></a>
@@ -1434,13 +1434,13 @@
<span class="sourceLineNo">1426</span> ServerName oldServerName = entry.getValue();<a name="line.1426"></a>
<span class="sourceLineNo">1427</span> List<ServerName> localServers = new ArrayList<>();<a name="line.1427"></a>
<span class="sourceLineNo">1428</span> if (oldServerName != null) {<a name="line.1428"></a>
-<span class="sourceLineNo">1429</span> localServers = serversByHostname.get(oldServerName.getHostname());<a name="line.1429"></a>
+<span class="sourceLineNo">1429</span> localServers = serversByHostname.get(oldServerName.getHostnameLowerCase());<a name="line.1429"></a>
<span class="sourceLineNo">1430</span> }<a name="line.1430"></a>
<span class="sourceLineNo">1431</span> if (localServers.isEmpty()) {<a name="line.1431"></a>
<span class="sourceLineNo">1432</span> // No servers on the new cluster match up with this hostname, assign randomly, later.<a name="line.1432"></a>
<span class="sourceLineNo">1433</span> randomAssignRegions.add(region);<a name="line.1433"></a>
<span class="sourceLineNo">1434</span> if (oldServerName != null) {<a name="line.1434"></a>
-<span class="sourceLineNo">1435</span> oldHostsNoLongerPresent.add(oldServerName.getHostname());<a name="line.1435"></a>
+<span class="sourceLineNo">1435</span> oldHostsNoLongerPresent.add(oldServerName.getHostnameLowerCase());<a name="line.1435"></a>
<span class="sourceLineNo">1436</span> }<a name="line.1436"></a>
<span class="sourceLineNo">1437</span> } else if (localServers.size() == 1) {<a name="line.1437"></a>
<span class="sourceLineNo">1438</span> // the usual case - one new server on same host<a name="line.1438"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/883dde2f/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html
index 65b5edb..7f42212 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.html
@@ -1413,7 +1413,7 @@
<span class="sourceLineNo">1405</span> ArrayListMultimap<String, ServerName> serversByHostname = ArrayListMultimap.create();<a name="line.1405"></a>
<span class="sourceLineNo">1406</span> for (ServerName server : servers) {<a name="line.1406"></a>
<span class="sourceLineNo">1407</span> assignments.put(server, new ArrayList<>());<a name="line.1407"></a>
-<span class="sourceLineNo">1408</span> serversByHostname.put(server.getHostname(), server);<a name="line.1408"></a>
+<span class="sourceLineNo">1408</span> serversByHostname.put(server.getHostnameLowerCase(), server);<a name="line.1408"></a>
<span class="sourceLineNo">1409</span> }<a name="line.1409"></a>
<span class="sourceLineNo">1410</span><a name="line.1410"></a>
<span class="sourceLineNo">1411</span> // Collection of the hostnames that used to have regions<a name="line.1411"></a>
@@ -1434,13 +1434,13 @@
<span class="sourceLineNo">1426</span> ServerName oldServerName = entry.getValue();<a name="line.1426"></a>
<span class="sourceLineNo">1427</span> List<ServerName> localServers = new ArrayList<>();<a name="line.1427"></a>
<span class="sourceLineNo">1428</span> if (oldServerName != null) {<a name="line.1428"></a>
-<span class="sourceLineNo">1429</span> localServers = serversByHostname.get(oldServerName.getHostname());<a name="line.1429"></a>
+<span class="sourceLineNo">1429</span> localServers = serversByHostname.get(oldServerName.getHostnameLowerCase());<a name="line.1429"></a>
<span class="sourceLineNo">1430</span> }<a name="line.1430"></a>
<span class="sourceLineNo">1431</span> if (localServers.isEmpty()) {<a name="line.1431"></a>
<span class="sourceLineNo">1432</span> // No servers on the new cluster match up with this hostname, assign randomly, later.<a name="line.1432"></a>
<span class="sourceLineNo">1433</span> randomAssignRegions.add(region);<a name="line.1433"></a>
<span class="sourceLineNo">1434</span> if (oldServerName != null) {<a name="line.1434"></a>
-<span class="sourceLineNo">1435</span> oldHostsNoLongerPresent.add(oldServerName.getHostname());<a name="line.1435"></a>
+<span class="sourceLineNo">1435</span> oldHostsNoLongerPresent.add(oldServerName.getHostnameLowerCase());<a name="line.1435"></a>
<span class="sourceLineNo">1436</span> }<a name="line.1436"></a>
<span class="sourceLineNo">1437</span> } else if (localServers.size() == 1) {<a name="line.1437"></a>
<span class="sourceLineNo">1438</span> // the usual case - one new server on same host<a name="line.1438"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/883dde2f/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CellSet.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CellSet.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CellSet.html
index 3b38e55..6a62b71 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CellSet.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/CellSet.html
@@ -61,7 +61,7 @@
<span class="sourceLineNo">053</span> private final int numUniqueKeys;<a name="line.53"></a>
<span class="sourceLineNo">054</span><a name="line.54"></a>
<span class="sourceLineNo">055</span> CellSet(final CellComparator c) {<a name="line.55"></a>
-<span class="sourceLineNo">056</span> this.delegatee = new ConcurrentSkipListMap<>(c);<a name="line.56"></a>
+<span class="sourceLineNo">056</span> this.delegatee = new ConcurrentSkipListMap<>(c.getSimpleComparator());<a name="line.56"></a>
<span class="sourceLineNo">057</span> this.numUniqueKeys = UNKNOWN_NUM_UNIQUES;<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>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/883dde2f/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ChunkCreator.ChunkType.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ChunkCreator.ChunkType.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ChunkCreator.ChunkType.html
index d112942..21f7b0f 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ChunkCreator.ChunkType.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ChunkCreator.ChunkType.html
@@ -54,7 +54,7 @@
<span class="sourceLineNo">046</span>@InterfaceAudience.Private<a name="line.46"></a>
<span class="sourceLineNo">047</span>public class ChunkCreator {<a name="line.47"></a>
<span class="sourceLineNo">048</span> private static final Logger LOG = LoggerFactory.getLogger(ChunkCreator.class);<a name="line.48"></a>
-<span class="sourceLineNo">049</span> // monotonically increasing chunkid<a name="line.49"></a>
+<span class="sourceLineNo">049</span> // monotonically increasing chunkid. Starts at 1.<a name="line.49"></a>
<span class="sourceLineNo">050</span> private AtomicInteger chunkID = new AtomicInteger(1);<a name="line.50"></a>
<span class="sourceLineNo">051</span> // maps the chunk against the monotonically increasing chunk id. We need to preserve the<a name="line.51"></a>
<span class="sourceLineNo">052</span> // natural ordering of the key<a name="line.52"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/883dde2f/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ChunkCreator.MemStoreChunkPool.StatisticsThread.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ChunkCreator.MemStoreChunkPool.StatisticsThread.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ChunkCreator.MemStoreChunkPool.StatisticsThread.html
index d112942..21f7b0f 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ChunkCreator.MemStoreChunkPool.StatisticsThread.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ChunkCreator.MemStoreChunkPool.StatisticsThread.html
@@ -54,7 +54,7 @@
<span class="sourceLineNo">046</span>@InterfaceAudience.Private<a name="line.46"></a>
<span class="sourceLineNo">047</span>public class ChunkCreator {<a name="line.47"></a>
<span class="sourceLineNo">048</span> private static final Logger LOG = LoggerFactory.getLogger(ChunkCreator.class);<a name="line.48"></a>
-<span class="sourceLineNo">049</span> // monotonically increasing chunkid<a name="line.49"></a>
+<span class="sourceLineNo">049</span> // monotonically increasing chunkid. Starts at 1.<a name="line.49"></a>
<span class="sourceLineNo">050</span> private AtomicInteger chunkID = new AtomicInteger(1);<a name="line.50"></a>
<span class="sourceLineNo">051</span> // maps the chunk against the monotonically increasing chunk id. We need to preserve the<a name="line.51"></a>
<span class="sourceLineNo">052</span> // natural ordering of the key<a name="line.52"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/883dde2f/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ChunkCreator.MemStoreChunkPool.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ChunkCreator.MemStoreChunkPool.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ChunkCreator.MemStoreChunkPool.html
index d112942..21f7b0f 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ChunkCreator.MemStoreChunkPool.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ChunkCreator.MemStoreChunkPool.html
@@ -54,7 +54,7 @@
<span class="sourceLineNo">046</span>@InterfaceAudience.Private<a name="line.46"></a>
<span class="sourceLineNo">047</span>public class ChunkCreator {<a name="line.47"></a>
<span class="sourceLineNo">048</span> private static final Logger LOG = LoggerFactory.getLogger(ChunkCreator.class);<a name="line.48"></a>
-<span class="sourceLineNo">049</span> // monotonically increasing chunkid<a name="line.49"></a>
+<span class="sourceLineNo">049</span> // monotonically increasing chunkid. Starts at 1.<a name="line.49"></a>
<span class="sourceLineNo">050</span> private AtomicInteger chunkID = new AtomicInteger(1);<a name="line.50"></a>
<span class="sourceLineNo">051</span> // maps the chunk against the monotonically increasing chunk id. We need to preserve the<a name="line.51"></a>
<span class="sourceLineNo">052</span> // natural ordering of the key<a name="line.52"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/883dde2f/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ChunkCreator.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ChunkCreator.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ChunkCreator.html
index d112942..21f7b0f 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ChunkCreator.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ChunkCreator.html
@@ -54,7 +54,7 @@
<span class="sourceLineNo">046</span>@InterfaceAudience.Private<a name="line.46"></a>
<span class="sourceLineNo">047</span>public class ChunkCreator {<a name="line.47"></a>
<span class="sourceLineNo">048</span> private static final Logger LOG = LoggerFactory.getLogger(ChunkCreator.class);<a name="line.48"></a>
-<span class="sourceLineNo">049</span> // monotonically increasing chunkid<a name="line.49"></a>
+<span class="sourceLineNo">049</span> // monotonically increasing chunkid. Starts at 1.<a name="line.49"></a>
<span class="sourceLineNo">050</span> private AtomicInteger chunkID = new AtomicInteger(1);<a name="line.50"></a>
<span class="sourceLineNo">051</span> // maps the chunk against the monotonically increasing chunk id. We need to preserve the<a name="line.51"></a>
<span class="sourceLineNo">052</span> // natural ordering of the key<a name="line.52"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/883dde2f/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.BatchOperation.Visitor.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.BatchOperation.Visitor.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.BatchOperation.Visitor.html
index 7d27402..3da432b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.BatchOperation.Visitor.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.BatchOperation.Visitor.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.BatchOperation.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.BatchOperation.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.BatchOperation.html
index 7d27402..3da432b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.BatchOperation.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.BatchOperation.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.BulkLoadListener.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.BulkLoadListener.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.BulkLoadListener.html
index 7d27402..3da432b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.BulkLoadListener.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.BulkLoadListener.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.FlushResult.Result.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.FlushResult.Result.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.FlushResult.Result.html
index 7d27402..3da432b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.FlushResult.Result.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.FlushResult.Result.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.FlushResult.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.FlushResult.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.FlushResult.html
index 7d27402..3da432b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.FlushResult.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.FlushResult.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.FlushResultImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.FlushResultImpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.FlushResultImpl.html
index 7d27402..3da432b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.FlushResultImpl.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.FlushResultImpl.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.MutationBatchOperation.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.MutationBatchOperation.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.MutationBatchOperation.html
index 7d27402..3da432b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.MutationBatchOperation.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.MutationBatchOperation.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.ObservedExceptionsInBatch.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.ObservedExceptionsInBatch.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.ObservedExceptionsInBatch.html
index 7d27402..3da432b 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.ObservedExceptionsInBatch.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HRegion.ObservedExceptionsInBatch.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>