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/10/26 14:54:03 UTC
[24/38] hbase-site git commit: Published site at
0ab7c3a18906fcf33af38da29c211ac7fcb46492.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fa850293/devapidocs/src-html/org/apache/hadoop/hbase/master/replication/RefreshPeerProcedure.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/replication/RefreshPeerProcedure.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/replication/RefreshPeerProcedure.html
index e1b2372..0b4f8d6 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/replication/RefreshPeerProcedure.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/replication/RefreshPeerProcedure.html
@@ -214,21 +214,26 @@
<span class="sourceLineNo">206</span> }<a name="line.206"></a>
<span class="sourceLineNo">207</span><a name="line.207"></a>
<span class="sourceLineNo">208</span> @Override<a name="line.208"></a>
-<span class="sourceLineNo">209</span> protected void serializeStateData(ProcedureStateSerializer serializer) throws IOException {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> serializer.serialize(<a name="line.210"></a>
-<span class="sourceLineNo">211</span> RefreshPeerStateData.newBuilder().setPeerId(peerId).setType(toPeerModificationType(type))<a name="line.211"></a>
-<span class="sourceLineNo">212</span> .setTargetServer(ProtobufUtil.toServerName(targetServer)).setStage(stage).build());<a name="line.212"></a>
-<span class="sourceLineNo">213</span> }<a name="line.213"></a>
-<span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span> @Override<a name="line.215"></a>
-<span class="sourceLineNo">216</span> protected void deserializeStateData(ProcedureStateSerializer serializer) throws IOException {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> RefreshPeerStateData data = serializer.deserialize(RefreshPeerStateData.class);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> peerId = data.getPeerId();<a name="line.218"></a>
-<span class="sourceLineNo">219</span> type = toPeerOperationType(data.getType());<a name="line.219"></a>
-<span class="sourceLineNo">220</span> targetServer = ProtobufUtil.toServerName(data.getTargetServer());<a name="line.220"></a>
-<span class="sourceLineNo">221</span> stage = data.getStage();<a name="line.221"></a>
-<span class="sourceLineNo">222</span> }<a name="line.222"></a>
-<span class="sourceLineNo">223</span>}<a name="line.223"></a>
+<span class="sourceLineNo">209</span> protected boolean waitInitialized(MasterProcedureEnv env) {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> return env.waitInitialized(this);<a name="line.210"></a>
+<span class="sourceLineNo">211</span> }<a name="line.211"></a>
+<span class="sourceLineNo">212</span><a name="line.212"></a>
+<span class="sourceLineNo">213</span> @Override<a name="line.213"></a>
+<span class="sourceLineNo">214</span> protected void serializeStateData(ProcedureStateSerializer serializer) throws IOException {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> serializer.serialize(<a name="line.215"></a>
+<span class="sourceLineNo">216</span> RefreshPeerStateData.newBuilder().setPeerId(peerId).setType(toPeerModificationType(type))<a name="line.216"></a>
+<span class="sourceLineNo">217</span> .setTargetServer(ProtobufUtil.toServerName(targetServer)).setStage(stage).build());<a name="line.217"></a>
+<span class="sourceLineNo">218</span> }<a name="line.218"></a>
+<span class="sourceLineNo">219</span><a name="line.219"></a>
+<span class="sourceLineNo">220</span> @Override<a name="line.220"></a>
+<span class="sourceLineNo">221</span> protected void deserializeStateData(ProcedureStateSerializer serializer) throws IOException {<a name="line.221"></a>
+<span class="sourceLineNo">222</span> RefreshPeerStateData data = serializer.deserialize(RefreshPeerStateData.class);<a name="line.222"></a>
+<span class="sourceLineNo">223</span> peerId = data.getPeerId();<a name="line.223"></a>
+<span class="sourceLineNo">224</span> type = toPeerOperationType(data.getType());<a name="line.224"></a>
+<span class="sourceLineNo">225</span> targetServer = ProtobufUtil.toServerName(data.getTargetServer());<a name="line.225"></a>
+<span class="sourceLineNo">226</span> stage = data.getStage();<a name="line.226"></a>
+<span class="sourceLineNo">227</span> }<a name="line.227"></a>
+<span class="sourceLineNo">228</span>}<a name="line.228"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fa850293/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.DeleteState.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.DeleteState.html b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.DeleteState.html
index dc5908e..f55a7ed 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.DeleteState.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.DeleteState.html
@@ -384,123 +384,105 @@
<span class="sourceLineNo">376</span> }<a name="line.376"></a>
<span class="sourceLineNo">377</span><a name="line.377"></a>
<span class="sourceLineNo">378</span> private BitSetNode getOrCreateNode(long procId) {<a name="line.378"></a>
-<span class="sourceLineNo">379</span> // See HBASE-20973, grow or merge can lead to ArrayIndexOutOfBoundsException<a name="line.379"></a>
-<span class="sourceLineNo">380</span> // The root cause is not revealed yet, disable grow or merge for now<a name="line.380"></a>
-<span class="sourceLineNo">381</span> return getOrCreateNodeNoGrowOrMerge(procId);<a name="line.381"></a>
-<span class="sourceLineNo">382</span> }<a name="line.382"></a>
-<span class="sourceLineNo">383</span><a name="line.383"></a>
-<span class="sourceLineNo">384</span> private BitSetNode getOrCreateNodeNoGrowOrMerge(long procId) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span> Map.Entry<Long, BitSetNode> entry = map.floorEntry(procId);<a name="line.385"></a>
-<span class="sourceLineNo">386</span> if (entry != null && entry.getValue().contains(procId)) {<a name="line.386"></a>
-<span class="sourceLineNo">387</span> return entry.getValue();<a name="line.387"></a>
-<span class="sourceLineNo">388</span> } else {<a name="line.388"></a>
-<span class="sourceLineNo">389</span> BitSetNode node = new BitSetNode(procId, partial);<a name="line.389"></a>
-<span class="sourceLineNo">390</span> assert !map.containsKey(node.getStart());<a name="line.390"></a>
-<span class="sourceLineNo">391</span> map.put(node.getStart(), node);<a name="line.391"></a>
-<span class="sourceLineNo">392</span> return node;<a name="line.392"></a>
-<span class="sourceLineNo">393</span> }<a name="line.393"></a>
-<span class="sourceLineNo">394</span> }<a name="line.394"></a>
-<span class="sourceLineNo">395</span><a name="line.395"></a>
-<span class="sourceLineNo">396</span> private BitSetNode getOrCreateNodeWithGrowOrMerge(long procId) {<a name="line.396"></a>
-<span class="sourceLineNo">397</span> // If procId can fit in left node (directly or by growing it)<a name="line.397"></a>
-<span class="sourceLineNo">398</span> BitSetNode leftNode = null;<a name="line.398"></a>
-<span class="sourceLineNo">399</span> boolean leftCanGrow = false;<a name="line.399"></a>
-<span class="sourceLineNo">400</span> Map.Entry<Long, BitSetNode> leftEntry = map.floorEntry(procId);<a name="line.400"></a>
-<span class="sourceLineNo">401</span> if (leftEntry != null) {<a name="line.401"></a>
-<span class="sourceLineNo">402</span> leftNode = leftEntry.getValue();<a name="line.402"></a>
-<span class="sourceLineNo">403</span> if (leftNode.contains(procId)) {<a name="line.403"></a>
-<span class="sourceLineNo">404</span> return leftNode;<a name="line.404"></a>
-<span class="sourceLineNo">405</span> }<a name="line.405"></a>
-<span class="sourceLineNo">406</span> leftCanGrow = leftNode.canGrow(procId);<a name="line.406"></a>
-<span class="sourceLineNo">407</span> }<a name="line.407"></a>
-<span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span> // If procId can fit in right node (directly or by growing it)<a name="line.409"></a>
-<span class="sourceLineNo">410</span> BitSetNode rightNode = null;<a name="line.410"></a>
-<span class="sourceLineNo">411</span> boolean rightCanGrow = false;<a name="line.411"></a>
-<span class="sourceLineNo">412</span> Map.Entry<Long, BitSetNode> rightEntry = map.ceilingEntry(procId);<a name="line.412"></a>
-<span class="sourceLineNo">413</span> if (rightEntry != null) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> rightNode = rightEntry.getValue();<a name="line.414"></a>
-<span class="sourceLineNo">415</span> rightCanGrow = rightNode.canGrow(procId);<a name="line.415"></a>
-<span class="sourceLineNo">416</span> if (leftNode != null) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span> if (leftNode.canMerge(rightNode)) {<a name="line.417"></a>
-<span class="sourceLineNo">418</span> // merge left and right node<a name="line.418"></a>
-<span class="sourceLineNo">419</span> return mergeNodes(leftNode, rightNode);<a name="line.419"></a>
-<span class="sourceLineNo">420</span> }<a name="line.420"></a>
-<span class="sourceLineNo">421</span><a name="line.421"></a>
-<span class="sourceLineNo">422</span> // If left and right nodes can not merge, decide which one to grow.<a name="line.422"></a>
-<span class="sourceLineNo">423</span> if (leftCanGrow && rightCanGrow) {<a name="line.423"></a>
-<span class="sourceLineNo">424</span> if ((procId - leftNode.getEnd()) <= (rightNode.getStart() - procId)) {<a name="line.424"></a>
-<span class="sourceLineNo">425</span> return growNode(leftNode, procId);<a name="line.425"></a>
-<span class="sourceLineNo">426</span> }<a name="line.426"></a>
-<span class="sourceLineNo">427</span> return growNode(rightNode, procId);<a name="line.427"></a>
-<span class="sourceLineNo">428</span> }<a name="line.428"></a>
-<span class="sourceLineNo">429</span> }<a name="line.429"></a>
-<span class="sourceLineNo">430</span> }<a name="line.430"></a>
-<span class="sourceLineNo">431</span><a name="line.431"></a>
-<span class="sourceLineNo">432</span> // grow the left node<a name="line.432"></a>
-<span class="sourceLineNo">433</span> if (leftCanGrow) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> return growNode(leftNode, procId);<a name="line.434"></a>
-<span class="sourceLineNo">435</span> }<a name="line.435"></a>
-<span class="sourceLineNo">436</span><a name="line.436"></a>
-<span class="sourceLineNo">437</span> // grow the right node<a name="line.437"></a>
-<span class="sourceLineNo">438</span> if (rightCanGrow) {<a name="line.438"></a>
-<span class="sourceLineNo">439</span> return growNode(rightNode, procId);<a name="line.439"></a>
-<span class="sourceLineNo">440</span> }<a name="line.440"></a>
-<span class="sourceLineNo">441</span><a name="line.441"></a>
-<span class="sourceLineNo">442</span> // add new node if there are no left/right nodes which can be used.<a name="line.442"></a>
-<span class="sourceLineNo">443</span> BitSetNode node = new BitSetNode(procId, partial);<a name="line.443"></a>
-<span class="sourceLineNo">444</span> map.put(node.getStart(), node);<a name="line.444"></a>
-<span class="sourceLineNo">445</span> return node;<a name="line.445"></a>
-<span class="sourceLineNo">446</span> }<a name="line.446"></a>
-<span class="sourceLineNo">447</span><a name="line.447"></a>
-<span class="sourceLineNo">448</span> /**<a name="line.448"></a>
-<span class="sourceLineNo">449</span> * Grows {@code node} to contain {@code procId} and updates the map.<a name="line.449"></a>
-<span class="sourceLineNo">450</span> * @return {@link BitSetNode} instance which contains {@code procId}.<a name="line.450"></a>
-<span class="sourceLineNo">451</span> */<a name="line.451"></a>
-<span class="sourceLineNo">452</span> private BitSetNode growNode(BitSetNode node, long procId) {<a name="line.452"></a>
-<span class="sourceLineNo">453</span> map.remove(node.getStart());<a name="line.453"></a>
-<span class="sourceLineNo">454</span> node.grow(procId);<a name="line.454"></a>
-<span class="sourceLineNo">455</span> map.put(node.getStart(), node);<a name="line.455"></a>
-<span class="sourceLineNo">456</span> return node;<a name="line.456"></a>
-<span class="sourceLineNo">457</span> }<a name="line.457"></a>
-<span class="sourceLineNo">458</span><a name="line.458"></a>
-<span class="sourceLineNo">459</span> /**<a name="line.459"></a>
-<span class="sourceLineNo">460</span> * Merges {@code leftNode} & {@code rightNode} and updates the map.<a name="line.460"></a>
-<span class="sourceLineNo">461</span> */<a name="line.461"></a>
-<span class="sourceLineNo">462</span> private BitSetNode mergeNodes(BitSetNode leftNode, BitSetNode rightNode) {<a name="line.462"></a>
-<span class="sourceLineNo">463</span> assert leftNode.getStart() < rightNode.getStart();<a name="line.463"></a>
-<span class="sourceLineNo">464</span> leftNode.merge(rightNode);<a name="line.464"></a>
-<span class="sourceLineNo">465</span> map.remove(rightNode.getStart());<a name="line.465"></a>
-<span class="sourceLineNo">466</span> return leftNode;<a name="line.466"></a>
-<span class="sourceLineNo">467</span> }<a name="line.467"></a>
-<span class="sourceLineNo">468</span><a name="line.468"></a>
-<span class="sourceLineNo">469</span> public void dump() {<a name="line.469"></a>
-<span class="sourceLineNo">470</span> System.out.println("map " + map.size());<a name="line.470"></a>
-<span class="sourceLineNo">471</span> System.out.println("isAllModified " + isAllModified());<a name="line.471"></a>
-<span class="sourceLineNo">472</span> System.out.println("isEmpty " + isEmpty());<a name="line.472"></a>
-<span class="sourceLineNo">473</span> for (Map.Entry<Long, BitSetNode> entry : map.entrySet()) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span> entry.getValue().dump();<a name="line.474"></a>
-<span class="sourceLineNo">475</span> }<a name="line.475"></a>
+<span class="sourceLineNo">379</span> // If procId can fit in left node (directly or by growing it)<a name="line.379"></a>
+<span class="sourceLineNo">380</span> BitSetNode leftNode = null;<a name="line.380"></a>
+<span class="sourceLineNo">381</span> boolean leftCanGrow = false;<a name="line.381"></a>
+<span class="sourceLineNo">382</span> Map.Entry<Long, BitSetNode> leftEntry = map.floorEntry(procId);<a name="line.382"></a>
+<span class="sourceLineNo">383</span> if (leftEntry != null) {<a name="line.383"></a>
+<span class="sourceLineNo">384</span> leftNode = leftEntry.getValue();<a name="line.384"></a>
+<span class="sourceLineNo">385</span> if (leftNode.contains(procId)) {<a name="line.385"></a>
+<span class="sourceLineNo">386</span> return leftNode;<a name="line.386"></a>
+<span class="sourceLineNo">387</span> }<a name="line.387"></a>
+<span class="sourceLineNo">388</span> leftCanGrow = leftNode.canGrow(procId);<a name="line.388"></a>
+<span class="sourceLineNo">389</span> }<a name="line.389"></a>
+<span class="sourceLineNo">390</span><a name="line.390"></a>
+<span class="sourceLineNo">391</span> // If procId can fit in right node (directly or by growing it)<a name="line.391"></a>
+<span class="sourceLineNo">392</span> BitSetNode rightNode = null;<a name="line.392"></a>
+<span class="sourceLineNo">393</span> boolean rightCanGrow = false;<a name="line.393"></a>
+<span class="sourceLineNo">394</span> Map.Entry<Long, BitSetNode> rightEntry = map.ceilingEntry(procId);<a name="line.394"></a>
+<span class="sourceLineNo">395</span> if (rightEntry != null) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span> rightNode = rightEntry.getValue();<a name="line.396"></a>
+<span class="sourceLineNo">397</span> rightCanGrow = rightNode.canGrow(procId);<a name="line.397"></a>
+<span class="sourceLineNo">398</span> if (leftNode != null) {<a name="line.398"></a>
+<span class="sourceLineNo">399</span> if (leftNode.canMerge(rightNode)) {<a name="line.399"></a>
+<span class="sourceLineNo">400</span> // merge left and right node<a name="line.400"></a>
+<span class="sourceLineNo">401</span> return mergeNodes(leftNode, rightNode);<a name="line.401"></a>
+<span class="sourceLineNo">402</span> }<a name="line.402"></a>
+<span class="sourceLineNo">403</span><a name="line.403"></a>
+<span class="sourceLineNo">404</span> // If left and right nodes can not merge, decide which one to grow.<a name="line.404"></a>
+<span class="sourceLineNo">405</span> if (leftCanGrow && rightCanGrow) {<a name="line.405"></a>
+<span class="sourceLineNo">406</span> if ((procId - leftNode.getEnd()) <= (rightNode.getStart() - procId)) {<a name="line.406"></a>
+<span class="sourceLineNo">407</span> return growNode(leftNode, procId);<a name="line.407"></a>
+<span class="sourceLineNo">408</span> }<a name="line.408"></a>
+<span class="sourceLineNo">409</span> return growNode(rightNode, procId);<a name="line.409"></a>
+<span class="sourceLineNo">410</span> }<a name="line.410"></a>
+<span class="sourceLineNo">411</span> }<a name="line.411"></a>
+<span class="sourceLineNo">412</span> }<a name="line.412"></a>
+<span class="sourceLineNo">413</span><a name="line.413"></a>
+<span class="sourceLineNo">414</span> // grow the left node<a name="line.414"></a>
+<span class="sourceLineNo">415</span> if (leftCanGrow) {<a name="line.415"></a>
+<span class="sourceLineNo">416</span> return growNode(leftNode, procId);<a name="line.416"></a>
+<span class="sourceLineNo">417</span> }<a name="line.417"></a>
+<span class="sourceLineNo">418</span><a name="line.418"></a>
+<span class="sourceLineNo">419</span> // grow the right node<a name="line.419"></a>
+<span class="sourceLineNo">420</span> if (rightCanGrow) {<a name="line.420"></a>
+<span class="sourceLineNo">421</span> return growNode(rightNode, procId);<a name="line.421"></a>
+<span class="sourceLineNo">422</span> }<a name="line.422"></a>
+<span class="sourceLineNo">423</span><a name="line.423"></a>
+<span class="sourceLineNo">424</span> // add new node if there are no left/right nodes which can be used.<a name="line.424"></a>
+<span class="sourceLineNo">425</span> BitSetNode node = new BitSetNode(procId, partial);<a name="line.425"></a>
+<span class="sourceLineNo">426</span> map.put(node.getStart(), node);<a name="line.426"></a>
+<span class="sourceLineNo">427</span> return node;<a name="line.427"></a>
+<span class="sourceLineNo">428</span> }<a name="line.428"></a>
+<span class="sourceLineNo">429</span><a name="line.429"></a>
+<span class="sourceLineNo">430</span> /**<a name="line.430"></a>
+<span class="sourceLineNo">431</span> * Grows {@code node} to contain {@code procId} and updates the map.<a name="line.431"></a>
+<span class="sourceLineNo">432</span> * @return {@link BitSetNode} instance which contains {@code procId}.<a name="line.432"></a>
+<span class="sourceLineNo">433</span> */<a name="line.433"></a>
+<span class="sourceLineNo">434</span> private BitSetNode growNode(BitSetNode node, long procId) {<a name="line.434"></a>
+<span class="sourceLineNo">435</span> map.remove(node.getStart());<a name="line.435"></a>
+<span class="sourceLineNo">436</span> node.grow(procId);<a name="line.436"></a>
+<span class="sourceLineNo">437</span> map.put(node.getStart(), node);<a name="line.437"></a>
+<span class="sourceLineNo">438</span> return node;<a name="line.438"></a>
+<span class="sourceLineNo">439</span> }<a name="line.439"></a>
+<span class="sourceLineNo">440</span><a name="line.440"></a>
+<span class="sourceLineNo">441</span> /**<a name="line.441"></a>
+<span class="sourceLineNo">442</span> * Merges {@code leftNode} & {@code rightNode} and updates the map.<a name="line.442"></a>
+<span class="sourceLineNo">443</span> */<a name="line.443"></a>
+<span class="sourceLineNo">444</span> private BitSetNode mergeNodes(BitSetNode leftNode, BitSetNode rightNode) {<a name="line.444"></a>
+<span class="sourceLineNo">445</span> assert leftNode.getStart() < rightNode.getStart();<a name="line.445"></a>
+<span class="sourceLineNo">446</span> leftNode.merge(rightNode);<a name="line.446"></a>
+<span class="sourceLineNo">447</span> map.remove(rightNode.getStart());<a name="line.447"></a>
+<span class="sourceLineNo">448</span> return leftNode;<a name="line.448"></a>
+<span class="sourceLineNo">449</span> }<a name="line.449"></a>
+<span class="sourceLineNo">450</span><a name="line.450"></a>
+<span class="sourceLineNo">451</span> public void dump() {<a name="line.451"></a>
+<span class="sourceLineNo">452</span> System.out.println("map " + map.size());<a name="line.452"></a>
+<span class="sourceLineNo">453</span> System.out.println("isAllModified " + isAllModified());<a name="line.453"></a>
+<span class="sourceLineNo">454</span> System.out.println("isEmpty " + isEmpty());<a name="line.454"></a>
+<span class="sourceLineNo">455</span> for (Map.Entry<Long, BitSetNode> entry : map.entrySet()) {<a name="line.455"></a>
+<span class="sourceLineNo">456</span> entry.getValue().dump();<a name="line.456"></a>
+<span class="sourceLineNo">457</span> }<a name="line.457"></a>
+<span class="sourceLineNo">458</span> }<a name="line.458"></a>
+<span class="sourceLineNo">459</span><a name="line.459"></a>
+<span class="sourceLineNo">460</span> // ========================================================================<a name="line.460"></a>
+<span class="sourceLineNo">461</span> // Convert to/from Protocol Buffer.<a name="line.461"></a>
+<span class="sourceLineNo">462</span> // ========================================================================<a name="line.462"></a>
+<span class="sourceLineNo">463</span><a name="line.463"></a>
+<span class="sourceLineNo">464</span> /**<a name="line.464"></a>
+<span class="sourceLineNo">465</span> * Builds<a name="line.465"></a>
+<span class="sourceLineNo">466</span> * org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker<a name="line.466"></a>
+<span class="sourceLineNo">467</span> * protocol buffer from current state.<a name="line.467"></a>
+<span class="sourceLineNo">468</span> */<a name="line.468"></a>
+<span class="sourceLineNo">469</span> public ProcedureProtos.ProcedureStoreTracker toProto() throws IOException {<a name="line.469"></a>
+<span class="sourceLineNo">470</span> ProcedureProtos.ProcedureStoreTracker.Builder builder =<a name="line.470"></a>
+<span class="sourceLineNo">471</span> ProcedureProtos.ProcedureStoreTracker.newBuilder();<a name="line.471"></a>
+<span class="sourceLineNo">472</span> for (Map.Entry<Long, BitSetNode> entry : map.entrySet()) {<a name="line.472"></a>
+<span class="sourceLineNo">473</span> builder.addNode(entry.getValue().convert());<a name="line.473"></a>
+<span class="sourceLineNo">474</span> }<a name="line.474"></a>
+<span class="sourceLineNo">475</span> return builder.build();<a name="line.475"></a>
<span class="sourceLineNo">476</span> }<a name="line.476"></a>
-<span class="sourceLineNo">477</span><a name="line.477"></a>
-<span class="sourceLineNo">478</span> // ========================================================================<a name="line.478"></a>
-<span class="sourceLineNo">479</span> // Convert to/from Protocol Buffer.<a name="line.479"></a>
-<span class="sourceLineNo">480</span> // ========================================================================<a name="line.480"></a>
-<span class="sourceLineNo">481</span><a name="line.481"></a>
-<span class="sourceLineNo">482</span> /**<a name="line.482"></a>
-<span class="sourceLineNo">483</span> * Builds<a name="line.483"></a>
-<span class="sourceLineNo">484</span> * org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker<a name="line.484"></a>
-<span class="sourceLineNo">485</span> * protocol buffer from current state.<a name="line.485"></a>
-<span class="sourceLineNo">486</span> */<a name="line.486"></a>
-<span class="sourceLineNo">487</span> public ProcedureProtos.ProcedureStoreTracker toProto() throws IOException {<a name="line.487"></a>
-<span class="sourceLineNo">488</span> ProcedureProtos.ProcedureStoreTracker.Builder builder =<a name="line.488"></a>
-<span class="sourceLineNo">489</span> ProcedureProtos.ProcedureStoreTracker.newBuilder();<a name="line.489"></a>
-<span class="sourceLineNo">490</span> for (Map.Entry<Long, BitSetNode> entry : map.entrySet()) {<a name="line.490"></a>
-<span class="sourceLineNo">491</span> builder.addNode(entry.getValue().convert());<a name="line.491"></a>
-<span class="sourceLineNo">492</span> }<a name="line.492"></a>
-<span class="sourceLineNo">493</span> return builder.build();<a name="line.493"></a>
-<span class="sourceLineNo">494</span> }<a name="line.494"></a>
-<span class="sourceLineNo">495</span>}<a name="line.495"></a>
+<span class="sourceLineNo">477</span>}<a name="line.477"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fa850293/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.html b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.html
index dc5908e..f55a7ed 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/ProcedureStoreTracker.html
@@ -384,123 +384,105 @@
<span class="sourceLineNo">376</span> }<a name="line.376"></a>
<span class="sourceLineNo">377</span><a name="line.377"></a>
<span class="sourceLineNo">378</span> private BitSetNode getOrCreateNode(long procId) {<a name="line.378"></a>
-<span class="sourceLineNo">379</span> // See HBASE-20973, grow or merge can lead to ArrayIndexOutOfBoundsException<a name="line.379"></a>
-<span class="sourceLineNo">380</span> // The root cause is not revealed yet, disable grow or merge for now<a name="line.380"></a>
-<span class="sourceLineNo">381</span> return getOrCreateNodeNoGrowOrMerge(procId);<a name="line.381"></a>
-<span class="sourceLineNo">382</span> }<a name="line.382"></a>
-<span class="sourceLineNo">383</span><a name="line.383"></a>
-<span class="sourceLineNo">384</span> private BitSetNode getOrCreateNodeNoGrowOrMerge(long procId) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span> Map.Entry<Long, BitSetNode> entry = map.floorEntry(procId);<a name="line.385"></a>
-<span class="sourceLineNo">386</span> if (entry != null && entry.getValue().contains(procId)) {<a name="line.386"></a>
-<span class="sourceLineNo">387</span> return entry.getValue();<a name="line.387"></a>
-<span class="sourceLineNo">388</span> } else {<a name="line.388"></a>
-<span class="sourceLineNo">389</span> BitSetNode node = new BitSetNode(procId, partial);<a name="line.389"></a>
-<span class="sourceLineNo">390</span> assert !map.containsKey(node.getStart());<a name="line.390"></a>
-<span class="sourceLineNo">391</span> map.put(node.getStart(), node);<a name="line.391"></a>
-<span class="sourceLineNo">392</span> return node;<a name="line.392"></a>
-<span class="sourceLineNo">393</span> }<a name="line.393"></a>
-<span class="sourceLineNo">394</span> }<a name="line.394"></a>
-<span class="sourceLineNo">395</span><a name="line.395"></a>
-<span class="sourceLineNo">396</span> private BitSetNode getOrCreateNodeWithGrowOrMerge(long procId) {<a name="line.396"></a>
-<span class="sourceLineNo">397</span> // If procId can fit in left node (directly or by growing it)<a name="line.397"></a>
-<span class="sourceLineNo">398</span> BitSetNode leftNode = null;<a name="line.398"></a>
-<span class="sourceLineNo">399</span> boolean leftCanGrow = false;<a name="line.399"></a>
-<span class="sourceLineNo">400</span> Map.Entry<Long, BitSetNode> leftEntry = map.floorEntry(procId);<a name="line.400"></a>
-<span class="sourceLineNo">401</span> if (leftEntry != null) {<a name="line.401"></a>
-<span class="sourceLineNo">402</span> leftNode = leftEntry.getValue();<a name="line.402"></a>
-<span class="sourceLineNo">403</span> if (leftNode.contains(procId)) {<a name="line.403"></a>
-<span class="sourceLineNo">404</span> return leftNode;<a name="line.404"></a>
-<span class="sourceLineNo">405</span> }<a name="line.405"></a>
-<span class="sourceLineNo">406</span> leftCanGrow = leftNode.canGrow(procId);<a name="line.406"></a>
-<span class="sourceLineNo">407</span> }<a name="line.407"></a>
-<span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span> // If procId can fit in right node (directly or by growing it)<a name="line.409"></a>
-<span class="sourceLineNo">410</span> BitSetNode rightNode = null;<a name="line.410"></a>
-<span class="sourceLineNo">411</span> boolean rightCanGrow = false;<a name="line.411"></a>
-<span class="sourceLineNo">412</span> Map.Entry<Long, BitSetNode> rightEntry = map.ceilingEntry(procId);<a name="line.412"></a>
-<span class="sourceLineNo">413</span> if (rightEntry != null) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> rightNode = rightEntry.getValue();<a name="line.414"></a>
-<span class="sourceLineNo">415</span> rightCanGrow = rightNode.canGrow(procId);<a name="line.415"></a>
-<span class="sourceLineNo">416</span> if (leftNode != null) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span> if (leftNode.canMerge(rightNode)) {<a name="line.417"></a>
-<span class="sourceLineNo">418</span> // merge left and right node<a name="line.418"></a>
-<span class="sourceLineNo">419</span> return mergeNodes(leftNode, rightNode);<a name="line.419"></a>
-<span class="sourceLineNo">420</span> }<a name="line.420"></a>
-<span class="sourceLineNo">421</span><a name="line.421"></a>
-<span class="sourceLineNo">422</span> // If left and right nodes can not merge, decide which one to grow.<a name="line.422"></a>
-<span class="sourceLineNo">423</span> if (leftCanGrow && rightCanGrow) {<a name="line.423"></a>
-<span class="sourceLineNo">424</span> if ((procId - leftNode.getEnd()) <= (rightNode.getStart() - procId)) {<a name="line.424"></a>
-<span class="sourceLineNo">425</span> return growNode(leftNode, procId);<a name="line.425"></a>
-<span class="sourceLineNo">426</span> }<a name="line.426"></a>
-<span class="sourceLineNo">427</span> return growNode(rightNode, procId);<a name="line.427"></a>
-<span class="sourceLineNo">428</span> }<a name="line.428"></a>
-<span class="sourceLineNo">429</span> }<a name="line.429"></a>
-<span class="sourceLineNo">430</span> }<a name="line.430"></a>
-<span class="sourceLineNo">431</span><a name="line.431"></a>
-<span class="sourceLineNo">432</span> // grow the left node<a name="line.432"></a>
-<span class="sourceLineNo">433</span> if (leftCanGrow) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> return growNode(leftNode, procId);<a name="line.434"></a>
-<span class="sourceLineNo">435</span> }<a name="line.435"></a>
-<span class="sourceLineNo">436</span><a name="line.436"></a>
-<span class="sourceLineNo">437</span> // grow the right node<a name="line.437"></a>
-<span class="sourceLineNo">438</span> if (rightCanGrow) {<a name="line.438"></a>
-<span class="sourceLineNo">439</span> return growNode(rightNode, procId);<a name="line.439"></a>
-<span class="sourceLineNo">440</span> }<a name="line.440"></a>
-<span class="sourceLineNo">441</span><a name="line.441"></a>
-<span class="sourceLineNo">442</span> // add new node if there are no left/right nodes which can be used.<a name="line.442"></a>
-<span class="sourceLineNo">443</span> BitSetNode node = new BitSetNode(procId, partial);<a name="line.443"></a>
-<span class="sourceLineNo">444</span> map.put(node.getStart(), node);<a name="line.444"></a>
-<span class="sourceLineNo">445</span> return node;<a name="line.445"></a>
-<span class="sourceLineNo">446</span> }<a name="line.446"></a>
-<span class="sourceLineNo">447</span><a name="line.447"></a>
-<span class="sourceLineNo">448</span> /**<a name="line.448"></a>
-<span class="sourceLineNo">449</span> * Grows {@code node} to contain {@code procId} and updates the map.<a name="line.449"></a>
-<span class="sourceLineNo">450</span> * @return {@link BitSetNode} instance which contains {@code procId}.<a name="line.450"></a>
-<span class="sourceLineNo">451</span> */<a name="line.451"></a>
-<span class="sourceLineNo">452</span> private BitSetNode growNode(BitSetNode node, long procId) {<a name="line.452"></a>
-<span class="sourceLineNo">453</span> map.remove(node.getStart());<a name="line.453"></a>
-<span class="sourceLineNo">454</span> node.grow(procId);<a name="line.454"></a>
-<span class="sourceLineNo">455</span> map.put(node.getStart(), node);<a name="line.455"></a>
-<span class="sourceLineNo">456</span> return node;<a name="line.456"></a>
-<span class="sourceLineNo">457</span> }<a name="line.457"></a>
-<span class="sourceLineNo">458</span><a name="line.458"></a>
-<span class="sourceLineNo">459</span> /**<a name="line.459"></a>
-<span class="sourceLineNo">460</span> * Merges {@code leftNode} & {@code rightNode} and updates the map.<a name="line.460"></a>
-<span class="sourceLineNo">461</span> */<a name="line.461"></a>
-<span class="sourceLineNo">462</span> private BitSetNode mergeNodes(BitSetNode leftNode, BitSetNode rightNode) {<a name="line.462"></a>
-<span class="sourceLineNo">463</span> assert leftNode.getStart() < rightNode.getStart();<a name="line.463"></a>
-<span class="sourceLineNo">464</span> leftNode.merge(rightNode);<a name="line.464"></a>
-<span class="sourceLineNo">465</span> map.remove(rightNode.getStart());<a name="line.465"></a>
-<span class="sourceLineNo">466</span> return leftNode;<a name="line.466"></a>
-<span class="sourceLineNo">467</span> }<a name="line.467"></a>
-<span class="sourceLineNo">468</span><a name="line.468"></a>
-<span class="sourceLineNo">469</span> public void dump() {<a name="line.469"></a>
-<span class="sourceLineNo">470</span> System.out.println("map " + map.size());<a name="line.470"></a>
-<span class="sourceLineNo">471</span> System.out.println("isAllModified " + isAllModified());<a name="line.471"></a>
-<span class="sourceLineNo">472</span> System.out.println("isEmpty " + isEmpty());<a name="line.472"></a>
-<span class="sourceLineNo">473</span> for (Map.Entry<Long, BitSetNode> entry : map.entrySet()) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span> entry.getValue().dump();<a name="line.474"></a>
-<span class="sourceLineNo">475</span> }<a name="line.475"></a>
+<span class="sourceLineNo">379</span> // If procId can fit in left node (directly or by growing it)<a name="line.379"></a>
+<span class="sourceLineNo">380</span> BitSetNode leftNode = null;<a name="line.380"></a>
+<span class="sourceLineNo">381</span> boolean leftCanGrow = false;<a name="line.381"></a>
+<span class="sourceLineNo">382</span> Map.Entry<Long, BitSetNode> leftEntry = map.floorEntry(procId);<a name="line.382"></a>
+<span class="sourceLineNo">383</span> if (leftEntry != null) {<a name="line.383"></a>
+<span class="sourceLineNo">384</span> leftNode = leftEntry.getValue();<a name="line.384"></a>
+<span class="sourceLineNo">385</span> if (leftNode.contains(procId)) {<a name="line.385"></a>
+<span class="sourceLineNo">386</span> return leftNode;<a name="line.386"></a>
+<span class="sourceLineNo">387</span> }<a name="line.387"></a>
+<span class="sourceLineNo">388</span> leftCanGrow = leftNode.canGrow(procId);<a name="line.388"></a>
+<span class="sourceLineNo">389</span> }<a name="line.389"></a>
+<span class="sourceLineNo">390</span><a name="line.390"></a>
+<span class="sourceLineNo">391</span> // If procId can fit in right node (directly or by growing it)<a name="line.391"></a>
+<span class="sourceLineNo">392</span> BitSetNode rightNode = null;<a name="line.392"></a>
+<span class="sourceLineNo">393</span> boolean rightCanGrow = false;<a name="line.393"></a>
+<span class="sourceLineNo">394</span> Map.Entry<Long, BitSetNode> rightEntry = map.ceilingEntry(procId);<a name="line.394"></a>
+<span class="sourceLineNo">395</span> if (rightEntry != null) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span> rightNode = rightEntry.getValue();<a name="line.396"></a>
+<span class="sourceLineNo">397</span> rightCanGrow = rightNode.canGrow(procId);<a name="line.397"></a>
+<span class="sourceLineNo">398</span> if (leftNode != null) {<a name="line.398"></a>
+<span class="sourceLineNo">399</span> if (leftNode.canMerge(rightNode)) {<a name="line.399"></a>
+<span class="sourceLineNo">400</span> // merge left and right node<a name="line.400"></a>
+<span class="sourceLineNo">401</span> return mergeNodes(leftNode, rightNode);<a name="line.401"></a>
+<span class="sourceLineNo">402</span> }<a name="line.402"></a>
+<span class="sourceLineNo">403</span><a name="line.403"></a>
+<span class="sourceLineNo">404</span> // If left and right nodes can not merge, decide which one to grow.<a name="line.404"></a>
+<span class="sourceLineNo">405</span> if (leftCanGrow && rightCanGrow) {<a name="line.405"></a>
+<span class="sourceLineNo">406</span> if ((procId - leftNode.getEnd()) <= (rightNode.getStart() - procId)) {<a name="line.406"></a>
+<span class="sourceLineNo">407</span> return growNode(leftNode, procId);<a name="line.407"></a>
+<span class="sourceLineNo">408</span> }<a name="line.408"></a>
+<span class="sourceLineNo">409</span> return growNode(rightNode, procId);<a name="line.409"></a>
+<span class="sourceLineNo">410</span> }<a name="line.410"></a>
+<span class="sourceLineNo">411</span> }<a name="line.411"></a>
+<span class="sourceLineNo">412</span> }<a name="line.412"></a>
+<span class="sourceLineNo">413</span><a name="line.413"></a>
+<span class="sourceLineNo">414</span> // grow the left node<a name="line.414"></a>
+<span class="sourceLineNo">415</span> if (leftCanGrow) {<a name="line.415"></a>
+<span class="sourceLineNo">416</span> return growNode(leftNode, procId);<a name="line.416"></a>
+<span class="sourceLineNo">417</span> }<a name="line.417"></a>
+<span class="sourceLineNo">418</span><a name="line.418"></a>
+<span class="sourceLineNo">419</span> // grow the right node<a name="line.419"></a>
+<span class="sourceLineNo">420</span> if (rightCanGrow) {<a name="line.420"></a>
+<span class="sourceLineNo">421</span> return growNode(rightNode, procId);<a name="line.421"></a>
+<span class="sourceLineNo">422</span> }<a name="line.422"></a>
+<span class="sourceLineNo">423</span><a name="line.423"></a>
+<span class="sourceLineNo">424</span> // add new node if there are no left/right nodes which can be used.<a name="line.424"></a>
+<span class="sourceLineNo">425</span> BitSetNode node = new BitSetNode(procId, partial);<a name="line.425"></a>
+<span class="sourceLineNo">426</span> map.put(node.getStart(), node);<a name="line.426"></a>
+<span class="sourceLineNo">427</span> return node;<a name="line.427"></a>
+<span class="sourceLineNo">428</span> }<a name="line.428"></a>
+<span class="sourceLineNo">429</span><a name="line.429"></a>
+<span class="sourceLineNo">430</span> /**<a name="line.430"></a>
+<span class="sourceLineNo">431</span> * Grows {@code node} to contain {@code procId} and updates the map.<a name="line.431"></a>
+<span class="sourceLineNo">432</span> * @return {@link BitSetNode} instance which contains {@code procId}.<a name="line.432"></a>
+<span class="sourceLineNo">433</span> */<a name="line.433"></a>
+<span class="sourceLineNo">434</span> private BitSetNode growNode(BitSetNode node, long procId) {<a name="line.434"></a>
+<span class="sourceLineNo">435</span> map.remove(node.getStart());<a name="line.435"></a>
+<span class="sourceLineNo">436</span> node.grow(procId);<a name="line.436"></a>
+<span class="sourceLineNo">437</span> map.put(node.getStart(), node);<a name="line.437"></a>
+<span class="sourceLineNo">438</span> return node;<a name="line.438"></a>
+<span class="sourceLineNo">439</span> }<a name="line.439"></a>
+<span class="sourceLineNo">440</span><a name="line.440"></a>
+<span class="sourceLineNo">441</span> /**<a name="line.441"></a>
+<span class="sourceLineNo">442</span> * Merges {@code leftNode} & {@code rightNode} and updates the map.<a name="line.442"></a>
+<span class="sourceLineNo">443</span> */<a name="line.443"></a>
+<span class="sourceLineNo">444</span> private BitSetNode mergeNodes(BitSetNode leftNode, BitSetNode rightNode) {<a name="line.444"></a>
+<span class="sourceLineNo">445</span> assert leftNode.getStart() < rightNode.getStart();<a name="line.445"></a>
+<span class="sourceLineNo">446</span> leftNode.merge(rightNode);<a name="line.446"></a>
+<span class="sourceLineNo">447</span> map.remove(rightNode.getStart());<a name="line.447"></a>
+<span class="sourceLineNo">448</span> return leftNode;<a name="line.448"></a>
+<span class="sourceLineNo">449</span> }<a name="line.449"></a>
+<span class="sourceLineNo">450</span><a name="line.450"></a>
+<span class="sourceLineNo">451</span> public void dump() {<a name="line.451"></a>
+<span class="sourceLineNo">452</span> System.out.println("map " + map.size());<a name="line.452"></a>
+<span class="sourceLineNo">453</span> System.out.println("isAllModified " + isAllModified());<a name="line.453"></a>
+<span class="sourceLineNo">454</span> System.out.println("isEmpty " + isEmpty());<a name="line.454"></a>
+<span class="sourceLineNo">455</span> for (Map.Entry<Long, BitSetNode> entry : map.entrySet()) {<a name="line.455"></a>
+<span class="sourceLineNo">456</span> entry.getValue().dump();<a name="line.456"></a>
+<span class="sourceLineNo">457</span> }<a name="line.457"></a>
+<span class="sourceLineNo">458</span> }<a name="line.458"></a>
+<span class="sourceLineNo">459</span><a name="line.459"></a>
+<span class="sourceLineNo">460</span> // ========================================================================<a name="line.460"></a>
+<span class="sourceLineNo">461</span> // Convert to/from Protocol Buffer.<a name="line.461"></a>
+<span class="sourceLineNo">462</span> // ========================================================================<a name="line.462"></a>
+<span class="sourceLineNo">463</span><a name="line.463"></a>
+<span class="sourceLineNo">464</span> /**<a name="line.464"></a>
+<span class="sourceLineNo">465</span> * Builds<a name="line.465"></a>
+<span class="sourceLineNo">466</span> * org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker<a name="line.466"></a>
+<span class="sourceLineNo">467</span> * protocol buffer from current state.<a name="line.467"></a>
+<span class="sourceLineNo">468</span> */<a name="line.468"></a>
+<span class="sourceLineNo">469</span> public ProcedureProtos.ProcedureStoreTracker toProto() throws IOException {<a name="line.469"></a>
+<span class="sourceLineNo">470</span> ProcedureProtos.ProcedureStoreTracker.Builder builder =<a name="line.470"></a>
+<span class="sourceLineNo">471</span> ProcedureProtos.ProcedureStoreTracker.newBuilder();<a name="line.471"></a>
+<span class="sourceLineNo">472</span> for (Map.Entry<Long, BitSetNode> entry : map.entrySet()) {<a name="line.472"></a>
+<span class="sourceLineNo">473</span> builder.addNode(entry.getValue().convert());<a name="line.473"></a>
+<span class="sourceLineNo">474</span> }<a name="line.474"></a>
+<span class="sourceLineNo">475</span> return builder.build();<a name="line.475"></a>
<span class="sourceLineNo">476</span> }<a name="line.476"></a>
-<span class="sourceLineNo">477</span><a name="line.477"></a>
-<span class="sourceLineNo">478</span> // ========================================================================<a name="line.478"></a>
-<span class="sourceLineNo">479</span> // Convert to/from Protocol Buffer.<a name="line.479"></a>
-<span class="sourceLineNo">480</span> // ========================================================================<a name="line.480"></a>
-<span class="sourceLineNo">481</span><a name="line.481"></a>
-<span class="sourceLineNo">482</span> /**<a name="line.482"></a>
-<span class="sourceLineNo">483</span> * Builds<a name="line.483"></a>
-<span class="sourceLineNo">484</span> * org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.ProcedureStoreTracker<a name="line.484"></a>
-<span class="sourceLineNo">485</span> * protocol buffer from current state.<a name="line.485"></a>
-<span class="sourceLineNo">486</span> */<a name="line.486"></a>
-<span class="sourceLineNo">487</span> public ProcedureProtos.ProcedureStoreTracker toProto() throws IOException {<a name="line.487"></a>
-<span class="sourceLineNo">488</span> ProcedureProtos.ProcedureStoreTracker.Builder builder =<a name="line.488"></a>
-<span class="sourceLineNo">489</span> ProcedureProtos.ProcedureStoreTracker.newBuilder();<a name="line.489"></a>
-<span class="sourceLineNo">490</span> for (Map.Entry<Long, BitSetNode> entry : map.entrySet()) {<a name="line.490"></a>
-<span class="sourceLineNo">491</span> builder.addNode(entry.getValue().convert());<a name="line.491"></a>
-<span class="sourceLineNo">492</span> }<a name="line.492"></a>
-<span class="sourceLineNo">493</span> return builder.build();<a name="line.493"></a>
-<span class="sourceLineNo">494</span> }<a name="line.494"></a>
-<span class="sourceLineNo">495</span>}<a name="line.495"></a>
+<span class="sourceLineNo">477</span>}<a name="line.477"></a>