[07/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1f2eeb22/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html
index 04bf42c..70c0a84 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.html
@@ -271,527 +271,533 @@
 <span class="sourceLineNo">263</span>    return Flow.HAS_MORE_STATE;<a 
name="line.263"></a>
 <span class="sourceLineNo">264</span>  }<a name="line.264"></a>
 <span class="sourceLineNo">265</span><a name="line.265"></a>
-<span class="sourceLineNo">266</span>  @Override<a name="line.266"></a>
-<span class="sourceLineNo">267</span>  protected void rollbackState(<a 
name="line.267"></a>
-<span class="sourceLineNo">268</span>      final MasterProcedureEnv env,<a 
name="line.268"></a>
-<span class="sourceLineNo">269</span>      final MergeTableRegionsState state) 
throws IOException, InterruptedException {<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    if (isTraceEnabled()) {<a 
name="line.270"></a>
-<span class="sourceLineNo">271</span>      LOG.trace(this + " rollback state=" 
+ state);<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    }<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span>    try {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>      switch (state) {<a 
name="line.275"></a>
-<span class="sourceLineNo">276</span>      case 
MERGE_TABLE_REGIONS_POST_OPERATION:<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      case 
MERGE_TABLE_REGIONS_OPEN_MERGED_REGION:<a name="line.277"></a>
-<span class="sourceLineNo">278</span>      case 
MERGE_TABLE_REGIONS_POST_MERGE_COMMIT_OPERATION:<a name="line.278"></a>
-<span class="sourceLineNo">279</span>      case 
MERGE_TABLE_REGIONS_UPDATE_META:<a name="line.279"></a>
-<span class="sourceLineNo">280</span>        String msg = this + " We are in 
the " + state + " state."<a name="line.280"></a>
-<span class="sourceLineNo">281</span>            + " It is complicated to 
rollback the merge operation that region server is working on."<a 
name="line.281"></a>
-<span class="sourceLineNo">282</span>            + " Rollback is not supported 
and we should let the merge operation to complete";<a name="line.282"></a>
-<span class="sourceLineNo">283</span>        LOG.warn(msg);<a 
name="line.283"></a>
-<span class="sourceLineNo">284</span>        // PONR<a name="line.284"></a>
-<span class="sourceLineNo">285</span>        throw new 
UnsupportedOperationException(this + " unhandled state=" + state);<a 
name="line.285"></a>
-<span class="sourceLineNo">286</span>      case 
MERGE_TABLE_REGIONS_PRE_MERGE_COMMIT_OPERATION:<a name="line.286"></a>
-<span class="sourceLineNo">287</span>        break;<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      case 
MERGE_TABLE_REGIONS_CREATE_MERGED_REGION:<a name="line.288"></a>
-<span class="sourceLineNo">289</span>        cleanupMergedRegion(env);<a 
name="line.289"></a>
-<span class="sourceLineNo">290</span>        break;<a name="line.290"></a>
-<span class="sourceLineNo">291</span>      case 
MERGE_TABLE_REGIONS_CLOSE_REGIONS:<a name="line.291"></a>
-<span class="sourceLineNo">292</span>        
rollbackCloseRegionsForMerge(env);<a name="line.292"></a>
+<span class="sourceLineNo">266</span>  /**<a name="line.266"></a>
+<span class="sourceLineNo">267</span>   * To rollback {@link 
MergeTableRegionsProcedure}, two AssignProcedures are asynchronously<a 
name="line.267"></a>
+<span class="sourceLineNo">268</span>   * submitted for each region to be 
merged (rollback doesn't wait on the completion of the<a name="line.268"></a>
+<span class="sourceLineNo">269</span>   * AssignProcedures) . This can be 
improved by changing rollback() to support sub-procedures.<a 
name="line.269"></a>
+<span class="sourceLineNo">270</span>   * See HBASE-19851 for details.<a 
name="line.270"></a>
+<span class="sourceLineNo">271</span>   */<a name="line.271"></a>
+<span class="sourceLineNo">272</span>  @Override<a name="line.272"></a>
+<span class="sourceLineNo">273</span>  protected void rollbackState(<a 
name="line.273"></a>
+<span class="sourceLineNo">274</span>      final MasterProcedureEnv env,<a 
name="line.274"></a>
+<span class="sourceLineNo">275</span>      final MergeTableRegionsState state) 
throws IOException, InterruptedException {<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    if (isTraceEnabled()) {<a 
name="line.276"></a>
+<span class="sourceLineNo">277</span>      LOG.trace(this + " rollback state=" 
+ state);<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    }<a name="line.278"></a>
+<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">280</span>    try {<a name="line.280"></a>
+<span class="sourceLineNo">281</span>      switch (state) {<a 
name="line.281"></a>
+<span class="sourceLineNo">282</span>      case 
MERGE_TABLE_REGIONS_POST_OPERATION:<a name="line.282"></a>
+<span class="sourceLineNo">283</span>      case 
MERGE_TABLE_REGIONS_OPEN_MERGED_REGION:<a name="line.283"></a>
+<span class="sourceLineNo">284</span>      case 
MERGE_TABLE_REGIONS_POST_MERGE_COMMIT_OPERATION:<a name="line.284"></a>
+<span class="sourceLineNo">285</span>      case 
MERGE_TABLE_REGIONS_UPDATE_META:<a name="line.285"></a>
+<span class="sourceLineNo">286</span>        String msg = this + " We are in 
the " + state + " state."<a name="line.286"></a>
+<span class="sourceLineNo">287</span>            + " It is complicated to 
rollback the merge operation that region server is working on."<a 
name="line.287"></a>
+<span class="sourceLineNo">288</span>            + " Rollback is not supported 
and we should let the merge operation to complete";<a name="line.288"></a>
+<span class="sourceLineNo">289</span>        LOG.warn(msg);<a 
name="line.289"></a>
+<span class="sourceLineNo">290</span>        // PONR<a name="line.290"></a>
+<span class="sourceLineNo">291</span>        throw new 
UnsupportedOperationException(this + " unhandled state=" + state);<a 
name="line.291"></a>
+<span class="sourceLineNo">292</span>      case 
MERGE_TABLE_REGIONS_PRE_MERGE_COMMIT_OPERATION:<a name="line.292"></a>
 <span class="sourceLineNo">293</span>        break;<a name="line.293"></a>
-<span class="sourceLineNo">294</span>      case 
MERGE_TABLE_REGIONS_PRE_MERGE_OPERATION:<a name="line.294"></a>
-<span class="sourceLineNo">295</span>        postRollBackMergeRegions(env);<a 
name="line.295"></a>
+<span class="sourceLineNo">294</span>      case 
MERGE_TABLE_REGIONS_CREATE_MERGED_REGION:<a name="line.294"></a>
+<span class="sourceLineNo">295</span>        cleanupMergedRegion(env);<a 
name="line.295"></a>
 <span class="sourceLineNo">296</span>        break;<a name="line.296"></a>
-<span class="sourceLineNo">297</span>      case MERGE_TABLE_REGIONS_PREPARE:<a 
name="line.297"></a>
-<span class="sourceLineNo">298</span>        break;<a name="line.298"></a>
-<span class="sourceLineNo">299</span>      default:<a name="line.299"></a>
-<span class="sourceLineNo">300</span>        throw new 
UnsupportedOperationException(this + " unhandled state=" + state);<a 
name="line.300"></a>
-<span class="sourceLineNo">301</span>      }<a name="line.301"></a>
-<span class="sourceLineNo">302</span>    } catch (Exception e) {<a 
name="line.302"></a>
-<span class="sourceLineNo">303</span>      // This will be retried. Unless 
there is a bug in the code,<a name="line.303"></a>
-<span class="sourceLineNo">304</span>      // this should be just a "temporary 
error" (e.g. network down)<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      LOG.warn("Failed rollback attempt 
step " + state + " for merging the regions "<a name="line.305"></a>
-<span class="sourceLineNo">306</span>          + 
RegionInfo.getShortNameToLog(regionsToMerge) + " in table " + getTableName(), 
e);<a name="line.306"></a>
-<span class="sourceLineNo">307</span>      throw e;<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    }<a name="line.308"></a>
-<span class="sourceLineNo">309</span>  }<a name="line.309"></a>
-<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span>  /*<a name="line.311"></a>
-<span class="sourceLineNo">312</span>   * Check whether we are in the state 
that can be rollback<a name="line.312"></a>
-<span class="sourceLineNo">313</span>   */<a name="line.313"></a>
-<span class="sourceLineNo">314</span>  @Override<a name="line.314"></a>
-<span class="sourceLineNo">315</span>  protected boolean 
isRollbackSupported(final MergeTableRegionsState state) {<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    switch (state) {<a 
name="line.316"></a>
-<span class="sourceLineNo">317</span>    case 
MERGE_TABLE_REGIONS_POST_OPERATION:<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    case 
MERGE_TABLE_REGIONS_OPEN_MERGED_REGION:<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    case 
MERGE_TABLE_REGIONS_POST_MERGE_COMMIT_OPERATION:<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    case 
MERGE_TABLE_REGIONS_UPDATE_META:<a name="line.320"></a>
-<span class="sourceLineNo">321</span>        // It is not safe to rollback if 
we reach to these states.<a name="line.321"></a>
-<span class="sourceLineNo">322</span>        return false;<a 
name="line.322"></a>
-<span class="sourceLineNo">323</span>      default:<a name="line.323"></a>
-<span class="sourceLineNo">324</span>        break;<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    }<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    return true;<a name="line.326"></a>
-<span class="sourceLineNo">327</span>  }<a name="line.327"></a>
-<span class="sourceLineNo">328</span><a name="line.328"></a>
-<span class="sourceLineNo">329</span>  @Override<a name="line.329"></a>
-<span class="sourceLineNo">330</span>  protected MergeTableRegionsState 
getState(final int stateId) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    return 
MergeTableRegionsState.forNumber(stateId);<a name="line.331"></a>
-<span class="sourceLineNo">332</span>  }<a name="line.332"></a>
-<span class="sourceLineNo">333</span><a name="line.333"></a>
-<span class="sourceLineNo">334</span>  @Override<a name="line.334"></a>
-<span class="sourceLineNo">335</span>  protected int getStateId(final 
MergeTableRegionsState state) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    return state.getNumber();<a 
name="line.336"></a>
-<span class="sourceLineNo">337</span>  }<a name="line.337"></a>
-<span class="sourceLineNo">338</span><a name="line.338"></a>
-<span class="sourceLineNo">339</span>  @Override<a name="line.339"></a>
-<span class="sourceLineNo">340</span>  protected MergeTableRegionsState 
getInitialState() {<a name="line.340"></a>
-<span class="sourceLineNo">341</span>    return 
MergeTableRegionsState.MERGE_TABLE_REGIONS_PREPARE;<a name="line.341"></a>
-<span class="sourceLineNo">342</span>  }<a name="line.342"></a>
-<span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span>  @Override<a name="line.344"></a>
-<span class="sourceLineNo">345</span>  protected void 
serializeStateData(ProcedureStateSerializer serializer)<a name="line.345"></a>
-<span class="sourceLineNo">346</span>      throws IOException {<a 
name="line.346"></a>
-<span class="sourceLineNo">347</span>    
super.serializeStateData(serializer);<a name="line.347"></a>
-<span class="sourceLineNo">348</span><a name="line.348"></a>
-<span class="sourceLineNo">349</span>    final 
MasterProcedureProtos.MergeTableRegionsStateData.Builder mergeTableRegionsMsg 
=<a name="line.349"></a>
-<span class="sourceLineNo">350</span>        
MasterProcedureProtos.MergeTableRegionsStateData.newBuilder()<a 
name="line.350"></a>
-<span class="sourceLineNo">351</span>        
.setUserInfo(MasterProcedureUtil.toProtoUserInfo(getUser()))<a 
name="line.351"></a>
-<span class="sourceLineNo">352</span>        
.setMergedRegionInfo(ProtobufUtil.toRegionInfo(mergedRegion))<a 
name="line.352"></a>
-<span class="sourceLineNo">353</span>        .setForcible(forcible);<a 
name="line.353"></a>
-<span class="sourceLineNo">354</span>    for (int i = 0; i &lt; 
regionsToMerge.length; ++i) {<a name="line.354"></a>
-<span class="sourceLineNo">355</span>      
mergeTableRegionsMsg.addRegionInfo(ProtobufUtil.toRegionInfo(regionsToMerge[i]));<a
 name="line.355"></a>
-<span class="sourceLineNo">356</span>    }<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    
serializer.serialize(mergeTableRegionsMsg.build());<a name="line.357"></a>
-<span class="sourceLineNo">358</span>  }<a name="line.358"></a>
-<span class="sourceLineNo">359</span><a name="line.359"></a>
-<span class="sourceLineNo">360</span>  @Override<a name="line.360"></a>
-<span class="sourceLineNo">361</span>  protected void 
deserializeStateData(ProcedureStateSerializer serializer)<a name="line.361"></a>
-<span class="sourceLineNo">362</span>      throws IOException {<a 
name="line.362"></a>
-<span class="sourceLineNo">363</span>    
super.deserializeStateData(serializer);<a name="line.363"></a>
-<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span>    final 
MasterProcedureProtos.MergeTableRegionsStateData mergeTableRegionsMsg =<a 
name="line.365"></a>
-<span class="sourceLineNo">366</span>        
serializer.deserialize(MasterProcedureProtos.MergeTableRegionsStateData.class);<a
 name="line.366"></a>
-<span class="sourceLineNo">367</span>    
setUser(MasterProcedureUtil.toUserInfo(mergeTableRegionsMsg.getUserInfo()));<a 
name="line.367"></a>
-<span class="sourceLineNo">368</span><a name="line.368"></a>
-<span class="sourceLineNo">369</span>    
assert(mergeTableRegionsMsg.getRegionInfoCount() == 2);<a name="line.369"></a>
-<span class="sourceLineNo">370</span>    regionsToMerge = new 
RegionInfo[mergeTableRegionsMsg.getRegionInfoCount()];<a name="line.370"></a>
-<span class="sourceLineNo">371</span>    for (int i = 0; i &lt; 
regionsToMerge.length; i++) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span>      regionsToMerge[i] = 
ProtobufUtil.toRegionInfo(mergeTableRegionsMsg.getRegionInfo(i));<a 
name="line.372"></a>
-<span class="sourceLineNo">373</span>    }<a name="line.373"></a>
+<span class="sourceLineNo">297</span>      case 
MERGE_TABLE_REGIONS_CLOSE_REGIONS:<a name="line.297"></a>
+<span class="sourceLineNo">298</span>        
rollbackCloseRegionsForMerge(env);<a name="line.298"></a>
+<span class="sourceLineNo">299</span>        break;<a name="line.299"></a>
+<span class="sourceLineNo">300</span>      case 
MERGE_TABLE_REGIONS_PRE_MERGE_OPERATION:<a name="line.300"></a>
+<span class="sourceLineNo">301</span>        postRollBackMergeRegions(env);<a 
name="line.301"></a>
+<span class="sourceLineNo">302</span>        break;<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      case MERGE_TABLE_REGIONS_PREPARE:<a 
name="line.303"></a>
+<span class="sourceLineNo">304</span>        break;<a name="line.304"></a>
+<span class="sourceLineNo">305</span>      default:<a name="line.305"></a>
+<span class="sourceLineNo">306</span>        throw new 
UnsupportedOperationException(this + " unhandled state=" + state);<a 
name="line.306"></a>
+<span class="sourceLineNo">307</span>      }<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    } catch (Exception e) {<a 
name="line.308"></a>
+<span class="sourceLineNo">309</span>      // This will be retried. Unless 
there is a bug in the code,<a name="line.309"></a>
+<span class="sourceLineNo">310</span>      // this should be just a "temporary 
error" (e.g. network down)<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      LOG.warn("Failed rollback attempt 
step " + state + " for merging the regions "<a name="line.311"></a>
+<span class="sourceLineNo">312</span>          + 
RegionInfo.getShortNameToLog(regionsToMerge) + " in table " + getTableName(), 
e);<a name="line.312"></a>
+<span class="sourceLineNo">313</span>      throw e;<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    }<a name="line.314"></a>
+<span class="sourceLineNo">315</span>  }<a name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span>  /*<a name="line.317"></a>
+<span class="sourceLineNo">318</span>   * Check whether we are in the state 
that can be rollback<a name="line.318"></a>
+<span class="sourceLineNo">319</span>   */<a name="line.319"></a>
+<span class="sourceLineNo">320</span>  @Override<a name="line.320"></a>
+<span class="sourceLineNo">321</span>  protected boolean 
isRollbackSupported(final MergeTableRegionsState state) {<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    switch (state) {<a 
name="line.322"></a>
+<span class="sourceLineNo">323</span>    case 
MERGE_TABLE_REGIONS_POST_OPERATION:<a name="line.323"></a>
+<span class="sourceLineNo">324</span>    case 
MERGE_TABLE_REGIONS_OPEN_MERGED_REGION:<a name="line.324"></a>
+<span class="sourceLineNo">325</span>    case 
MERGE_TABLE_REGIONS_POST_MERGE_COMMIT_OPERATION:<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    case 
MERGE_TABLE_REGIONS_UPDATE_META:<a name="line.326"></a>
+<span class="sourceLineNo">327</span>        // It is not safe to rollback if 
we reach to these states.<a name="line.327"></a>
+<span class="sourceLineNo">328</span>        return false;<a 
name="line.328"></a>
+<span class="sourceLineNo">329</span>      default:<a name="line.329"></a>
+<span class="sourceLineNo">330</span>        break;<a name="line.330"></a>
+<span class="sourceLineNo">331</span>    }<a name="line.331"></a>
+<span class="sourceLineNo">332</span>    return true;<a name="line.332"></a>
+<span class="sourceLineNo">333</span>  }<a name="line.333"></a>
+<span class="sourceLineNo">334</span><a name="line.334"></a>
+<span class="sourceLineNo">335</span>  @Override<a name="line.335"></a>
+<span class="sourceLineNo">336</span>  protected MergeTableRegionsState 
getState(final int stateId) {<a name="line.336"></a>
+<span class="sourceLineNo">337</span>    return 
MergeTableRegionsState.forNumber(stateId);<a name="line.337"></a>
+<span class="sourceLineNo">338</span>  }<a name="line.338"></a>
+<span class="sourceLineNo">339</span><a name="line.339"></a>
+<span class="sourceLineNo">340</span>  @Override<a name="line.340"></a>
+<span class="sourceLineNo">341</span>  protected int getStateId(final 
MergeTableRegionsState state) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    return state.getNumber();<a 
name="line.342"></a>
+<span class="sourceLineNo">343</span>  }<a name="line.343"></a>
+<span class="sourceLineNo">344</span><a name="line.344"></a>
+<span class="sourceLineNo">345</span>  @Override<a name="line.345"></a>
+<span class="sourceLineNo">346</span>  protected MergeTableRegionsState 
getInitialState() {<a name="line.346"></a>
+<span class="sourceLineNo">347</span>    return 
MergeTableRegionsState.MERGE_TABLE_REGIONS_PREPARE;<a name="line.347"></a>
+<span class="sourceLineNo">348</span>  }<a name="line.348"></a>
+<span class="sourceLineNo">349</span><a name="line.349"></a>
+<span class="sourceLineNo">350</span>  @Override<a name="line.350"></a>
+<span class="sourceLineNo">351</span>  protected void 
serializeStateData(ProcedureStateSerializer serializer)<a name="line.351"></a>
+<span class="sourceLineNo">352</span>      throws IOException {<a 
name="line.352"></a>
+<span class="sourceLineNo">353</span>    
super.serializeStateData(serializer);<a name="line.353"></a>
+<span class="sourceLineNo">354</span><a name="line.354"></a>
+<span class="sourceLineNo">355</span>    final 
MasterProcedureProtos.MergeTableRegionsStateData.Builder mergeTableRegionsMsg 
=<a name="line.355"></a>
+<span class="sourceLineNo">356</span>        
MasterProcedureProtos.MergeTableRegionsStateData.newBuilder()<a 
name="line.356"></a>
+<span class="sourceLineNo">357</span>        
.setUserInfo(MasterProcedureUtil.toProtoUserInfo(getUser()))<a 
name="line.357"></a>
+<span class="sourceLineNo">358</span>        
.setMergedRegionInfo(ProtobufUtil.toRegionInfo(mergedRegion))<a 
name="line.358"></a>
+<span class="sourceLineNo">359</span>        .setForcible(forcible);<a 
name="line.359"></a>
+<span class="sourceLineNo">360</span>    for (int i = 0; i &lt; 
regionsToMerge.length; ++i) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span>      
mergeTableRegionsMsg.addRegionInfo(ProtobufUtil.toRegionInfo(regionsToMerge[i]));<a
 name="line.361"></a>
+<span class="sourceLineNo">362</span>    }<a name="line.362"></a>
+<span class="sourceLineNo">363</span>    
serializer.serialize(mergeTableRegionsMsg.build());<a name="line.363"></a>
+<span class="sourceLineNo">364</span>  }<a name="line.364"></a>
+<span class="sourceLineNo">365</span><a name="line.365"></a>
+<span class="sourceLineNo">366</span>  @Override<a name="line.366"></a>
+<span class="sourceLineNo">367</span>  protected void 
deserializeStateData(ProcedureStateSerializer serializer)<a name="line.367"></a>
+<span class="sourceLineNo">368</span>      throws IOException {<a 
name="line.368"></a>
+<span class="sourceLineNo">369</span>    
super.deserializeStateData(serializer);<a name="line.369"></a>
+<span class="sourceLineNo">370</span><a name="line.370"></a>
+<span class="sourceLineNo">371</span>    final 
MasterProcedureProtos.MergeTableRegionsStateData mergeTableRegionsMsg =<a 
name="line.371"></a>
+<span class="sourceLineNo">372</span>        
serializer.deserialize(MasterProcedureProtos.MergeTableRegionsStateData.class);<a
 name="line.372"></a>
+<span class="sourceLineNo">373</span>    
setUser(MasterProcedureUtil.toUserInfo(mergeTableRegionsMsg.getUserInfo()));<a 
name="line.373"></a>
 <span class="sourceLineNo">374</span><a name="line.374"></a>
-<span class="sourceLineNo">375</span>    mergedRegion = 
ProtobufUtil.toRegionInfo(mergeTableRegionsMsg.getMergedRegionInfo());<a 
name="line.375"></a>
-<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>  @Override<a name="line.378"></a>
-<span class="sourceLineNo">379</span>  public void 
toStringClassDetails(StringBuilder sb) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    
sb.append(getClass().getSimpleName());<a name="line.380"></a>
-<span class="sourceLineNo">381</span>    sb.append(" table=");<a 
name="line.381"></a>
-<span class="sourceLineNo">382</span>    sb.append(getTableName());<a 
name="line.382"></a>
-<span class="sourceLineNo">383</span>    sb.append(", regions=");<a 
name="line.383"></a>
-<span class="sourceLineNo">384</span>    
sb.append(RegionInfo.getShortNameToLog(regionsToMerge));<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    sb.append(", forcibly=");<a 
name="line.385"></a>
-<span class="sourceLineNo">386</span>    sb.append(forcible);<a 
name="line.386"></a>
-<span class="sourceLineNo">387</span>  }<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span>  @Override<a name="line.389"></a>
-<span class="sourceLineNo">390</span>  protected LockState acquireLock(final 
MasterProcedureEnv env) {<a name="line.390"></a>
-<span class="sourceLineNo">391</span>    if (env.waitInitialized(this)) return 
LockState.LOCK_EVENT_WAIT;<a name="line.391"></a>
-<span class="sourceLineNo">392</span>    if 
(env.getProcedureScheduler().waitRegions(this, getTableName(),<a 
name="line.392"></a>
-<span class="sourceLineNo">393</span>        mergedRegion, regionsToMerge[0], 
regionsToMerge[1])) {<a name="line.393"></a>
-<span class="sourceLineNo">394</span>      try {<a name="line.394"></a>
-<span class="sourceLineNo">395</span>        
LOG.debug(LockState.LOCK_EVENT_WAIT + " " + 
env.getProcedureScheduler().dumpLocks());<a name="line.395"></a>
-<span class="sourceLineNo">396</span>      } catch (IOException e) {<a 
name="line.396"></a>
-<span class="sourceLineNo">397</span>        // TODO Auto-generated catch 
block<a name="line.397"></a>
-<span class="sourceLineNo">398</span>        e.printStackTrace();<a 
name="line.398"></a>
-<span class="sourceLineNo">399</span>      }<a name="line.399"></a>
-<span class="sourceLineNo">400</span>      return LockState.LOCK_EVENT_WAIT;<a 
name="line.400"></a>
-<span class="sourceLineNo">401</span>    }<a name="line.401"></a>
-<span class="sourceLineNo">402</span>    this.lock = true;<a 
name="line.402"></a>
-<span class="sourceLineNo">403</span>    return LockState.LOCK_ACQUIRED;<a 
name="line.403"></a>
-<span class="sourceLineNo">404</span>  }<a name="line.404"></a>
-<span class="sourceLineNo">405</span><a name="line.405"></a>
-<span class="sourceLineNo">406</span>  @Override<a name="line.406"></a>
-<span class="sourceLineNo">407</span>  protected void releaseLock(final 
MasterProcedureEnv env) {<a name="line.407"></a>
-<span class="sourceLineNo">408</span>    this.lock = false;<a 
name="line.408"></a>
-<span class="sourceLineNo">409</span>    
env.getProcedureScheduler().wakeRegions(this, getTableName(),<a 
name="line.409"></a>
-<span class="sourceLineNo">410</span>      mergedRegion, regionsToMerge[0], 
regionsToMerge[1]);<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>  @Override<a name="line.413"></a>
-<span class="sourceLineNo">414</span>  protected boolean 
holdLock(MasterProcedureEnv env) {<a name="line.414"></a>
-<span class="sourceLineNo">415</span>    return true;<a name="line.415"></a>
-<span class="sourceLineNo">416</span>  }<a name="line.416"></a>
-<span class="sourceLineNo">417</span><a name="line.417"></a>
-<span class="sourceLineNo">418</span>  @Override<a name="line.418"></a>
-<span class="sourceLineNo">419</span>  protected boolean 
hasLock(MasterProcedureEnv env) {<a name="line.419"></a>
-<span class="sourceLineNo">420</span>    return this.lock;<a 
name="line.420"></a>
-<span class="sourceLineNo">421</span>  }<a name="line.421"></a>
-<span class="sourceLineNo">422</span><a name="line.422"></a>
-<span class="sourceLineNo">423</span>  @Override<a name="line.423"></a>
-<span class="sourceLineNo">424</span>  public TableName getTableName() {<a 
name="line.424"></a>
-<span class="sourceLineNo">425</span>    return mergedRegion.getTable();<a 
name="line.425"></a>
-<span class="sourceLineNo">426</span>  }<a name="line.426"></a>
-<span class="sourceLineNo">427</span><a name="line.427"></a>
-<span class="sourceLineNo">428</span>  @Override<a name="line.428"></a>
-<span class="sourceLineNo">429</span>  public TableOperationType 
getTableOperationType() {<a name="line.429"></a>
-<span class="sourceLineNo">430</span>    return 
TableOperationType.REGION_MERGE;<a name="line.430"></a>
-<span class="sourceLineNo">431</span>  }<a name="line.431"></a>
-<span class="sourceLineNo">432</span><a name="line.432"></a>
-<span class="sourceLineNo">433</span>  @Override<a name="line.433"></a>
-<span class="sourceLineNo">434</span>  protected ProcedureMetrics 
getProcedureMetrics(MasterProcedureEnv env) {<a name="line.434"></a>
-<span class="sourceLineNo">435</span>    return 
env.getAssignmentManager().getAssignmentManagerMetrics().getMergeProcMetrics();<a
 name="line.435"></a>
-<span class="sourceLineNo">436</span>  }<a name="line.436"></a>
-<span class="sourceLineNo">437</span><a name="line.437"></a>
-<span class="sourceLineNo">438</span>  /**<a name="line.438"></a>
-<span class="sourceLineNo">439</span>   * Prepare merge and do some check<a 
name="line.439"></a>
-<span class="sourceLineNo">440</span>   * @param env MasterProcedureEnv<a 
name="line.440"></a>
-<span class="sourceLineNo">441</span>   * @throws IOException<a 
name="line.441"></a>
-<span class="sourceLineNo">442</span>   */<a name="line.442"></a>
-<span class="sourceLineNo">443</span>  private boolean 
prepareMergeRegion(final MasterProcedureEnv env) throws IOException {<a 
name="line.443"></a>
-<span class="sourceLineNo">444</span>    // Note: the following logic assumes 
that we only have 2 regions to merge.  In the future,<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    // if we want to extend to more than 
2 regions, the code needs to modify a little bit.<a name="line.445"></a>
-<span class="sourceLineNo">446</span>    //<a name="line.446"></a>
-<span class="sourceLineNo">447</span>    CatalogJanitor catalogJanitor = 
env.getMasterServices().getCatalogJanitor();<a name="line.447"></a>
-<span class="sourceLineNo">448</span>    boolean regionAHasMergeQualifier = 
!catalogJanitor.cleanMergeQualifier(regionsToMerge[0]);<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    if (regionAHasMergeQualifier<a 
name="line.449"></a>
-<span class="sourceLineNo">450</span>        || 
!catalogJanitor.cleanMergeQualifier(regionsToMerge[1])) {<a name="line.450"></a>
-<span class="sourceLineNo">451</span>      String msg = "Skip merging regions 
" + RegionInfo.getShortNameToLog(regionsToMerge) +<a name="line.451"></a>
-<span class="sourceLineNo">452</span>        ", because region "<a 
name="line.452"></a>
-<span class="sourceLineNo">453</span>        + (regionAHasMergeQualifier ? 
regionsToMerge[0].getEncodedName() : regionsToMerge[1]<a name="line.453"></a>
-<span class="sourceLineNo">454</span>              .getEncodedName()) + " has 
merge qualifier";<a name="line.454"></a>
-<span class="sourceLineNo">455</span>      LOG.warn(msg);<a 
name="line.455"></a>
-<span class="sourceLineNo">456</span>      throw new 
MergeRegionException(msg);<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>    RegionStates regionStates = 
env.getAssignmentManager().getRegionStates();<a name="line.459"></a>
-<span class="sourceLineNo">460</span>    RegionState regionStateA = 
regionStates.getRegionState(regionsToMerge[0].getEncodedName());<a 
name="line.460"></a>
-<span class="sourceLineNo">461</span>    RegionState regionStateB = 
regionStates.getRegionState(regionsToMerge[1].getEncodedName());<a 
name="line.461"></a>
-<span class="sourceLineNo">462</span>    if (regionStateA == null || 
regionStateB == null) {<a name="line.462"></a>
-<span class="sourceLineNo">463</span>      throw new UnknownRegionException(<a 
name="line.463"></a>
-<span class="sourceLineNo">464</span>        regionStateA == null ?<a 
name="line.464"></a>
-<span class="sourceLineNo">465</span>            
regionsToMerge[0].getEncodedName() : regionsToMerge[1].getEncodedName());<a 
name="line.465"></a>
-<span class="sourceLineNo">466</span>    }<a name="line.466"></a>
-<span class="sourceLineNo">467</span><a name="line.467"></a>
-<span class="sourceLineNo">468</span>    if (!regionStateA.isOpened() || 
!regionStateB.isOpened()) {<a name="line.468"></a>
-<span class="sourceLineNo">469</span>      throw new MergeRegionException(<a 
name="line.469"></a>
-<span class="sourceLineNo">470</span>        "Unable to merge regions not 
online " + regionStateA + ", " + regionStateB);<a name="line.470"></a>
-<span class="sourceLineNo">471</span>    }<a name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span>    if 
(!env.getMasterServices().isSplitOrMergeEnabled(MasterSwitchType.MERGE)) {<a 
name="line.473"></a>
-<span class="sourceLineNo">474</span>      String regionsStr = 
Arrays.deepToString(regionsToMerge);<a name="line.474"></a>
-<span class="sourceLineNo">475</span>      LOG.warn("merge switch is off! skip 
merge of " + regionsStr);<a name="line.475"></a>
-<span class="sourceLineNo">476</span>      
super.setFailure(getClass().getSimpleName(),<a name="line.476"></a>
-<span class="sourceLineNo">477</span>          new IOException("Merge of " + 
regionsStr + " failed because merge switch is off"));<a name="line.477"></a>
-<span class="sourceLineNo">478</span>      return false;<a name="line.478"></a>
-<span class="sourceLineNo">479</span>    }<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>    // Ask the remote regionserver if 
regions are mergeable. If we get an IOE, report it<a name="line.482"></a>
-<span class="sourceLineNo">483</span>    // along w/ the failure so can see 
why we are not mergeable at this time.<a name="line.483"></a>
-<span class="sourceLineNo">484</span>    IOException mergeableCheckIOE = 
null;<a name="line.484"></a>
-<span class="sourceLineNo">485</span>    boolean mergeable = false;<a 
name="line.485"></a>
-<span class="sourceLineNo">486</span>    RegionState current = regionStateA;<a 
name="line.486"></a>
-<span class="sourceLineNo">487</span>    try {<a name="line.487"></a>
-<span class="sourceLineNo">488</span>      mergeable = isMergeable(env, 
current);<a name="line.488"></a>
-<span class="sourceLineNo">489</span>    } catch (IOException e) {<a 
name="line.489"></a>
-<span class="sourceLineNo">490</span>      mergeableCheckIOE = e;<a 
name="line.490"></a>
-<span class="sourceLineNo">491</span>    }<a name="line.491"></a>
-<span class="sourceLineNo">492</span>    if (mergeable &amp;&amp; 
mergeableCheckIOE == null) {<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      current = regionStateB;<a 
name="line.493"></a>
-<span class="sourceLineNo">494</span>      try {<a name="line.494"></a>
-<span class="sourceLineNo">495</span>        mergeable = isMergeable(env, 
current);<a name="line.495"></a>
-<span class="sourceLineNo">496</span>      } catch (IOException e) {<a 
name="line.496"></a>
-<span class="sourceLineNo">497</span>        mergeableCheckIOE = e;<a 
name="line.497"></a>
-<span class="sourceLineNo">498</span>      }<a name="line.498"></a>
-<span class="sourceLineNo">499</span>    }<a name="line.499"></a>
-<span class="sourceLineNo">500</span>    if (!mergeable) {<a 
name="line.500"></a>
-<span class="sourceLineNo">501</span>      IOException e = new 
IOException(current.getRegion().getShortNameToLog() + " NOT mergeable");<a 
name="line.501"></a>
-<span class="sourceLineNo">502</span>      if (mergeableCheckIOE != null) 
e.initCause(mergeableCheckIOE);<a name="line.502"></a>
-<span class="sourceLineNo">503</span>      
super.setFailure(getClass().getSimpleName(), e);<a name="line.503"></a>
-<span class="sourceLineNo">504</span>      return false;<a name="line.504"></a>
+<span class="sourceLineNo">375</span>    
assert(mergeTableRegionsMsg.getRegionInfoCount() == 2);<a name="line.375"></a>
+<span class="sourceLineNo">376</span>    regionsToMerge = new 
RegionInfo[mergeTableRegionsMsg.getRegionInfoCount()];<a name="line.376"></a>
+<span class="sourceLineNo">377</span>    for (int i = 0; i &lt; 
regionsToMerge.length; i++) {<a name="line.377"></a>
+<span class="sourceLineNo">378</span>      regionsToMerge[i] = 
ProtobufUtil.toRegionInfo(mergeTableRegionsMsg.getRegionInfo(i));<a 
name="line.378"></a>
+<span class="sourceLineNo">379</span>    }<a name="line.379"></a>
+<span class="sourceLineNo">380</span><a name="line.380"></a>
+<span class="sourceLineNo">381</span>    mergedRegion = 
ProtobufUtil.toRegionInfo(mergeTableRegionsMsg.getMergedRegionInfo());<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>  @Override<a name="line.384"></a>
+<span class="sourceLineNo">385</span>  public void 
toStringClassDetails(StringBuilder sb) {<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    
sb.append(getClass().getSimpleName());<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    sb.append(" table=");<a 
name="line.387"></a>
+<span class="sourceLineNo">388</span>    sb.append(getTableName());<a 
name="line.388"></a>
+<span class="sourceLineNo">389</span>    sb.append(", regions=");<a 
name="line.389"></a>
+<span class="sourceLineNo">390</span>    
sb.append(RegionInfo.getShortNameToLog(regionsToMerge));<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    sb.append(", forcibly=");<a 
name="line.391"></a>
+<span class="sourceLineNo">392</span>    sb.append(forcible);<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>  @Override<a name="line.395"></a>
+<span class="sourceLineNo">396</span>  protected LockState acquireLock(final 
MasterProcedureEnv env) {<a name="line.396"></a>
+<span class="sourceLineNo">397</span>    if (env.waitInitialized(this)) return 
LockState.LOCK_EVENT_WAIT;<a name="line.397"></a>
+<span class="sourceLineNo">398</span>    if 
(env.getProcedureScheduler().waitRegions(this, getTableName(),<a 
name="line.398"></a>
+<span class="sourceLineNo">399</span>        mergedRegion, regionsToMerge[0], 
regionsToMerge[1])) {<a name="line.399"></a>
+<span class="sourceLineNo">400</span>      try {<a name="line.400"></a>
+<span class="sourceLineNo">401</span>        
LOG.debug(LockState.LOCK_EVENT_WAIT + " " + 
env.getProcedureScheduler().dumpLocks());<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      } catch (IOException e) {<a 
name="line.402"></a>
+<span class="sourceLineNo">403</span>        // TODO Auto-generated catch 
block<a name="line.403"></a>
+<span class="sourceLineNo">404</span>        e.printStackTrace();<a 
name="line.404"></a>
+<span class="sourceLineNo">405</span>      }<a name="line.405"></a>
+<span class="sourceLineNo">406</span>      return LockState.LOCK_EVENT_WAIT;<a 
name="line.406"></a>
+<span class="sourceLineNo">407</span>    }<a name="line.407"></a>
+<span class="sourceLineNo">408</span>    this.lock = true;<a 
name="line.408"></a>
+<span class="sourceLineNo">409</span>    return LockState.LOCK_ACQUIRED;<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>  @Override<a name="line.412"></a>
+<span class="sourceLineNo">413</span>  protected void releaseLock(final 
MasterProcedureEnv env) {<a name="line.413"></a>
+<span class="sourceLineNo">414</span>    this.lock = false;<a 
name="line.414"></a>
+<span class="sourceLineNo">415</span>    
env.getProcedureScheduler().wakeRegions(this, getTableName(),<a 
name="line.415"></a>
+<span class="sourceLineNo">416</span>      mergedRegion, regionsToMerge[0], 
regionsToMerge[1]);<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>  @Override<a name="line.419"></a>
+<span class="sourceLineNo">420</span>  protected boolean 
holdLock(MasterProcedureEnv env) {<a name="line.420"></a>
+<span class="sourceLineNo">421</span>    return true;<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>  @Override<a name="line.424"></a>
+<span class="sourceLineNo">425</span>  protected boolean 
hasLock(MasterProcedureEnv env) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>    return this.lock;<a 
name="line.426"></a>
+<span class="sourceLineNo">427</span>  }<a name="line.427"></a>
+<span class="sourceLineNo">428</span><a name="line.428"></a>
+<span class="sourceLineNo">429</span>  @Override<a name="line.429"></a>
+<span class="sourceLineNo">430</span>  public TableName getTableName() {<a 
name="line.430"></a>
+<span class="sourceLineNo">431</span>    return mergedRegion.getTable();<a 
name="line.431"></a>
+<span class="sourceLineNo">432</span>  }<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span>  @Override<a name="line.434"></a>
+<span class="sourceLineNo">435</span>  public TableOperationType 
getTableOperationType() {<a name="line.435"></a>
+<span class="sourceLineNo">436</span>    return 
TableOperationType.REGION_MERGE;<a name="line.436"></a>
+<span class="sourceLineNo">437</span>  }<a name="line.437"></a>
+<span class="sourceLineNo">438</span><a name="line.438"></a>
+<span class="sourceLineNo">439</span>  @Override<a name="line.439"></a>
+<span class="sourceLineNo">440</span>  protected ProcedureMetrics 
getProcedureMetrics(MasterProcedureEnv env) {<a name="line.440"></a>
+<span class="sourceLineNo">441</span>    return 
env.getAssignmentManager().getAssignmentManagerMetrics().getMergeProcMetrics();<a
 name="line.441"></a>
+<span class="sourceLineNo">442</span>  }<a name="line.442"></a>
+<span class="sourceLineNo">443</span><a name="line.443"></a>
+<span class="sourceLineNo">444</span>  /**<a name="line.444"></a>
+<span class="sourceLineNo">445</span>   * Prepare merge and do some check<a 
name="line.445"></a>
+<span class="sourceLineNo">446</span>   * @param env MasterProcedureEnv<a 
name="line.446"></a>
+<span class="sourceLineNo">447</span>   * @throws IOException<a 
name="line.447"></a>
+<span class="sourceLineNo">448</span>   */<a name="line.448"></a>
+<span class="sourceLineNo">449</span>  private boolean 
prepareMergeRegion(final MasterProcedureEnv env) throws IOException {<a 
name="line.449"></a>
+<span class="sourceLineNo">450</span>    // Note: the following logic assumes 
that we only have 2 regions to merge.  In the future,<a name="line.450"></a>
+<span class="sourceLineNo">451</span>    // if we want to extend to more than 
2 regions, the code needs to modify a little bit.<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    //<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    CatalogJanitor catalogJanitor = 
env.getMasterServices().getCatalogJanitor();<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    boolean regionAHasMergeQualifier = 
!catalogJanitor.cleanMergeQualifier(regionsToMerge[0]);<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    if (regionAHasMergeQualifier<a 
name="line.455"></a>
+<span class="sourceLineNo">456</span>        || 
!catalogJanitor.cleanMergeQualifier(regionsToMerge[1])) {<a name="line.456"></a>
+<span class="sourceLineNo">457</span>      String msg = "Skip merging regions 
" + RegionInfo.getShortNameToLog(regionsToMerge) +<a name="line.457"></a>
+<span class="sourceLineNo">458</span>        ", because region "<a 
name="line.458"></a>
+<span class="sourceLineNo">459</span>        + (regionAHasMergeQualifier ? 
regionsToMerge[0].getEncodedName() : regionsToMerge[1]<a name="line.459"></a>
+<span class="sourceLineNo">460</span>              .getEncodedName()) + " has 
merge qualifier";<a name="line.460"></a>
+<span class="sourceLineNo">461</span>      LOG.warn(msg);<a 
name="line.461"></a>
+<span class="sourceLineNo">462</span>      throw new 
MergeRegionException(msg);<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>    RegionStates regionStates = 
env.getAssignmentManager().getRegionStates();<a name="line.465"></a>
+<span class="sourceLineNo">466</span>    RegionState regionStateA = 
regionStates.getRegionState(regionsToMerge[0].getEncodedName());<a 
name="line.466"></a>
+<span class="sourceLineNo">467</span>    RegionState regionStateB = 
regionStates.getRegionState(regionsToMerge[1].getEncodedName());<a 
name="line.467"></a>
+<span class="sourceLineNo">468</span>    if (regionStateA == null || 
regionStateB == null) {<a name="line.468"></a>
+<span class="sourceLineNo">469</span>      throw new UnknownRegionException(<a 
name="line.469"></a>
+<span class="sourceLineNo">470</span>        regionStateA == null ?<a 
name="line.470"></a>
+<span class="sourceLineNo">471</span>            
regionsToMerge[0].getEncodedName() : regionsToMerge[1].getEncodedName());<a 
name="line.471"></a>
+<span class="sourceLineNo">472</span>    }<a name="line.472"></a>
+<span class="sourceLineNo">473</span><a name="line.473"></a>
+<span class="sourceLineNo">474</span>    if (!regionStateA.isOpened() || 
!regionStateB.isOpened()) {<a name="line.474"></a>
+<span class="sourceLineNo">475</span>      throw new MergeRegionException(<a 
name="line.475"></a>
+<span class="sourceLineNo">476</span>        "Unable to merge regions not 
online " + regionStateA + ", " + regionStateB);<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>    if 
(!env.getMasterServices().isSplitOrMergeEnabled(MasterSwitchType.MERGE)) {<a 
name="line.479"></a>
+<span class="sourceLineNo">480</span>      String regionsStr = 
Arrays.deepToString(regionsToMerge);<a name="line.480"></a>
+<span class="sourceLineNo">481</span>      LOG.warn("merge switch is off! skip 
merge of " + regionsStr);<a name="line.481"></a>
+<span class="sourceLineNo">482</span>      
super.setFailure(getClass().getSimpleName(),<a name="line.482"></a>
+<span class="sourceLineNo">483</span>          new IOException("Merge of " + 
regionsStr + " failed because merge switch is off"));<a name="line.483"></a>
+<span class="sourceLineNo">484</span>      return false;<a name="line.484"></a>
+<span class="sourceLineNo">485</span>    }<a name="line.485"></a>
+<span class="sourceLineNo">486</span><a name="line.486"></a>
+<span class="sourceLineNo">487</span><a name="line.487"></a>
+<span class="sourceLineNo">488</span>    // Ask the remote regionserver if 
regions are mergeable. If we get an IOE, report it<a name="line.488"></a>
+<span class="sourceLineNo">489</span>    // along w/ the failure so can see 
why we are not mergeable at this time.<a name="line.489"></a>
+<span class="sourceLineNo">490</span>    IOException mergeableCheckIOE = 
null;<a name="line.490"></a>
+<span class="sourceLineNo">491</span>    boolean mergeable = false;<a 
name="line.491"></a>
+<span class="sourceLineNo">492</span>    RegionState current = regionStateA;<a 
name="line.492"></a>
+<span class="sourceLineNo">493</span>    try {<a name="line.493"></a>
+<span class="sourceLineNo">494</span>      mergeable = isMergeable(env, 
current);<a name="line.494"></a>
+<span class="sourceLineNo">495</span>    } catch (IOException e) {<a 
name="line.495"></a>
+<span class="sourceLineNo">496</span>      mergeableCheckIOE = e;<a 
name="line.496"></a>
+<span class="sourceLineNo">497</span>    }<a name="line.497"></a>
+<span class="sourceLineNo">498</span>    if (mergeable &amp;&amp; 
mergeableCheckIOE == null) {<a name="line.498"></a>
+<span class="sourceLineNo">499</span>      current = regionStateB;<a 
name="line.499"></a>
+<span class="sourceLineNo">500</span>      try {<a name="line.500"></a>
+<span class="sourceLineNo">501</span>        mergeable = isMergeable(env, 
current);<a name="line.501"></a>
+<span class="sourceLineNo">502</span>      } catch (IOException e) {<a 
name="line.502"></a>
+<span class="sourceLineNo">503</span>        mergeableCheckIOE = e;<a 
name="line.503"></a>
+<span class="sourceLineNo">504</span>      }<a name="line.504"></a>
 <span class="sourceLineNo">505</span>    }<a name="line.505"></a>
-<span class="sourceLineNo">506</span><a name="line.506"></a>
-<span class="sourceLineNo">507</span>    // Update region states to Merging<a 
name="line.507"></a>
-<span class="sourceLineNo">508</span>    setRegionStateToMerging(env);<a 
name="line.508"></a>
-<span class="sourceLineNo">509</span>    return true;<a name="line.509"></a>
-<span class="sourceLineNo">510</span>  }<a name="line.510"></a>
-<span class="sourceLineNo">511</span><a name="line.511"></a>
-<span class="sourceLineNo">512</span>  private boolean isMergeable(final 
MasterProcedureEnv env, final RegionState rs)<a name="line.512"></a>
-<span class="sourceLineNo">513</span>  throws IOException {<a 
name="line.513"></a>
-<span class="sourceLineNo">514</span>    GetRegionInfoResponse response =<a 
name="line.514"></a>
-<span class="sourceLineNo">515</span>      Util.getRegionInfoResponse(env, 
rs.getServerName(), rs.getRegion());<a name="line.515"></a>
-<span class="sourceLineNo">516</span>    return response.hasMergeable() 
&amp;&amp; response.getMergeable();<a name="line.516"></a>
-<span class="sourceLineNo">517</span>  }<a name="line.517"></a>
-<span class="sourceLineNo">518</span><a name="line.518"></a>
-<span class="sourceLineNo">519</span>  /**<a name="line.519"></a>
-<span class="sourceLineNo">520</span>   * Pre merge region action<a 
name="line.520"></a>
-<span class="sourceLineNo">521</span>   * @param env MasterProcedureEnv<a 
name="line.521"></a>
-<span class="sourceLineNo">522</span>   **/<a name="line.522"></a>
-<span class="sourceLineNo">523</span>  private void preMergeRegions(final 
MasterProcedureEnv env) throws IOException {<a name="line.523"></a>
-<span class="sourceLineNo">524</span>    final MasterCoprocessorHost cpHost = 
env.getMasterCoprocessorHost();<a name="line.524"></a>
-<span class="sourceLineNo">525</span>    if (cpHost != null) {<a 
name="line.525"></a>
-<span class="sourceLineNo">526</span>      
cpHost.preMergeRegionsAction(regionsToMerge, getUser());<a name="line.526"></a>
-<span class="sourceLineNo">527</span>    }<a name="line.527"></a>
-<span class="sourceLineNo">528</span>    // TODO: Clean up split and merge. 
Currently all over the place.<a name="line.528"></a>
-<span class="sourceLineNo">529</span>    try {<a name="line.529"></a>
-<span class="sourceLineNo">530</span>      
env.getMasterServices().getMasterQuotaManager().onRegionMerged(this.mergedRegion);<a
 name="line.530"></a>
-<span class="sourceLineNo">531</span>    } catch (QuotaExceededException e) 
{<a name="line.531"></a>
-<span class="sourceLineNo">532</span>      
env.getAssignmentManager().getRegionNormalizer().planSkipped(this.mergedRegion,<a
 name="line.532"></a>
-<span class="sourceLineNo">533</span>          
NormalizationPlan.PlanType.MERGE);<a name="line.533"></a>
-<span class="sourceLineNo">534</span>      throw e;<a name="line.534"></a>
-<span class="sourceLineNo">535</span>    }<a name="line.535"></a>
-<span class="sourceLineNo">536</span>  }<a name="line.536"></a>
-<span class="sourceLineNo">537</span><a name="line.537"></a>
-<span class="sourceLineNo">538</span>  /**<a name="line.538"></a>
-<span class="sourceLineNo">539</span>   * Action after rollback a merge table 
regions action.<a name="line.539"></a>
-<span class="sourceLineNo">540</span>   * @param env MasterProcedureEnv<a 
name="line.540"></a>
-<span class="sourceLineNo">541</span>   * @throws IOException<a 
name="line.541"></a>
-<span class="sourceLineNo">542</span>   */<a name="line.542"></a>
-<span class="sourceLineNo">543</span>  private void 
postRollBackMergeRegions(final MasterProcedureEnv env) throws IOException {<a 
name="line.543"></a>
-<span class="sourceLineNo">544</span>    final MasterCoprocessorHost cpHost = 
env.getMasterCoprocessorHost();<a name="line.544"></a>
-<span class="sourceLineNo">545</span>    if (cpHost != null) {<a 
name="line.545"></a>
-<span class="sourceLineNo">546</span>      
cpHost.postRollBackMergeRegionsAction(regionsToMerge, getUser());<a 
name="line.546"></a>
-<span class="sourceLineNo">547</span>    }<a name="line.547"></a>
-<span class="sourceLineNo">548</span>  }<a name="line.548"></a>
-<span class="sourceLineNo">549</span><a name="line.549"></a>
-<span class="sourceLineNo">550</span>  /**<a name="line.550"></a>
-<span class="sourceLineNo">551</span>   * Set the region states to MERGING 
state<a name="line.551"></a>
-<span class="sourceLineNo">552</span>   * @param env MasterProcedureEnv<a 
name="line.552"></a>
-<span class="sourceLineNo">553</span>   * @throws IOException<a 
name="line.553"></a>
-<span class="sourceLineNo">554</span>   */<a name="line.554"></a>
-<span class="sourceLineNo">555</span>  public void 
setRegionStateToMerging(final MasterProcedureEnv env) throws IOException {<a 
name="line.555"></a>
-<span class="sourceLineNo">556</span>    // Set State.MERGING to regions to be 
merged<a name="line.556"></a>
-<span class="sourceLineNo">557</span>    RegionStates regionStates = 
env.getAssignmentManager().getRegionStates();<a name="line.557"></a>
-<span class="sourceLineNo">558</span>    
regionStates.getRegionStateNode(regionsToMerge[0]).setState(State.MERGING);<a 
name="line.558"></a>
-<span class="sourceLineNo">559</span>    
regionStates.getRegionStateNode(regionsToMerge[1]).setState(State.MERGING);<a 
name="line.559"></a>
-<span class="sourceLineNo">560</span>  }<a name="line.560"></a>
-<span class="sourceLineNo">561</span><a name="line.561"></a>
-<span class="sourceLineNo">562</span>  /**<a name="line.562"></a>
-<span class="sourceLineNo">563</span>   * Rollback the region state change<a 
name="line.563"></a>
-<span class="sourceLineNo">564</span>   * Not used for now, since 
rollbackCloseRegionsForMerge() will mark regions as OPEN<a name="line.564"></a>
-<span class="sourceLineNo">565</span>   * @param env MasterProcedureEnv<a 
name="line.565"></a>
-<span class="sourceLineNo">566</span>   * @throws IOException<a 
name="line.566"></a>
-<span class="sourceLineNo">567</span>   */<a name="line.567"></a>
-<span class="sourceLineNo">568</span>  private void 
setRegionStateBackToOpen(final MasterProcedureEnv env) throws IOException {<a 
name="line.568"></a>
-<span class="sourceLineNo">569</span>    // revert region state to Open<a 
name="line.569"></a>
-<span class="sourceLineNo">570</span>    RegionStates regionStates = 
env.getAssignmentManager().getRegionStates();<a name="line.570"></a>
-<span class="sourceLineNo">571</span>    
regionStates.getRegionStateNode(regionsToMerge[0]).setState(State.OPEN);<a 
name="line.571"></a>
-<span class="sourceLineNo">572</span>    
regionStates.getRegionStateNode(regionsToMerge[1]).setState(State.OPEN);<a 
name="line.572"></a>
-<span class="sourceLineNo">573</span>  }<a name="line.573"></a>
-<span class="sourceLineNo">574</span><a name="line.574"></a>
-<span class="sourceLineNo">575</span>  /**<a name="line.575"></a>
-<span class="sourceLineNo">576</span>   * Create merged region<a 
name="line.576"></a>
-<span class="sourceLineNo">577</span>   * @param env MasterProcedureEnv<a 
name="line.577"></a>
-<span class="sourceLineNo">578</span>   * @throws IOException<a 
name="line.578"></a>
-<span class="sourceLineNo">579</span>   */<a name="line.579"></a>
-<span class="sourceLineNo">580</span>  private void createMergedRegion(final 
MasterProcedureEnv env) throws IOException {<a name="line.580"></a>
-<span class="sourceLineNo">581</span>    final MasterFileSystem mfs = 
env.getMasterServices().getMasterFileSystem();<a name="line.581"></a>
-<span class="sourceLineNo">582</span>    final Path tabledir = 
FSUtils.getTableDir(mfs.getRootDir(), regionsToMerge[0].getTable());<a 
name="line.582"></a>
-<span class="sourceLineNo">583</span>    final FileSystem fs = 
mfs.getFileSystem();<a name="line.583"></a>
-<span class="sourceLineNo">584</span>    HRegionFileSystem regionFs = 
HRegionFileSystem.openRegionFromFileSystem(<a name="line.584"></a>
-<span class="sourceLineNo">585</span>      env.getMasterConfiguration(), fs, 
tabledir, regionsToMerge[0], false);<a name="line.585"></a>
-<span class="sourceLineNo">586</span>    regionFs.createMergesDir();<a 
name="line.586"></a>
-<span class="sourceLineNo">587</span><a name="line.587"></a>
-<span class="sourceLineNo">588</span>    mergeStoreFiles(env, regionFs, 
regionFs.getMergesDir());<a name="line.588"></a>
-<span class="sourceLineNo">589</span>    HRegionFileSystem regionFs2 = 
HRegionFileSystem.openRegionFromFileSystem(<a name="line.589"></a>
-<span class="sourceLineNo">590</span>      env.getMasterConfiguration(), fs, 
tabledir, regionsToMerge[1], false);<a name="line.590"></a>
-<span class="sourceLineNo">591</span>    mergeStoreFiles(env, regionFs2, 
regionFs.getMergesDir());<a name="line.591"></a>
-<span class="sourceLineNo">592</span><a name="line.592"></a>
-<span class="sourceLineNo">593</span>    
regionFs.commitMergedRegion(mergedRegion);<a name="line.593"></a>
-<span class="sourceLineNo">594</span><a name="line.594"></a>
-<span class="sourceLineNo">595</span>    //Prepare to create merged regions<a 
name="line.595"></a>
-<span class="sourceLineNo">596</span>    
env.getAssignmentManager().getRegionStates().<a name="line.596"></a>
-<span class="sourceLineNo">597</span>        
getOrCreateRegionStateNode(mergedRegion).setState(State.MERGING_NEW);<a 
name="line.597"></a>
-<span class="sourceLineNo">598</span>  }<a name="line.598"></a>
-<span class="sourceLineNo">599</span><a name="line.599"></a>
-<span class="sourceLineNo">600</span>  /**<a name="line.600"></a>
-<span class="sourceLineNo">601</span>   * Create reference file(s) of merging 
regions under the merges directory<a name="line.601"></a>
-<span class="sourceLineNo">602</span>   * @param env MasterProcedureEnv<a 
name="line.602"></a>
-<span class="sourceLineNo">603</span>   * @param regionFs region file system<a 
name="line.603"></a>
-<span class="sourceLineNo">604</span>   * @param mergedDir the temp directory 
of merged region<a name="line.604"></a>
-<span class="sourceLineNo">605</span>   * @throws IOException<a 
name="line.605"></a>
-<span class="sourceLineNo">606</span>   */<a name="line.606"></a>
-<span class="sourceLineNo">607</span>  private void mergeStoreFiles(<a 
name="line.607"></a>
-<span class="sourceLineNo">608</span>      final MasterProcedureEnv env, final 
HRegionFileSystem regionFs, final Path mergedDir)<a name="line.608"></a>
-<span class="sourceLineNo">609</span>      throws IOException {<a 
name="line.609"></a>
-<span class="sourceLineNo">610</span>    final MasterFileSystem mfs = 
env.getMasterServices().getMasterFileSystem();<a name="line.610"></a>
-<span class="sourceLineNo">611</span>    final Configuration conf = 
env.getMasterConfiguration();<a name="line.611"></a>
-<span class="sourceLineNo">612</span>    final TableDescriptor htd = 
env.getMasterServices().getTableDescriptors().get(getTableName());<a 
name="line.612"></a>
-<span class="sourceLineNo">613</span><a name="line.613"></a>
-<span class="sourceLineNo">614</span>    for (String family: 
regionFs.getFamilies()) {<a name="line.614"></a>
-<span class="sourceLineNo">615</span>      final ColumnFamilyDescriptor hcd = 
htd.getColumnFamily(Bytes.toBytes(family));<a name="line.615"></a>
-<span class="sourceLineNo">616</span>      final 
Collection&lt;StoreFileInfo&gt; storeFiles = regionFs.getStoreFiles(family);<a 
name="line.616"></a>
-<span class="sourceLineNo">617</span><a name="line.617"></a>
-<span class="sourceLineNo">618</span>      if (storeFiles != null &amp;&amp; 
storeFiles.size() &gt; 0) {<a name="line.618"></a>
-<span class="sourceLineNo">619</span>        final CacheConfig cacheConf = new 
CacheConfig(conf, hcd);<a name="line.619"></a>
-<span class="sourceLineNo">620</span>        for (StoreFileInfo storeFileInfo: 
storeFiles) {<a name="line.620"></a>
-<span class="sourceLineNo">621</span>          // Create reference file(s) of 
the region in mergedDir<a name="line.621"></a>
-<span class="sourceLineNo">622</span>          
regionFs.mergeStoreFile(mergedRegion, family, new 
HStoreFile(mfs.getFileSystem(),<a name="line.622"></a>
-<span class="sourceLineNo">623</span>              storeFileInfo, conf, 
cacheConf, hcd.getBloomFilterType(), true),<a name="line.623"></a>
-<span class="sourceLineNo">624</span>            mergedDir);<a 
name="line.624"></a>
-<span class="sourceLineNo">625</span>        }<a name="line.625"></a>
-<span class="sourceLineNo">626</span>      }<a name="line.626"></a>
-<span class="sourceLineNo">627</span>    }<a name="line.627"></a>
-<span class="sourceLineNo">628</span>  }<a name="line.628"></a>
-<span class="sourceLineNo">629</span><a name="line.629"></a>
-<span class="sourceLineNo">630</span>  /**<a name="line.630"></a>
-<span class="sourceLineNo">631</span>   * Clean up merged region<a 
name="line.631"></a>
-<span class="sourceLineNo">632</span>   * @param env MasterProcedureEnv<a 
name="line.632"></a>
-<span class="sourceLineNo">633</span>   * @throws IOException<a 
name="line.633"></a>
-<span class="sourceLineNo">634</span>   */<a name="line.634"></a>
-<span class="sourceLineNo">635</span>  private void cleanupMergedRegion(final 
MasterProcedureEnv env) throws IOException {<a name="line.635"></a>
-<span class="sourceLineNo">636</span>    final MasterFileSystem mfs = 
env.getMasterServices().getMasterFileSystem();<a name="line.636"></a>
-<span class="sourceLineNo">637</span>    final Path tabledir = 
FSUtils.getTableDir(mfs.getRootDir(), regionsToMerge[0].getTable());<a 
name="line.637"></a>
-<span class="sourceLineNo">638</span>    final FileSystem fs = 
mfs.getFileSystem();<a name="line.638"></a>
-<span class="sourceLineNo">639</span>    HRegionFileSystem regionFs = 
HRegionFileSystem.openRegionFromFileSystem(<a name="line.639"></a>
-<span class="sourceLineNo">640</span>      env.getMasterConfiguration(), fs, 
tabledir, regionsToMerge[0], false);<a name="line.640"></a>
-<span class="sourceLineNo">641</span>    
regionFs.cleanupMergedRegion(mergedRegion);<a name="line.641"></a>
-<span class="sourceLineNo">642</span>  }<a name="line.642"></a>
-<span class="sourceLineNo">643</span><a name="line.643"></a>
-<span class="sourceLineNo">644</span>  /**<a name="line.644"></a>
-<span class="sourceLineNo">645</span>   * Rollback close regions<a 
name="line.645"></a>
-<span class="sourceLineNo">646</span>   * @param env MasterProcedureEnv<a 
name="line.646"></a>
-<span class="sourceLineNo">647</span>   **/<a name="line.647"></a>
-<span class="sourceLineNo">648</span>  private void 
rollbackCloseRegionsForMerge(final MasterProcedureEnv env) throws IOException 
{<a name="line.648"></a>
-<span class="sourceLineNo">649</span>    // Check whether the region is 
closed; if so, open it in the same server<a name="line.649"></a>
-<span class="sourceLineNo">650</span>    final int regionReplication = 
getRegionReplication(env);<a name="line.650"></a>
-<span class="sourceLineNo">651</span>    final ServerName serverName = 
getServerName(env);<a name="line.651"></a>
-<span class="sourceLineNo">652</span><a name="line.652"></a>
-<span class="sourceLineNo">653</span>    final AssignProcedure[] procs =<a 
name="line.653"></a>
-<span class="sourceLineNo">654</span>        new 
AssignProcedure[regionsToMerge.length * regionReplication];<a 
name="line.654"></a>
-<span class="sourceLineNo">655</span>    int procsIdx = 0;<a 
name="line.655"></a>
-<span class="sourceLineNo">656</span>    for (int i = 0; i &lt; 
regionsToMerge.length; ++i) {<a name="line.656"></a>
-<span class="sourceLineNo">657</span>      for (int j = 0; j &lt; 
regionReplication; ++j) {<a name="line.657"></a>
-<span class="sourceLineNo">658</span>        final RegionInfo hri = 
RegionReplicaUtil.getRegionInfoForReplica(regionsToMerge[i], j);<a 
name="line.658"></a>
-<span class="sourceLineNo">659</span>        procs[procsIdx++] = 
env.getAssignmentManager().createAssignProcedure(hri, serverName);<a 
name="line.659"></a>
-<span class="sourceLineNo">660</span>      }<a name="line.660"></a>
-<span class="sourceLineNo">661</span>    }<a name="line.661"></a>
-<span class="sourceLineNo">662</span>    
env.getMasterServices().getMasterProcedureExecutor().submitProcedures(procs);<a 
name="line.662"></a>
-<span class="sourceLineNo">663</span>  }<a name="line.663"></a>
-<span class="sourceLineNo">664</span><a name="line.664"></a>
-<span class="sourceLineNo">665</span>  private UnassignProcedure[] 
createUnassignProcedures(final MasterProcedureEnv env,<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      final int regionReplication) {<a 
name="line.666"></a>
-<span class="sourceLineNo">667</span>    final UnassignProcedure[] procs =<a 
name="line.667"></a>
-<span class="sourceLineNo">668</span>        new 
UnassignProcedure[regionsToMerge.length * regionReplication];<a 
name="line.668"></a>
-<span class="sourceLineNo">669</span>    int procsIdx = 0;<a 
name="line.669"></a>
-<span class="sourceLineNo">670</span>    for (int i = 0; i &lt; 
regionsToMerge.length; ++i) {<a name="line.670"></a>
-<span class="sourceLineNo">671</span>      for (int j = 0; j &lt; 
regionReplication; ++j) {<a name="line.671"></a>
-<span class="sourceLineNo">672</span>        final RegionInfo hri = 
RegionReplicaUtil.getRegionInfoForReplica(regionsToMerge[i], j);<a 
name="line.672"></a>
-<span class="sourceLineNo">673</span>        procs[procsIdx++] = 
env.getAssignmentManager().createUnassignProcedure(hri,null,true);<a 
name="line.673"></a>
-<span class="sourceLineNo">674</span>      }<a name="line.674"></a>
-<span class="sourceLineNo">675</span>    }<a name="line.675"></a>
-<span class="sourceLineNo">676</span>    return procs;<a name="line.676"></a>
-<span class="sourceLineNo">677</span>  }<a name="line.677"></a>
-<span class="sourceLineNo">678</span><a name="line.678"></a>
-<span class="sourceLineNo">679</span>  private AssignProcedure[] 
createAssignProcedures(final MasterProcedureEnv env,<a name="line.679"></a>
-<span class="sourceLineNo">680</span>      final int regionReplication) {<a 
name="line.680"></a>
-<span class="sourceLineNo">681</span>    final ServerName targetServer = 
getServerName(env);<a name="line.681"></a>
-<span class="sourceLineNo">682</span>    final AssignProcedure[] procs = new 
AssignProcedure[regionReplication];<a name="line.682"></a>
-<span class="sourceLineNo">683</span>    for (int i = 0; i &lt; procs.length; 
++i) {<a name="line.683"></a>
-<span class="sourceLineNo">684</span>      final RegionInfo hri = 
RegionReplicaUtil.getRegionInfoForReplica(mergedRegion, i);<a 
name="line.684"></a>
-<span class="sourceLineNo">685</span>      procs[i] = 
env.getAssignmentManager().createAssignProcedure(hri, targetServer);<a 
name="line.685"></a>
-<span class="sourceLineNo">686</span>    }<a name="line.686"></a>
-<span class="sourceLineNo">687</span>    return procs;<a name="line.687"></a>
-<span class="sourceLineNo">688</span>  }<a name="line.688"></a>
-<span class="sourceLineNo">689</span><a name="line.689"></a>
-<span class="sourceLineNo">690</span>  private int getRegionReplication(final 
MasterProcedureEnv env) throws IOException {<a name="line.690"></a>
-<span class="sourceLineNo">691</span>    final TableDescriptor htd = 
env.getMasterServices().getTableDescriptors().get(getTableName());<a 
name="line.691"></a>
-<span class="sourceLineNo">692</span>    return htd.getRegionReplication();<a 
name="line.692"></a>
-<span class="sourceLineNo">693</span>  }<a name="line.693"></a>
-<span class="sourceLineNo">694</span><a name="line.694"></a>
-<span class="sourceLineNo">695</span>  /**<a name="line.695"></a>
-<span class="sourceLineNo">696</span>   * Post merge region action<a 
name="line.696"></a>
-<span class="sourceLineNo">697</span>   * @param env MasterProcedureEnv<a 
name="line.697"></a>
-<span class="sourceLineNo">698</span>   **/<a name="line.698"></a>
-<span class="sourceLineNo">699</span>  private void 
preMergeRegionsCommit(final MasterProcedureEnv env) throws IOException {<a 
name="line.699"></a>
-<span class="sourceLineNo">700</span>    final MasterCoprocessorHost cpHost = 
env.getMasterCoprocessorHost();<a name="line.700"></a>
-<span class="sourceLineNo">701</span>    if (cpHost != null) {<a 
name="line.701"></a>
-<span class="sourceLineNo">702</span>      @MetaMutationAnnotation<a 
name="line.702"></a>
-<span class="sourceLineNo">703</span>      final List&lt;Mutation&gt; 
metaEntries = new ArrayList&lt;Mutation&gt;();<a name="line.703"></a>
-<span class="sourceLineNo">704</span>      
cpHost.preMergeRegionsCommit(regionsToMerge, metaEntries, getUser());<a 
name="line.704"></a>
-<span class="sourceLineNo">705</span>      try {<a name="line.705"></a>
-<span class="sourceLineNo">706</span>        for (Mutation p : metaEntries) 
{<a name="line.706"></a>
-<span class="sourceLineNo">707</span>          
RegionInfo.parseRegionName(p.getRow());<a name="line.707"></a>
-<span class="sourceLineNo">708</span>        }<a name="line.708"></a>
-<span class="sourceLineNo">709</span>      } catch (IOException e) {<a 
name="line.709"></a>
-<span class="sourceLineNo">710</span>        LOG.error("Row key of mutation 
from coprocessor is not parsable as region name."<a name="line.710"></a>
-<span class="sourceLineNo">711</span>          + "Mutations from coprocessor 
should only be for hbase:meta table.", e);<a name="line.711"></a>
-<span class="sourceLineNo">712</span>        throw e;<a name="line.712"></a>
-<span class="sourceLineNo">713</span>      }<a name="line.713"></a>
-<span class="sourceLineNo">714</span>    }<a name="line.714"></a>
-<span class="sourceLineNo">715</span>  }<a name="line.715"></a>
-<span class="sourceLineNo">716</span><a name="line.716"></a>
-<span class="sourceLineNo">717</span>  /**<a name="line.717"></a>
-<span class="sourceLineNo">718</span>   * Add merged region to META and delete 
original regions.<a name="line.718"></a>
-<span class="sourceLineNo">719</span>   */<a name="line.719"></a>
-<span class="sourceLineNo">720</span>  private void 
updateMetaForMergedRegions(final MasterProcedureEnv env)<a name="line.720"></a>
-<span class="sourceLineNo">721</span>  throws IOException, 
ProcedureYieldException {<a name="line.721"></a>
-<span class="sourceLineNo">722</span>    final ServerName serverName = 
getServerName(env);<a name="line.722"></a>
-<span class="sourceLineNo">723</span>    
env.getAssignmentManager().markRegionAsMerged(mergedRegion, serverName,<a 
name="line.723"></a>
-<span class="sourceLineNo">724</span>      regionsToMerge[0], 
regionsToMerge[1]);<a name="line.724"></a>
-<span class="sourceLineNo">725</span>  }<a name="line.725"></a>
-<span class="sourceLineNo">726</span><a name="line.726"></a>
-<span class="sourceLineNo">727</span>  /**<a name="line.727"></a>
-<span class="sourceLineNo">728</span>   * Post merge region action<a 
name="line.728"></a>
-<span class="sourceLineNo">729</span>   * @param env MasterProcedureEnv<a 
name="line.729"></a>
-<span class="sourceLineNo">730</span>   **/<a name="line.730"></a>
-<span class="sourceLineNo">731</span>  private void 
postMergeRegionsCommit(final MasterProcedureEnv env) throws IOException {<a 
name="line.731"></a>
-<span class="sourceLineNo">732</span>    final MasterCoprocessorHost cpHost = 
env.getMasterCoprocessorHost();<a name="line.732"></a>
-<span class="sourceLineNo">733</span>    if (cpHost != null) {<a 
name="line.733"></a>
-<span class="sourceLineNo">734</span>      
cpHost.postMergeRegionsCommit(regionsToMerge, mergedRegion, getUser());<a 
name="line.734"></a>
-<span class="sourceLineNo">735</span>    }<a name="line.735"></a>
-<span class="sourceLineNo">736</span>  }<a name="line.736"></a>
-<span class="sourceLineNo">737</span><a name="line.737"></a>
-<span class="sourceLineNo">738</span>  /**<a name="line.738"></a>
-<span class="sourceLineNo">739</span>   * Post merge region action<a 
name="line.739"></a>
-<span class="sourceLineNo">740</span>   * @param env MasterProcedureEnv<a 
name="line.740"></a>
-<span class="sourceLineNo">741</span>   **/<a name="line.741"></a>
-<span class="sourceLineNo">742</span>  private void 
postCompletedMergeRegions(final MasterProcedureEnv env) throws IOException {<a 
name="line.742"></a>
-<span class="sourceLineNo">743</span>    final MasterCoprocessorHost cpHost = 
env.getMasterCoprocessorHost();<a name="line.743"></a>
-<span class="sourceLineNo">744</span>    if (cpHost != null) {<a 
name="line.744"></a>
-<span class="sourceLineNo">745</span>      
cpHost.postCompletedMergeRegionsAction(regionsToMerge, mergedRegion, 
getUser());<a name="line.745"></a>
-<span class="sourceLineNo">746</span>    }<a name="line.746"></a>
-<span class="sourceLineNo">747</span>  }<a name="line.747"></a>
-<span class="sourceLineNo">748</span><a name="line.748"></a>
-<span class="sourceLineNo">749</span>  /**<a name="line.749"></a>
-<span class="sourceLineNo">750</span>   * The procedure could be restarted 
from a different machine. If the variable is null, we need to<a 
name="line.750"></a>
-<span class="sourceLineNo">751</span>   * retrieve it.<a name="line.751"></a>
-<span class="sourceLineNo">752</span>   * @param env MasterProcedureEnv<a 
name="line.752"></a>
-<span class="sourceLineNo">753</span>   * @return serverName<a 
name="line.753"></a>
-<span class="sourceLineNo">754</span>   */<a name="line.754"></a>
-<span class="sourceLineNo">755</span>  private ServerName getServerName(final 
MasterProcedureEnv env) {<a name="line.755"></a>
-<span class="sourceLineNo">756</span>    if (regionLocation == null) {<a 
name="line.756"></a>
-<span class="sourceLineNo">757</span>      regionLocation = 
env.getAssignmentManager().getRegionStates().<a name="line.757"></a>
-<span class="sourceLineNo">758</span>          
getRegionServerOfRegion(regionsToMerge[0]);<a name="line.758"></a>
-<span class="sourceLineNo">759</span>      // May still be null here but 
return null and let caller deal.<a name="line.759"></a>
-<span class="sourceLineNo">760</span>      // Means we lost the in-memory-only 
location. We are in recovery<a name="line.760"></a>
-<span class="sourceLineNo">761</span>      // or so. The caller should be able 
to deal w/ a null ServerName.<a name="line.761"></a>
-<span class="sourceLineNo">762</span>      // Let them go to the Balancer to 
find one to use instead.<a name="line.762"></a>
-<span class="sourceLineNo">763</span>    }<a name="line.763"></a>
-<span class="sourceLineNo">764</span>    return regionLocation;<a 
name="line.764"></a>
-<span class="sourceLineNo">765</span>  }<a name="line.765"></a>
-<span class="sourceLineNo">766</span><a name="line.766"></a>
-<span class="sourceLineNo">767</span>  /**<a name="line.767"></a>
-<span class="sourceLineNo">768</span>   * The procedure could be restarted 
from a different machine. If the variable is null, we need to<a 
name="line.768"></a>
-<span class="sourceLineNo">769</span>   * retrieve it.<a name="line.769"></a>
-<span class="sourceLineNo">770</span>   * @return traceEnabled<a 
name="line.770"></a>
-<span class="sourceLineNo">771</span>   */<a name="line.771"></a>
-<span class="sourceLineNo">772</span>  private Boolean isTraceEnabled() {<a 
name="line.772"></a>
-<span class="sourceLineNo">773</span>    if (traceEnabled == null) {<a 
name="line.773"></a>
-<span class="sourceLineNo">774</span>      traceEnabled = 
LOG.isTraceEnabled();<a name="line.774"></a>
-<span class="sourceLineNo">775</span>    }<a name="line.775"></a>
-<span class="sourceLineNo">776</span>    return traceEnabled;<a 
name="line.776"></a>
-<span class="sourceLineNo">777</span>  }<a name="line.777"></a>
-<span class="sourceLineNo">778</span><a name="line.778"></a>
-<span class="sourceLineNo">779</span>  /**<a name="line.779"></a>
-<span class="sourceLineNo">780</span>   * @return The merged region. Maybe be 
null if called to early or we failed.<a name="line.780"></a>
-<span class="sourceLineNo">781</span>   */<a name="line.781"></a>
-<span class="sourceLineNo">782</span>  @VisibleForTesting<a 
name="line.782"></a>
-<span class="sourceLineNo">783</span>  public RegionInfo getMergedRegion() {<a 
name="line.783"></a>
-<span class="sourceLineNo">784</span>    return this.mergedRegion;<a 
name="line.784"></a>
-<span class="sourceLineNo">785</span>  }<a name="line.785"></a>
-<span class="sourceLineNo">786</span>}<a name="line.786"></a>
+<span class="sourceLineNo">506</span>    if (!mergeable) {<a 
name="line.506"></a>
+<span class="sourceLineNo">507</span>      IOException e = new 
IOException(current.getRegion().getShortNameToLog() + " NOT mergeable");<a 
name="line.507"></a>
+<span class="sourceLineNo">508</span>      if (mergeableCheckIOE != null) 
e.initCause(mergeableCheckIOE);<a name="line.508"></a>
+<span class="sourceLineNo">509</span>      
super.setFailure(getClass().getSimpleName(), e);<a name="line.509"></a>
+<span class="sourceLineNo">510</span>      return false;<a name="line.510"></a>
+<span class="sourceLineNo">511</span>    }<a name="line.511"></a>
+<span class="sourceLineNo">512</span><a name="line.512"></a>
+<span class="sourceLineNo">513</span>    // Update region states to Merging<a 
name="line.513"></a>
+<span class="sourceLineNo">514</span>    setRegionStateToMerging(env);<a 
name="line.514"></a>
+<span class="sourceLineNo">515</span>    return true;<a name="line.515"></a>
+<span class="sourceLineNo">516</span>  }<a name="line.516"></a>
+<span class="sourceLineNo">517</span><a name="line.517"></a>
+<span class="sourceLineNo">518</span>  private boolean isMergeable(final 
MasterProcedureEnv env, final RegionState rs)<a name="line.518"></a>
+<span class="sourceLineNo">519</span>  throws IOException {<a 
name="line.519"></a>
+<span class="sourceLineNo">520</span>    GetRegionInfoResponse response =<a 
name="line.520"></a>
+<span class="sourceLineNo">521</span>      Util.getRegionInfoResponse(env, 
rs.getServerName(), rs.getRegion());<a name="line.521"></a>
+<span class="sourceLineNo">522</span>    return response.hasMergeable() 
&amp;&amp; response.getMergeable();<a name="line.522"></a>
+<span class="sourceLineNo">523</span>  }<a name="line.523"></a>
+<span class="sourceLineNo">524</span><a name="line.524"></a>
+<span class="sourceLineNo">525</span>  /**<a name="line.525"></a>
+<span class="sourceLineNo">526</span>   * Pre merge region action<a 
name="line.526"></a>
+<span class="sourceLineNo">527</span>   * @param env MasterProcedureEnv<a 
name="line.527"></a>
+<span class="sourceLineNo">528</span>   **/<a name="line.528"></a>
+<span class="sourceLineNo">529</span>  private void preMergeRegions(final 
MasterProcedureEnv env) throws IOException {<a name="line.529"></a>
+<span class="sourceLineNo">530</span>    final MasterCoprocessorHost cpHost = 
env.getMasterCoprocessorHost();<a name="line.530"></a>
+<span class="sourceLineNo">531</span>    if (cpHost != null) {<a 
name="line.531"></a>
+<span class="sourceLineNo">532</span>      
cpHost.preMergeRegionsAction(regionsToMerge, getUser());<a name="line.532"></a>
+<span class="sourceLineNo">533</span>    }<a name="line.533"></a>
+<span class="sourceLineNo">534</span>    // TODO: Clean up split and merge. 
Currently all over the place.<a name="line.534"></a>
+<span class="sourceLineNo">535</span>    try {<a name="line.535"></a>
+<span class="sourceLineNo">536</span>      
env.getMasterServices().getMasterQuotaManager().onRegionMerged(this.mergedRegion);<a
 name="line.536"></a>
+<span class="sourceLineNo">537</span>    } catch (QuotaExceededException e) 
{<a name="line.537"></a>
+<span class="sourceLineNo">538</span>      
env.getAssignmentManager().getRegionNormalizer().planSkipped(this.mergedRegion,<a
 name="line.538"></a>
+<span class="sourceLineNo">539</span>          
NormalizationPlan.PlanType.MERGE);<a name="line.539"></a>
+<span class="sourceLineNo">540</span>      throw e;<a name="line.540"></a>
+<span class="sourceLineNo">541</span>    }<a name="line.541"></a>
+<span class="sourceLineNo">542</span>  }<a name="line.542"></a>
+<span class="sourceLineNo">543</span><a name="line.543"></a>
+<span class="sourceLineNo">544</span>  /**<a name="line.544"></a>
+<span class="sourceLineNo">545</span>   * Action after rollback a merge table 
regions action.<a name="line.545"></a>
+<span class="sourceLineNo">546</span>   * @param env MasterProcedureEnv<a 
name="line.546"></a>
+<span class="sourceLineNo">547</span>   * @throws IOException<a 
name="line.547"></a>
+<span class="sourceLineNo">548</span>   */<a name="line.548"></a>
+<span class="sourceLineNo">549</span>  private void 
postRollBackMergeRegions(final MasterProcedureEnv env) throws IOException {<a 
name="line.549"></a>
+<span class="sourceLineNo">550</span>    final MasterCoprocessorHost cpHost = 
env.getMasterCoprocessorHost();<a name="line.550"></a>
+<span class="sourceLineNo">551</span>    if (cpHost != null) {<a 
name="line.551"></a>
+<span class="sourceLineNo">552</span>      
cpHost.postRollBackMergeRegionsAction(regionsToMerge, getUser());<a 
name="line.552"></a>
+<span class="sourceLineNo">553</span>    }<a name="line.553"></a>
+<span class="sourceLineNo">554</span>  }<a name="line.554"></a>
+<span class="sourceLineNo">555</span><a name="line.555"></a>
+<span class="sourceLineNo">556</span>  /**<a name="line.556"></a>
+<span class="sourceLineNo">557</span>   * Set the region states to MERGING 
state<a name="line.557"></a>
+<span class="sourceLineNo">558</span>   * @param env MasterProcedureEnv<a 
name="line.558"></a>
+<span class="sourceLineNo">559</span>   * @throws IOException<a 
name="line.559"></a>
+<span class="sourceLineNo">560</span>   */<a name="line.560"></a>
+<span class="sourceLineNo">561</span>  public void 
setRegionStateToMerging(final MasterProcedureEnv env) throws IOException {<a 
name="line.561"></a>
+<span class="sourceLineNo">562</span>    // Set State.MERGING to regions to be 
merged<a name="line.562"></a>
+<span class="sourceLineNo">563</span>    RegionStates regionStates = 
env.getAssignmentManager().getRegionStates();<a name="line.563"></a>
+<span class="sourceLineNo">564</span>    
regionStates.getRegionStateNode(regionsToMerge[0]).setState(State.MERGING);<a 
name="line.564"></a>
+<span class="sourceLineNo">565</span>    
regionStates.getRegionStateNode(regionsToMerge[1]).setState(State.MERGING);<a 
name="line.565"></a>
+<span class="sourceLineNo">566</span>  }<a name="line.566"></a>
+<span class="sourceLineNo">567</span><a name="line.567"></a>
+<span class="sourceLineNo">568</span>  /**<a name="line.568"></a>
+<span class="sourceLineNo">569</span>   * Rollback the region state change<a 
name="line.569"></a>
+<span class="sourceLineNo">570</span>   * Not used for now, since 
rollbackCloseRegionsForMerge() will mark regions as OPEN<a name="line.570"></a>
+<span class="sourceLineNo">571</span>   * @param env MasterProcedureEnv<a 
name="line.571"></a>
+<span class="sourceLineNo">572</span>   * @throws IOException<a 
name="line.572"></a>
+<span class="sourceLineNo">573</span>   */<a name="line.573"></a>
+<span class="sourceLineNo">574</span>  private void 
setRegionStateBackToOpen(final MasterProcedureEnv env) throws IOException {<a 
name="line.574"></a>
+<span class="sourceLineNo">575</span>    // revert region state to Open<a 
name="line.575"></a>
+<span class="sourceLineNo">576</span>    RegionStates regionStates = 
env.getAssignmentManager().getRegionStates();<a name="line.576"></a>
+<span class="sourceLineNo">577</span>    
regionStates.getRegionStateNode(regionsToMerge[0]).setState(State.OPEN);<a 
name="line.577"></a>
+<span class="sourceLineNo">578</span>    
regionStates.getRegionStateNode(regionsToMerge[1]).setState(State.OPEN);<a 
name="line.578"></a>
+<span class="sourceLineNo">579</span>  }<a name="line.579"></a>
+<span class="sourceLineNo">580</span><a name="line.580"></a>
+<span class="sourceLineNo">581</span>  /**<a name="line.581"></a>
+<span class="sourceLineNo">582</span>   * Create merged region<a 
name="line.582"></a>
+<span class="sourceLineNo">583</span>   * @param env MasterProcedureEnv<a 
name="line.583"></a>
+<span class="sourceLineNo">584</span>   * @throws IOException<a 
name="line.584"></a>
+<span class="sourceLineNo">585</span>   */<a name="line.585"></a>
+<span class="sourceLineNo">586</span>  private void createMergedRegion(final 
MasterProcedureEnv env) throws IOException {<a name="line.586"></a>
+<span class="sourceLineNo">587</span>    final MasterFileSystem mfs = 
env.getMasterServices().getMasterFileSystem();<a name="line.587"></a>
+<span class="sourceLineNo">588</span>    final Path tabledir = 
FSUtils.getTableDir(mfs.getRootDir(), regionsToMerge[0].getTable());<a 
name="line.588"></a>
+<span class="sourceLineNo">589</span>    final FileSystem fs = 
mfs.getFileSystem();<a name="line.589"></a>
+<span class="sourceLineNo">590</span>    HRegionFileSystem regionFs = 
HRegionFileSystem.openRegionFromFileSystem(<a name="line.590"></a>
+<span class="sourceLineNo">591</span>      env.getMasterConfiguration(), fs, 
tabledir, regionsToMerge[0], false);<a name="line.591"></a>
+<span class="sourceLineNo">592</span>    regionFs.createMergesDir();<a 
name="line.592"></a>
+<span class="sourceLineNo">593</span><a name="line.593"></a>
+<span class="sourceLineNo">594</span>    mergeStoreFiles(env, regionFs, 
regionFs.getMergesDir());<a name="line.594"></a>
+<span class="sourceLineNo">595</span>    HRegionFileSystem regionFs2 = 
HRegionFileSystem.openRegionFromFileSystem(<a name="line.595"></a>
+<span class="sourceLineNo">596</span>      env.getMasterConfiguration(), fs, 
tabledir, regionsToMerge[1], false);<a name="line.596"></a>
+<span class="sourceLineNo">597</span>    mergeStoreFiles(env, regionFs2, 
regionFs.getMergesDir());<a name="line.597"></a>
+<span class="sourceLineNo">598</span><a name="line.598"></a>
+<span class="sourceLineNo">599</span>    
regionFs.commitMergedRegion(mergedRegion);<a name="line.599"></a>
+<span class="sourceLineNo">600</span><a name="line.600"></a>
+<span class="sourceLineNo">601</span>    //Prepare to create merged regions<a 
name="line.601"></a>
+<span class="sourceLineNo">602</span>    
env.getAssignmentManager().getRegionStates().<a name="line.602"></a>
+<span class="sourceLineNo">603</span>        
getOrCreateRegionStateNode(mergedRegion).setState(State.MERGING_NEW);<a 
name="line.603"></a>
+<span class="sourceLineNo">604</span>  }<a name="line.604"></a>
+<span class="sourceLineNo">605</span><a name="line.605"></a>
+<span class="sourceLineNo">606</span>  /**<a name="line.606"></a>
+<span class="sourceLineNo">607</span>   * Create reference file(s) of merging 
regions under the merges directory<a name="line.607"></a>
+<span class="sourceLineNo">608</span>   * @param env MasterProcedureEnv<a 
name="line.608"></a>
+<span class="sourceLineNo">609</span>   * @param regionFs region file system<a 
name="line.609"></a>
+<span class="sourceLineNo">610</span>   * @param mergedDir the temp directory 
of merged region<a name="line.610"></a>
+<span class="sourceLineNo">611</span>   * @throws IOException<a 
name="line.611"></a>
+<span class="sourceLineNo">612</span>   */<a name="line.612"></a>
+<span class="sourceLineNo">613</span>  private void mergeStoreFiles(<a 
name="line.613"></a>
+<span class="sourceLineNo">614</span>      final MasterProcedureEnv env, final 
HRegionFileSystem regionFs, final Path mergedDir)<a name="line.614"></a>
+<span class="sourceLineNo">615</span>      throws IOException {<a 
name="line.615"></a>
+<span class="sourceLineNo">616</span>    final MasterFileSystem mfs = 
env.getMasterServices().getMasterFileSystem();<a name="line.616"></a>
+<span class="sourceLineNo">617</span>    final Configuration conf = 
env.getMasterConfiguration();<a name="line.617"></a>
+<span class="sourceLineNo">618</span>    final TableDescriptor htd = 
env.getMasterServices().getTableDescriptors().get(getTableName());<a 
name="line.618"></a>
+<span class="sourceLineNo">619</span><a name="line.619"></a>
+<span class="sourceLineNo">620</span>    for (String family: 
regionFs.getFamilies()) {<a name="line.620"></a>
+<span class="sourceLineNo">621</span>      final ColumnFamilyDescriptor hcd = 
htd.getColumnFamily(Bytes.toBytes(family));<a name="line.621"></a>
+<span class="sourceLineNo">622</span>      final 
Collection&lt;StoreFileInfo&gt; storeFiles = regionFs.getStoreFiles(family);<a 
name="line.622"></a>
+<span class="sourceLineNo">623</span><a name="line.623"></a>
+<span class="sourceLineNo">624</span>      if (storeFiles != null &amp;&amp; 
storeFiles.size() &gt; 0) {<a name="line.624"></a>
+<span class="sourceLineNo">625</span>        final CacheConfig cacheConf = new 
CacheConfig(conf, hcd);<a name="line.625"></a>
+<span class="sourceLineNo">626</span>        for (StoreFileInfo storeFileInfo: 
storeFiles) {<a name="line.626"></a>
+<span class="sourceLineNo">627</span>          // Create reference file(s) of 
the region in mergedDir<a name="line.627"></a>
+<span class="sourceLineNo">628</span>          
regionFs.mergeStoreFile(mergedRegion, family, new 
HStoreFile(mfs.getFileSystem(),<a name="line.628"></a>
+<span class="sourceLineNo">629</span>              storeFileInfo, conf, 
cacheConf, hcd.getBloomFilterType(), true),<a name="line.629"></a>
+<span class="sourceLineNo">630</span>            mergedDir);<a 
name="line.630"></a>
+<span class="sourceLineNo">631</span>        }<a name="line.631"></a>
+<span class="sourceLineNo">632</span>      }<a name="line.632"></a>
+<span class="sourceLineNo">633</span>    }<a name="line.633"></a>
+<span class="sourceLineNo">634</span>  }<a name="line.634"></a>
+<span class="sourceLineNo">635</span><a name="line.635"></a>
+<span class="sourceLineNo">636</span>  /**<a name="line.636"></a>
+<span class="sourceLineNo">637</span>   * Clean up merged region<a 
name="line.637"></a>
+<span class="sourceLineNo">638</span>   * @param env MasterProcedureEnv<a 
name="line.638"></a>
+<span class="sourceLineNo">639</span>   * @throws IOException<a 
name="line.639"></a>
+<span class="sourceLineNo">640</span>   */<a name="line.640"></a>
+<span class="sourceLineNo">641</span>  private void cleanupMergedRegion(final 
MasterProcedureEn

<TRUNCATED>