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/16 14:54:29 UTC
[08/51] [partial] hbase-site git commit: Published site at
821e4d7de2d576189f4288d1c2acf9e9a9471f5c.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/323b17d9/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestDeadServer.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestDeadServer.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestDeadServer.html
index 11d5ba1..35c9eee 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestDeadServer.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestDeadServer.html
@@ -131,60 +131,62 @@
<span class="sourceLineNo">123</span><a name="line.123"></a>
<span class="sourceLineNo">124</span> DeadServer d = new DeadServer();<a name="line.124"></a>
<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span><a name="line.126"></a>
-<span class="sourceLineNo">127</span> d.add(hostname123);<a name="line.127"></a>
-<span class="sourceLineNo">128</span> mee.incValue(1);<a name="line.128"></a>
-<span class="sourceLineNo">129</span> d.add(hostname1234);<a name="line.129"></a>
-<span class="sourceLineNo">130</span> mee.incValue(1);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> d.add(hostname12345);<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span> List<Pair<ServerName, Long>> copy = d.copyDeadServersSince(2L);<a name="line.133"></a>
-<span class="sourceLineNo">134</span> Assert.assertEquals(2, copy.size());<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span> Assert.assertEquals(hostname1234, copy.get(0).getFirst());<a name="line.136"></a>
-<span class="sourceLineNo">137</span> Assert.assertEquals(new Long(2L), copy.get(0).getSecond());<a name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span> Assert.assertEquals(hostname12345, copy.get(1).getFirst());<a name="line.139"></a>
-<span class="sourceLineNo">140</span> Assert.assertEquals(new Long(3L), copy.get(1).getSecond());<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span> EnvironmentEdgeManager.reset();<a name="line.142"></a>
-<span class="sourceLineNo">143</span> }<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span> @Test<a name="line.145"></a>
-<span class="sourceLineNo">146</span> public void testClean(){<a name="line.146"></a>
-<span class="sourceLineNo">147</span> DeadServer d = new DeadServer();<a name="line.147"></a>
-<span class="sourceLineNo">148</span> d.add(hostname123);<a name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span> d.cleanPreviousInstance(hostname12345);<a name="line.150"></a>
-<span class="sourceLineNo">151</span> Assert.assertFalse(d.isEmpty());<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span> d.cleanPreviousInstance(hostname1234);<a name="line.153"></a>
-<span class="sourceLineNo">154</span> Assert.assertFalse(d.isEmpty());<a name="line.154"></a>
-<span class="sourceLineNo">155</span><a name="line.155"></a>
-<span class="sourceLineNo">156</span> d.cleanPreviousInstance(hostname123_2);<a name="line.156"></a>
-<span class="sourceLineNo">157</span> Assert.assertTrue(d.isEmpty());<a name="line.157"></a>
-<span class="sourceLineNo">158</span> }<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span> @Test<a name="line.160"></a>
-<span class="sourceLineNo">161</span> public void testClearDeadServer(){<a name="line.161"></a>
-<span class="sourceLineNo">162</span> DeadServer d = new DeadServer();<a name="line.162"></a>
-<span class="sourceLineNo">163</span> d.add(hostname123);<a name="line.163"></a>
-<span class="sourceLineNo">164</span> d.add(hostname1234);<a name="line.164"></a>
-<span class="sourceLineNo">165</span> Assert.assertEquals(2, d.size());<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">126</span> d.add(hostname123);<a name="line.126"></a>
+<span class="sourceLineNo">127</span> mee.incValue(1);<a name="line.127"></a>
+<span class="sourceLineNo">128</span> d.add(hostname1234);<a name="line.128"></a>
+<span class="sourceLineNo">129</span> mee.incValue(1);<a name="line.129"></a>
+<span class="sourceLineNo">130</span> d.add(hostname12345);<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span> List<Pair<ServerName, Long>> copy = d.copyDeadServersSince(2L);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> Assert.assertEquals(2, copy.size());<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span> Assert.assertEquals(hostname1234, copy.get(0).getFirst());<a name="line.135"></a>
+<span class="sourceLineNo">136</span> Assert.assertEquals(new Long(2L), copy.get(0).getSecond());<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span> Assert.assertEquals(hostname12345, copy.get(1).getFirst());<a name="line.138"></a>
+<span class="sourceLineNo">139</span> Assert.assertEquals(new Long(3L), copy.get(1).getSecond());<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span> EnvironmentEdgeManager.reset();<a name="line.141"></a>
+<span class="sourceLineNo">142</span> }<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span> @Test<a name="line.144"></a>
+<span class="sourceLineNo">145</span> public void testClean(){<a name="line.145"></a>
+<span class="sourceLineNo">146</span> DeadServer d = new DeadServer();<a name="line.146"></a>
+<span class="sourceLineNo">147</span> d.add(hostname123);<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span> d.cleanPreviousInstance(hostname12345);<a name="line.149"></a>
+<span class="sourceLineNo">150</span> Assert.assertFalse(d.isEmpty());<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span> d.cleanPreviousInstance(hostname1234);<a name="line.152"></a>
+<span class="sourceLineNo">153</span> Assert.assertFalse(d.isEmpty());<a name="line.153"></a>
+<span class="sourceLineNo">154</span><a name="line.154"></a>
+<span class="sourceLineNo">155</span> d.cleanPreviousInstance(hostname123_2);<a name="line.155"></a>
+<span class="sourceLineNo">156</span> Assert.assertTrue(d.isEmpty());<a name="line.156"></a>
+<span class="sourceLineNo">157</span> }<a name="line.157"></a>
+<span class="sourceLineNo">158</span><a name="line.158"></a>
+<span class="sourceLineNo">159</span> @Test<a name="line.159"></a>
+<span class="sourceLineNo">160</span> public void testClearDeadServer(){<a name="line.160"></a>
+<span class="sourceLineNo">161</span> DeadServer d = new DeadServer();<a name="line.161"></a>
+<span class="sourceLineNo">162</span> d.add(hostname123);<a name="line.162"></a>
+<span class="sourceLineNo">163</span> d.add(hostname1234);<a name="line.163"></a>
+<span class="sourceLineNo">164</span> Assert.assertEquals(2, d.size());<a name="line.164"></a>
+<span class="sourceLineNo">165</span><a name="line.165"></a>
+<span class="sourceLineNo">166</span> d.finish(hostname123);<a name="line.166"></a>
<span class="sourceLineNo">167</span> d.removeDeadServer(hostname123);<a name="line.167"></a>
<span class="sourceLineNo">168</span> Assert.assertEquals(1, d.size());<a name="line.168"></a>
-<span class="sourceLineNo">169</span> d.removeDeadServer(hostname1234);<a name="line.169"></a>
-<span class="sourceLineNo">170</span> Assert.assertTrue(d.isEmpty());<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span> d.add(hostname1234);<a name="line.172"></a>
-<span class="sourceLineNo">173</span> Assert.assertFalse(d.removeDeadServer(hostname123_2));<a name="line.173"></a>
-<span class="sourceLineNo">174</span> Assert.assertEquals(1, d.size());<a name="line.174"></a>
-<span class="sourceLineNo">175</span> Assert.assertTrue(d.removeDeadServer(hostname1234));<a name="line.175"></a>
-<span class="sourceLineNo">176</span> Assert.assertTrue(d.isEmpty());<a name="line.176"></a>
-<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span>}<a name="line.178"></a>
-<span class="sourceLineNo">179</span><a name="line.179"></a>
+<span class="sourceLineNo">169</span> d.finish(hostname1234);<a name="line.169"></a>
+<span class="sourceLineNo">170</span> d.removeDeadServer(hostname1234);<a name="line.170"></a>
+<span class="sourceLineNo">171</span> Assert.assertTrue(d.isEmpty());<a name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span> d.add(hostname1234);<a name="line.173"></a>
+<span class="sourceLineNo">174</span> Assert.assertFalse(d.removeDeadServer(hostname123_2));<a name="line.174"></a>
+<span class="sourceLineNo">175</span> Assert.assertEquals(1, d.size());<a name="line.175"></a>
+<span class="sourceLineNo">176</span> d.finish(hostname1234);<a name="line.176"></a>
+<span class="sourceLineNo">177</span> Assert.assertTrue(d.removeDeadServer(hostname1234));<a name="line.177"></a>
+<span class="sourceLineNo">178</span> Assert.assertTrue(d.isEmpty());<a name="line.178"></a>
+<span class="sourceLineNo">179</span> }<a name="line.179"></a>
+<span class="sourceLineNo">180</span>}<a name="line.180"></a>
+<span class="sourceLineNo">181</span><a name="line.181"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/323b17d9/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/TestMergeTableRegionsProcedure.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/TestMergeTableRegionsProcedure.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/TestMergeTableRegionsProcedure.html
index 72719d2..c3ecaef 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/TestMergeTableRegionsProcedure.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/TestMergeTableRegionsProcedure.html
@@ -32,20 +32,20 @@
<span class="sourceLineNo">024</span>import org.apache.hadoop.conf.Configuration;<a name="line.24"></a>
<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.25"></a>
<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.HConstants;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.TableName;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.client.TableDescriptor;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.client.TableDescriptorBuilder;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.master.procedure.MasterProcedureConstants;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.master.procedure.MasterProcedureTestingUtility;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.procedure2.ProcedureMetrics;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;<a name="line.40"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.TableName;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.client.TableDescriptor;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.client.TableDescriptorBuilder;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.master.procedure.MasterProcedureConstants;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.master.procedure.MasterProcedureTestingUtility;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.procedure2.ProcedureMetrics;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.regionserver.HRegion;<a name="line.40"></a>
<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.41"></a>
<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.42"></a>
<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.43"></a>
@@ -74,211 +74,211 @@
<span class="sourceLineNo">066</span> public final TestName name = new TestName();<a name="line.66"></a>
<span class="sourceLineNo">067</span><a name="line.67"></a>
<span class="sourceLineNo">068</span> private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.68"></a>
-<span class="sourceLineNo">069</span> private static long nonceGroup = HConstants.NO_NONCE;<a name="line.69"></a>
-<span class="sourceLineNo">070</span> private static long nonce = HConstants.NO_NONCE;<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span> private static final int initialRegionCount = 4;<a name="line.72"></a>
-<span class="sourceLineNo">073</span> private final static byte[] FAMILY = Bytes.toBytes("FAMILY");<a name="line.73"></a>
-<span class="sourceLineNo">074</span> private final static Configuration conf = UTIL.getConfiguration();<a name="line.74"></a>
-<span class="sourceLineNo">075</span> private static Admin admin;<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span> private AssignmentManager am;<a name="line.77"></a>
-<span class="sourceLineNo">078</span> private ProcedureMetrics mergeProcMetrics;<a name="line.78"></a>
-<span class="sourceLineNo">079</span> private ProcedureMetrics assignProcMetrics;<a name="line.79"></a>
-<span class="sourceLineNo">080</span> private ProcedureMetrics unassignProcMetrics;<a name="line.80"></a>
-<span class="sourceLineNo">081</span> private long mergeSubmittedCount = 0;<a name="line.81"></a>
-<span class="sourceLineNo">082</span> private long mergeFailedCount = 0;<a name="line.82"></a>
-<span class="sourceLineNo">083</span> private long assignSubmittedCount = 0;<a name="line.83"></a>
-<span class="sourceLineNo">084</span> private long assignFailedCount = 0;<a name="line.84"></a>
-<span class="sourceLineNo">085</span> private long unassignSubmittedCount = 0;<a name="line.85"></a>
-<span class="sourceLineNo">086</span> private long unassignFailedCount = 0;<a name="line.86"></a>
-<span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span> private static void setupConf(Configuration conf) {<a name="line.88"></a>
-<span class="sourceLineNo">089</span> // Reduce the maximum attempts to speed up the test<a name="line.89"></a>
-<span class="sourceLineNo">090</span> conf.setInt("hbase.assignment.maximum.attempts", 3);<a name="line.90"></a>
-<span class="sourceLineNo">091</span> conf.setInt("hbase.master.maximum.ping.server.attempts", 3);<a name="line.91"></a>
-<span class="sourceLineNo">092</span> conf.setInt("hbase.master.ping.server.retry.sleep.interval", 1);<a name="line.92"></a>
-<span class="sourceLineNo">093</span> conf.setInt(MasterProcedureConstants.MASTER_PROCEDURE_THREADS, 1);<a name="line.93"></a>
-<span class="sourceLineNo">094</span> }<a name="line.94"></a>
-<span class="sourceLineNo">095</span><a name="line.95"></a>
-<span class="sourceLineNo">096</span> @BeforeClass<a name="line.96"></a>
-<span class="sourceLineNo">097</span> public static void setupCluster() throws Exception {<a name="line.97"></a>
-<span class="sourceLineNo">098</span> setupConf(conf);<a name="line.98"></a>
-<span class="sourceLineNo">099</span> UTIL.startMiniCluster(1);<a name="line.99"></a>
-<span class="sourceLineNo">100</span> admin = UTIL.getAdmin();<a name="line.100"></a>
-<span class="sourceLineNo">101</span> }<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span> @AfterClass<a name="line.103"></a>
-<span class="sourceLineNo">104</span> public static void cleanupTest() throws Exception {<a name="line.104"></a>
-<span class="sourceLineNo">105</span> UTIL.shutdownMiniCluster();<a name="line.105"></a>
-<span class="sourceLineNo">106</span> }<a name="line.106"></a>
-<span class="sourceLineNo">107</span><a name="line.107"></a>
-<span class="sourceLineNo">108</span> @Before<a name="line.108"></a>
-<span class="sourceLineNo">109</span> public void setup() throws Exception {<a name="line.109"></a>
-<span class="sourceLineNo">110</span> resetProcExecutorTestingKillFlag();<a name="line.110"></a>
-<span class="sourceLineNo">111</span> nonceGroup =<a name="line.111"></a>
-<span class="sourceLineNo">112</span> MasterProcedureTestingUtility.generateNonceGroup(UTIL.getHBaseCluster().getMaster());<a name="line.112"></a>
-<span class="sourceLineNo">113</span> nonce = MasterProcedureTestingUtility.generateNonce(UTIL.getHBaseCluster().getMaster());<a name="line.113"></a>
-<span class="sourceLineNo">114</span> // Turn off balancer so it doesn't cut in and mess up our placements.<a name="line.114"></a>
-<span class="sourceLineNo">115</span> admin.balancerSwitch(false, true);<a name="line.115"></a>
-<span class="sourceLineNo">116</span> // Turn off the meta scanner so it don't remove parent on us.<a name="line.116"></a>
-<span class="sourceLineNo">117</span> UTIL.getHBaseCluster().getMaster().setCatalogJanitorEnabled(false);<a name="line.117"></a>
-<span class="sourceLineNo">118</span> resetProcExecutorTestingKillFlag();<a name="line.118"></a>
-<span class="sourceLineNo">119</span> am = UTIL.getHBaseCluster().getMaster().getAssignmentManager();<a name="line.119"></a>
-<span class="sourceLineNo">120</span> mergeProcMetrics = am.getAssignmentManagerMetrics().getMergeProcMetrics();<a name="line.120"></a>
-<span class="sourceLineNo">121</span> assignProcMetrics = am.getAssignmentManagerMetrics().getAssignProcMetrics();<a name="line.121"></a>
-<span class="sourceLineNo">122</span> unassignProcMetrics = am.getAssignmentManagerMetrics().getUnassignProcMetrics();<a name="line.122"></a>
-<span class="sourceLineNo">123</span> }<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span> @After<a name="line.125"></a>
-<span class="sourceLineNo">126</span> public void tearDown() throws Exception {<a name="line.126"></a>
-<span class="sourceLineNo">127</span> resetProcExecutorTestingKillFlag();<a name="line.127"></a>
-<span class="sourceLineNo">128</span> for (TableDescriptor htd: admin.listTableDescriptors()) {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> LOG.info("Tear down, remove table=" + htd.getTableName());<a name="line.129"></a>
-<span class="sourceLineNo">130</span> UTIL.deleteTable(htd.getTableName());<a name="line.130"></a>
-<span class="sourceLineNo">131</span> }<a name="line.131"></a>
-<span class="sourceLineNo">132</span> }<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span> private void resetProcExecutorTestingKillFlag() {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.135"></a>
-<span class="sourceLineNo">136</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, false);<a name="line.136"></a>
-<span class="sourceLineNo">137</span> assertTrue("expected executor to be running", procExec.isRunning());<a name="line.137"></a>
-<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span> /**<a name="line.140"></a>
-<span class="sourceLineNo">141</span> * This tests two region merges<a name="line.141"></a>
-<span class="sourceLineNo">142</span> */<a name="line.142"></a>
-<span class="sourceLineNo">143</span> @Test<a name="line.143"></a>
-<span class="sourceLineNo">144</span> public void testMergeTwoRegions() throws Exception {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> final TableName tableName = TableName.valueOf(this.name.getMethodName());<a name="line.145"></a>
-<span class="sourceLineNo">146</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span> List<RegionInfo> tableRegions = createTable(tableName);<a name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span> RegionInfo[] regionsToMerge = new RegionInfo[2];<a name="line.150"></a>
-<span class="sourceLineNo">151</span> regionsToMerge[0] = tableRegions.get(0);<a name="line.151"></a>
-<span class="sourceLineNo">152</span> regionsToMerge[1] = tableRegions.get(1);<a name="line.152"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span> private static final int initialRegionCount = 4;<a name="line.70"></a>
+<span class="sourceLineNo">071</span> private final static byte[] FAMILY = Bytes.toBytes("FAMILY");<a name="line.71"></a>
+<span class="sourceLineNo">072</span> private final static Configuration conf = UTIL.getConfiguration();<a name="line.72"></a>
+<span class="sourceLineNo">073</span> private static Admin admin;<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span> private AssignmentManager am;<a name="line.75"></a>
+<span class="sourceLineNo">076</span> private ProcedureMetrics mergeProcMetrics;<a name="line.76"></a>
+<span class="sourceLineNo">077</span> private ProcedureMetrics assignProcMetrics;<a name="line.77"></a>
+<span class="sourceLineNo">078</span> private ProcedureMetrics unassignProcMetrics;<a name="line.78"></a>
+<span class="sourceLineNo">079</span> private long mergeSubmittedCount = 0;<a name="line.79"></a>
+<span class="sourceLineNo">080</span> private long mergeFailedCount = 0;<a name="line.80"></a>
+<span class="sourceLineNo">081</span> private long assignSubmittedCount = 0;<a name="line.81"></a>
+<span class="sourceLineNo">082</span> private long assignFailedCount = 0;<a name="line.82"></a>
+<span class="sourceLineNo">083</span> private long unassignSubmittedCount = 0;<a name="line.83"></a>
+<span class="sourceLineNo">084</span> private long unassignFailedCount = 0;<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span> private static void setupConf(Configuration conf) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> // Reduce the maximum attempts to speed up the test<a name="line.87"></a>
+<span class="sourceLineNo">088</span> conf.setInt("hbase.assignment.maximum.attempts", 3);<a name="line.88"></a>
+<span class="sourceLineNo">089</span> conf.setInt("hbase.master.maximum.ping.server.attempts", 3);<a name="line.89"></a>
+<span class="sourceLineNo">090</span> conf.setInt("hbase.master.ping.server.retry.sleep.interval", 1);<a name="line.90"></a>
+<span class="sourceLineNo">091</span> conf.setInt(MasterProcedureConstants.MASTER_PROCEDURE_THREADS, 1);<a name="line.91"></a>
+<span class="sourceLineNo">092</span> }<a name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span> @BeforeClass<a name="line.94"></a>
+<span class="sourceLineNo">095</span> public static void setupCluster() throws Exception {<a name="line.95"></a>
+<span class="sourceLineNo">096</span> setupConf(conf);<a name="line.96"></a>
+<span class="sourceLineNo">097</span> UTIL.startMiniCluster(1);<a name="line.97"></a>
+<span class="sourceLineNo">098</span> admin = UTIL.getAdmin();<a name="line.98"></a>
+<span class="sourceLineNo">099</span> }<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span> @AfterClass<a name="line.101"></a>
+<span class="sourceLineNo">102</span> public static void cleanupTest() throws Exception {<a name="line.102"></a>
+<span class="sourceLineNo">103</span> UTIL.shutdownMiniCluster();<a name="line.103"></a>
+<span class="sourceLineNo">104</span> }<a name="line.104"></a>
+<span class="sourceLineNo">105</span><a name="line.105"></a>
+<span class="sourceLineNo">106</span> @Before<a name="line.106"></a>
+<span class="sourceLineNo">107</span> public void setup() throws Exception {<a name="line.107"></a>
+<span class="sourceLineNo">108</span> resetProcExecutorTestingKillFlag();<a name="line.108"></a>
+<span class="sourceLineNo">109</span> MasterProcedureTestingUtility.generateNonceGroup(UTIL.getHBaseCluster().getMaster());<a name="line.109"></a>
+<span class="sourceLineNo">110</span> MasterProcedureTestingUtility.generateNonce(UTIL.getHBaseCluster().getMaster());<a name="line.110"></a>
+<span class="sourceLineNo">111</span> // Turn off balancer so it doesn't cut in and mess up our placements.<a name="line.111"></a>
+<span class="sourceLineNo">112</span> admin.balancerSwitch(false, true);<a name="line.112"></a>
+<span class="sourceLineNo">113</span> // Turn off the meta scanner so it don't remove parent on us.<a name="line.113"></a>
+<span class="sourceLineNo">114</span> UTIL.getHBaseCluster().getMaster().setCatalogJanitorEnabled(false);<a name="line.114"></a>
+<span class="sourceLineNo">115</span> resetProcExecutorTestingKillFlag();<a name="line.115"></a>
+<span class="sourceLineNo">116</span> am = UTIL.getHBaseCluster().getMaster().getAssignmentManager();<a name="line.116"></a>
+<span class="sourceLineNo">117</span> mergeProcMetrics = am.getAssignmentManagerMetrics().getMergeProcMetrics();<a name="line.117"></a>
+<span class="sourceLineNo">118</span> assignProcMetrics = am.getAssignmentManagerMetrics().getAssignProcMetrics();<a name="line.118"></a>
+<span class="sourceLineNo">119</span> unassignProcMetrics = am.getAssignmentManagerMetrics().getUnassignProcMetrics();<a name="line.119"></a>
+<span class="sourceLineNo">120</span> }<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span> @After<a name="line.122"></a>
+<span class="sourceLineNo">123</span> public void tearDown() throws Exception {<a name="line.123"></a>
+<span class="sourceLineNo">124</span> resetProcExecutorTestingKillFlag();<a name="line.124"></a>
+<span class="sourceLineNo">125</span> for (TableDescriptor htd: admin.listTableDescriptors()) {<a name="line.125"></a>
+<span class="sourceLineNo">126</span> LOG.info("Tear down, remove table=" + htd.getTableName());<a name="line.126"></a>
+<span class="sourceLineNo">127</span> UTIL.deleteTable(htd.getTableName());<a name="line.127"></a>
+<span class="sourceLineNo">128</span> }<a name="line.128"></a>
+<span class="sourceLineNo">129</span> }<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span> private void resetProcExecutorTestingKillFlag() {<a name="line.131"></a>
+<span class="sourceLineNo">132</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.132"></a>
+<span class="sourceLineNo">133</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, false);<a name="line.133"></a>
+<span class="sourceLineNo">134</span> assertTrue("expected executor to be running", procExec.isRunning());<a name="line.134"></a>
+<span class="sourceLineNo">135</span> }<a name="line.135"></a>
+<span class="sourceLineNo">136</span><a name="line.136"></a>
+<span class="sourceLineNo">137</span> /**<a name="line.137"></a>
+<span class="sourceLineNo">138</span> * This tests two region merges<a name="line.138"></a>
+<span class="sourceLineNo">139</span> */<a name="line.139"></a>
+<span class="sourceLineNo">140</span> @Test<a name="line.140"></a>
+<span class="sourceLineNo">141</span> public void testMergeTwoRegions() throws Exception {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> final TableName tableName = TableName.valueOf(this.name.getMethodName());<a name="line.142"></a>
+<span class="sourceLineNo">143</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span> List<RegionInfo> tableRegions = createTable(tableName);<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span> RegionInfo[] regionsToMerge = new RegionInfo[2];<a name="line.147"></a>
+<span class="sourceLineNo">148</span> regionsToMerge[0] = tableRegions.get(0);<a name="line.148"></a>
+<span class="sourceLineNo">149</span> regionsToMerge[1] = tableRegions.get(1);<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span> // collect AM metrics before test<a name="line.151"></a>
+<span class="sourceLineNo">152</span> collectAssignmentManagerMetrics();<a name="line.152"></a>
<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span> // collect AM metrics before test<a name="line.154"></a>
-<span class="sourceLineNo">155</span> collectAssignmentManagerMetrics();<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span> MergeTableRegionsProcedure proc =<a name="line.157"></a>
-<span class="sourceLineNo">158</span> new MergeTableRegionsProcedure(procExec.getEnvironment(), regionsToMerge, true);<a name="line.158"></a>
-<span class="sourceLineNo">159</span> long procId = procExec.submitProcedure(proc);<a name="line.159"></a>
-<span class="sourceLineNo">160</span> ProcedureTestingUtility.waitProcedure(procExec, procId);<a name="line.160"></a>
-<span class="sourceLineNo">161</span> ProcedureTestingUtility.assertProcNotFailed(procExec, procId);<a name="line.161"></a>
-<span class="sourceLineNo">162</span> assertRegionCount(tableName, initialRegionCount - 1);<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span> assertEquals(mergeSubmittedCount + 1, mergeProcMetrics.getSubmittedCounter().getCount());<a name="line.164"></a>
-<span class="sourceLineNo">165</span> assertEquals(mergeFailedCount, mergeProcMetrics.getFailedCounter().getCount());<a name="line.165"></a>
-<span class="sourceLineNo">166</span> assertEquals(assignSubmittedCount + 1, assignProcMetrics.getSubmittedCounter().getCount());<a name="line.166"></a>
-<span class="sourceLineNo">167</span> assertEquals(assignFailedCount, assignProcMetrics.getFailedCounter().getCount());<a name="line.167"></a>
-<span class="sourceLineNo">168</span> assertEquals(unassignSubmittedCount + 2, unassignProcMetrics.getSubmittedCounter().getCount());<a name="line.168"></a>
-<span class="sourceLineNo">169</span> assertEquals(unassignFailedCount, unassignProcMetrics.getFailedCounter().getCount());<a name="line.169"></a>
-<span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span> Pair<RegionInfo, RegionInfo> pair =<a name="line.171"></a>
-<span class="sourceLineNo">172</span> MetaTableAccessor.getRegionsFromMergeQualifier(UTIL.getConnection(),<a name="line.172"></a>
-<span class="sourceLineNo">173</span> proc.getMergedRegion().getRegionName());<a name="line.173"></a>
-<span class="sourceLineNo">174</span> assertTrue(pair.getFirst() != null && pair.getSecond() != null);<a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span> // Can I purge the merged regions from hbase:meta? Check that all went<a name="line.176"></a>
-<span class="sourceLineNo">177</span> // well by looking at the merged row up in hbase:meta. It should have no<a name="line.177"></a>
-<span class="sourceLineNo">178</span> // more mention of the merged regions; they are purged as last step in<a name="line.178"></a>
-<span class="sourceLineNo">179</span> // the merged regions cleanup.<a name="line.179"></a>
-<span class="sourceLineNo">180</span> UTIL.getHBaseCluster().getMaster().setCatalogJanitorEnabled(true);<a name="line.180"></a>
-<span class="sourceLineNo">181</span> UTIL.getHBaseCluster().getMaster().getCatalogJanitor().triggerNow();<a name="line.181"></a>
-<span class="sourceLineNo">182</span> while (pair != null && pair.getFirst() != null && pair.getSecond() != null) {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> pair = MetaTableAccessor.getRegionsFromMergeQualifier(UTIL.getConnection(),<a name="line.183"></a>
-<span class="sourceLineNo">184</span> proc.getMergedRegion().getRegionName());<a name="line.184"></a>
-<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span> }<a name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span> /**<a name="line.188"></a>
-<span class="sourceLineNo">189</span> * This tests two concurrent region merges<a name="line.189"></a>
-<span class="sourceLineNo">190</span> */<a name="line.190"></a>
-<span class="sourceLineNo">191</span> @Test<a name="line.191"></a>
-<span class="sourceLineNo">192</span> public void testMergeRegionsConcurrently() throws Exception {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> final TableName tableName = TableName.valueOf("testMergeRegionsConcurrently");<a name="line.193"></a>
-<span class="sourceLineNo">194</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.194"></a>
-<span class="sourceLineNo">195</span><a name="line.195"></a>
-<span class="sourceLineNo">196</span> List<RegionInfo> tableRegions = createTable(tableName);<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span> RegionInfo[] regionsToMerge1 = new RegionInfo[2];<a name="line.198"></a>
-<span class="sourceLineNo">199</span> RegionInfo[] regionsToMerge2 = new RegionInfo[2];<a name="line.199"></a>
-<span class="sourceLineNo">200</span> regionsToMerge1[0] = tableRegions.get(0);<a name="line.200"></a>
-<span class="sourceLineNo">201</span> regionsToMerge1[1] = tableRegions.get(1);<a name="line.201"></a>
-<span class="sourceLineNo">202</span> regionsToMerge2[0] = tableRegions.get(2);<a name="line.202"></a>
-<span class="sourceLineNo">203</span> regionsToMerge2[1] = tableRegions.get(3);<a name="line.203"></a>
+<span class="sourceLineNo">154</span> MergeTableRegionsProcedure proc =<a name="line.154"></a>
+<span class="sourceLineNo">155</span> new MergeTableRegionsProcedure(procExec.getEnvironment(), regionsToMerge, true);<a name="line.155"></a>
+<span class="sourceLineNo">156</span> long procId = procExec.submitProcedure(proc);<a name="line.156"></a>
+<span class="sourceLineNo">157</span> ProcedureTestingUtility.waitProcedure(procExec, procId);<a name="line.157"></a>
+<span class="sourceLineNo">158</span> ProcedureTestingUtility.assertProcNotFailed(procExec, procId);<a name="line.158"></a>
+<span class="sourceLineNo">159</span> assertRegionCount(tableName, initialRegionCount - 1);<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span> assertEquals(mergeSubmittedCount + 1, mergeProcMetrics.getSubmittedCounter().getCount());<a name="line.161"></a>
+<span class="sourceLineNo">162</span> assertEquals(mergeFailedCount, mergeProcMetrics.getFailedCounter().getCount());<a name="line.162"></a>
+<span class="sourceLineNo">163</span> assertEquals(assignSubmittedCount + 1, assignProcMetrics.getSubmittedCounter().getCount());<a name="line.163"></a>
+<span class="sourceLineNo">164</span> assertEquals(assignFailedCount, assignProcMetrics.getFailedCounter().getCount());<a name="line.164"></a>
+<span class="sourceLineNo">165</span> assertEquals(unassignSubmittedCount + 2, unassignProcMetrics.getSubmittedCounter().getCount());<a name="line.165"></a>
+<span class="sourceLineNo">166</span> assertEquals(unassignFailedCount, unassignProcMetrics.getFailedCounter().getCount());<a name="line.166"></a>
+<span class="sourceLineNo">167</span><a name="line.167"></a>
+<span class="sourceLineNo">168</span> Pair<RegionInfo, RegionInfo> pair =<a name="line.168"></a>
+<span class="sourceLineNo">169</span> MetaTableAccessor.getRegionsFromMergeQualifier(UTIL.getConnection(),<a name="line.169"></a>
+<span class="sourceLineNo">170</span> proc.getMergedRegion().getRegionName());<a name="line.170"></a>
+<span class="sourceLineNo">171</span> assertTrue(pair.getFirst() != null && pair.getSecond() != null);<a name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span> // Can I purge the merged regions from hbase:meta? Check that all went<a name="line.173"></a>
+<span class="sourceLineNo">174</span> // well by looking at the merged row up in hbase:meta. It should have no<a name="line.174"></a>
+<span class="sourceLineNo">175</span> // more mention of the merged regions; they are purged as last step in<a name="line.175"></a>
+<span class="sourceLineNo">176</span> // the merged regions cleanup.<a name="line.176"></a>
+<span class="sourceLineNo">177</span> UTIL.getHBaseCluster().getMaster().setCatalogJanitorEnabled(true);<a name="line.177"></a>
+<span class="sourceLineNo">178</span> UTIL.getHBaseCluster().getMaster().getCatalogJanitor().triggerNow();<a name="line.178"></a>
+<span class="sourceLineNo">179</span> while (pair != null && pair.getFirst() != null && pair.getSecond() != null) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> pair = MetaTableAccessor.getRegionsFromMergeQualifier(UTIL.getConnection(),<a name="line.180"></a>
+<span class="sourceLineNo">181</span> proc.getMergedRegion().getRegionName());<a name="line.181"></a>
+<span class="sourceLineNo">182</span> }<a name="line.182"></a>
+<span class="sourceLineNo">183</span> }<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span> /**<a name="line.185"></a>
+<span class="sourceLineNo">186</span> * This tests two concurrent region merges<a name="line.186"></a>
+<span class="sourceLineNo">187</span> */<a name="line.187"></a>
+<span class="sourceLineNo">188</span> @Test<a name="line.188"></a>
+<span class="sourceLineNo">189</span> public void testMergeRegionsConcurrently() throws Exception {<a name="line.189"></a>
+<span class="sourceLineNo">190</span> final TableName tableName = TableName.valueOf("testMergeRegionsConcurrently");<a name="line.190"></a>
+<span class="sourceLineNo">191</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.191"></a>
+<span class="sourceLineNo">192</span><a name="line.192"></a>
+<span class="sourceLineNo">193</span> List<RegionInfo> tableRegions = createTable(tableName);<a name="line.193"></a>
+<span class="sourceLineNo">194</span><a name="line.194"></a>
+<span class="sourceLineNo">195</span> RegionInfo[] regionsToMerge1 = new RegionInfo[2];<a name="line.195"></a>
+<span class="sourceLineNo">196</span> RegionInfo[] regionsToMerge2 = new RegionInfo[2];<a name="line.196"></a>
+<span class="sourceLineNo">197</span> regionsToMerge1[0] = tableRegions.get(0);<a name="line.197"></a>
+<span class="sourceLineNo">198</span> regionsToMerge1[1] = tableRegions.get(1);<a name="line.198"></a>
+<span class="sourceLineNo">199</span> regionsToMerge2[0] = tableRegions.get(2);<a name="line.199"></a>
+<span class="sourceLineNo">200</span> regionsToMerge2[1] = tableRegions.get(3);<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span> // collect AM metrics before test<a name="line.202"></a>
+<span class="sourceLineNo">203</span> collectAssignmentManagerMetrics();<a name="line.203"></a>
<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span> // collect AM metrics before test<a name="line.205"></a>
-<span class="sourceLineNo">206</span> collectAssignmentManagerMetrics();<a name="line.206"></a>
-<span class="sourceLineNo">207</span><a name="line.207"></a>
-<span class="sourceLineNo">208</span> long procId1 = procExec.submitProcedure(new MergeTableRegionsProcedure(<a name="line.208"></a>
-<span class="sourceLineNo">209</span> procExec.getEnvironment(), regionsToMerge1, true));<a name="line.209"></a>
-<span class="sourceLineNo">210</span> long procId2 = procExec.submitProcedure(new MergeTableRegionsProcedure(<a name="line.210"></a>
-<span class="sourceLineNo">211</span> procExec.getEnvironment(), regionsToMerge2, true));<a name="line.211"></a>
-<span class="sourceLineNo">212</span> ProcedureTestingUtility.waitProcedure(procExec, procId1);<a name="line.212"></a>
-<span class="sourceLineNo">213</span> ProcedureTestingUtility.waitProcedure(procExec, procId2);<a name="line.213"></a>
-<span class="sourceLineNo">214</span> ProcedureTestingUtility.assertProcNotFailed(procExec, procId1);<a name="line.214"></a>
-<span class="sourceLineNo">215</span> ProcedureTestingUtility.assertProcNotFailed(procExec, procId2);<a name="line.215"></a>
-<span class="sourceLineNo">216</span> assertRegionCount(tableName, initialRegionCount - 2);<a name="line.216"></a>
-<span class="sourceLineNo">217</span><a name="line.217"></a>
-<span class="sourceLineNo">218</span> assertEquals(mergeSubmittedCount + 2, mergeProcMetrics.getSubmittedCounter().getCount());<a name="line.218"></a>
-<span class="sourceLineNo">219</span> assertEquals(mergeFailedCount, mergeProcMetrics.getFailedCounter().getCount());<a name="line.219"></a>
-<span class="sourceLineNo">220</span> assertEquals(assignSubmittedCount + 2, assignProcMetrics.getSubmittedCounter().getCount());<a name="line.220"></a>
-<span class="sourceLineNo">221</span> assertEquals(assignFailedCount, assignProcMetrics.getFailedCounter().getCount());<a name="line.221"></a>
-<span class="sourceLineNo">222</span> assertEquals(unassignSubmittedCount + 4, unassignProcMetrics.getSubmittedCounter().getCount());<a name="line.222"></a>
-<span class="sourceLineNo">223</span> assertEquals(unassignFailedCount, unassignProcMetrics.getFailedCounter().getCount());<a name="line.223"></a>
-<span class="sourceLineNo">224</span> }<a name="line.224"></a>
-<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span> @Test<a name="line.226"></a>
-<span class="sourceLineNo">227</span> public void testRecoveryAndDoubleExecution() throws Exception {<a name="line.227"></a>
-<span class="sourceLineNo">228</span> final TableName tableName = TableName.valueOf("testRecoveryAndDoubleExecution");<a name="line.228"></a>
-<span class="sourceLineNo">229</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.229"></a>
-<span class="sourceLineNo">230</span><a name="line.230"></a>
-<span class="sourceLineNo">231</span> List<RegionInfo> tableRegions = createTable(tableName);<a name="line.231"></a>
-<span class="sourceLineNo">232</span><a name="line.232"></a>
-<span class="sourceLineNo">233</span> ProcedureTestingUtility.waitNoProcedureRunning(procExec);<a name="line.233"></a>
-<span class="sourceLineNo">234</span> ProcedureTestingUtility.setKillIfHasParent(procExec, false);<a name="line.234"></a>
-<span class="sourceLineNo">235</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span> RegionInfo[] regionsToMerge = new RegionInfo[2];<a name="line.237"></a>
-<span class="sourceLineNo">238</span> regionsToMerge[0] = tableRegions.get(0);<a name="line.238"></a>
-<span class="sourceLineNo">239</span> regionsToMerge[1] = tableRegions.get(1);<a name="line.239"></a>
+<span class="sourceLineNo">205</span> long procId1 = procExec.submitProcedure(new MergeTableRegionsProcedure(<a name="line.205"></a>
+<span class="sourceLineNo">206</span> procExec.getEnvironment(), regionsToMerge1, true));<a name="line.206"></a>
+<span class="sourceLineNo">207</span> long procId2 = procExec.submitProcedure(new MergeTableRegionsProcedure(<a name="line.207"></a>
+<span class="sourceLineNo">208</span> procExec.getEnvironment(), regionsToMerge2, true));<a name="line.208"></a>
+<span class="sourceLineNo">209</span> ProcedureTestingUtility.waitProcedure(procExec, procId1);<a name="line.209"></a>
+<span class="sourceLineNo">210</span> ProcedureTestingUtility.waitProcedure(procExec, procId2);<a name="line.210"></a>
+<span class="sourceLineNo">211</span> ProcedureTestingUtility.assertProcNotFailed(procExec, procId1);<a name="line.211"></a>
+<span class="sourceLineNo">212</span> ProcedureTestingUtility.assertProcNotFailed(procExec, procId2);<a name="line.212"></a>
+<span class="sourceLineNo">213</span> assertRegionCount(tableName, initialRegionCount - 2);<a name="line.213"></a>
+<span class="sourceLineNo">214</span><a name="line.214"></a>
+<span class="sourceLineNo">215</span> assertEquals(mergeSubmittedCount + 2, mergeProcMetrics.getSubmittedCounter().getCount());<a name="line.215"></a>
+<span class="sourceLineNo">216</span> assertEquals(mergeFailedCount, mergeProcMetrics.getFailedCounter().getCount());<a name="line.216"></a>
+<span class="sourceLineNo">217</span> assertEquals(assignSubmittedCount + 2, assignProcMetrics.getSubmittedCounter().getCount());<a name="line.217"></a>
+<span class="sourceLineNo">218</span> assertEquals(assignFailedCount, assignProcMetrics.getFailedCounter().getCount());<a name="line.218"></a>
+<span class="sourceLineNo">219</span> assertEquals(unassignSubmittedCount + 4, unassignProcMetrics.getSubmittedCounter().getCount());<a name="line.219"></a>
+<span class="sourceLineNo">220</span> assertEquals(unassignFailedCount, unassignProcMetrics.getFailedCounter().getCount());<a name="line.220"></a>
+<span class="sourceLineNo">221</span> }<a name="line.221"></a>
+<span class="sourceLineNo">222</span><a name="line.222"></a>
+<span class="sourceLineNo">223</span> @Test<a name="line.223"></a>
+<span class="sourceLineNo">224</span> public void testRecoveryAndDoubleExecution() throws Exception {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> final TableName tableName = TableName.valueOf("testRecoveryAndDoubleExecution");<a name="line.225"></a>
+<span class="sourceLineNo">226</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span> List<RegionInfo> tableRegions = createTable(tableName);<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span> ProcedureTestingUtility.waitNoProcedureRunning(procExec);<a name="line.230"></a>
+<span class="sourceLineNo">231</span> ProcedureTestingUtility.setKillIfHasParent(procExec, false);<a name="line.231"></a>
+<span class="sourceLineNo">232</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);<a name="line.232"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">234</span> RegionInfo[] regionsToMerge = new RegionInfo[2];<a name="line.234"></a>
+<span class="sourceLineNo">235</span> regionsToMerge[0] = tableRegions.get(0);<a name="line.235"></a>
+<span class="sourceLineNo">236</span> regionsToMerge[1] = tableRegions.get(1);<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span> long procId = procExec.submitProcedure(<a name="line.238"></a>
+<span class="sourceLineNo">239</span> new MergeTableRegionsProcedure(procExec.getEnvironment(), regionsToMerge, true));<a name="line.239"></a>
<span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span> long procId = procExec.submitProcedure(<a name="line.241"></a>
-<span class="sourceLineNo">242</span> new MergeTableRegionsProcedure(procExec.getEnvironment(), regionsToMerge, true));<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span> // Restart the executor and execute the step twice<a name="line.244"></a>
-<span class="sourceLineNo">245</span> MasterProcedureTestingUtility.testRecoveryAndDoubleExecution(procExec, procId);<a name="line.245"></a>
-<span class="sourceLineNo">246</span> ProcedureTestingUtility.assertProcNotFailed(procExec, procId);<a name="line.246"></a>
+<span class="sourceLineNo">241</span> // Restart the executor and execute the step twice<a name="line.241"></a>
+<span class="sourceLineNo">242</span> MasterProcedureTestingUtility.testRecoveryAndDoubleExecution(procExec, procId);<a name="line.242"></a>
+<span class="sourceLineNo">243</span> ProcedureTestingUtility.assertProcNotFailed(procExec, procId);<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span> assertRegionCount(tableName, initialRegionCount - 1);<a name="line.245"></a>
+<span class="sourceLineNo">246</span> }<a name="line.246"></a>
<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span> assertRegionCount(tableName, initialRegionCount - 1);<a name="line.248"></a>
-<span class="sourceLineNo">249</span> }<a name="line.249"></a>
-<span class="sourceLineNo">250</span><a name="line.250"></a>
-<span class="sourceLineNo">251</span> @Test<a name="line.251"></a>
-<span class="sourceLineNo">252</span> public void testRollbackAndDoubleExecution() throws Exception {<a name="line.252"></a>
-<span class="sourceLineNo">253</span> final TableName tableName = TableName.valueOf("testRollbackAndDoubleExecution");<a name="line.253"></a>
-<span class="sourceLineNo">254</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.254"></a>
-<span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span> List<RegionInfo> tableRegions = createTable(tableName);<a name="line.256"></a>
+<span class="sourceLineNo">248</span> @Test<a name="line.248"></a>
+<span class="sourceLineNo">249</span> public void testRollbackAndDoubleExecution() throws Exception {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> final TableName tableName = TableName.valueOf("testRollbackAndDoubleExecution");<a name="line.250"></a>
+<span class="sourceLineNo">251</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span> List<RegionInfo> tableRegions = createTable(tableName);<a name="line.253"></a>
+<span class="sourceLineNo">254</span><a name="line.254"></a>
+<span class="sourceLineNo">255</span> ProcedureTestingUtility.waitNoProcedureRunning(procExec);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);<a name="line.256"></a>
<span class="sourceLineNo">257</span><a name="line.257"></a>
-<span class="sourceLineNo">258</span> ProcedureTestingUtility.waitNoProcedureRunning(procExec);<a name="line.258"></a>
-<span class="sourceLineNo">259</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span> RegionInfo[] regionsToMerge = new RegionInfo[2];<a name="line.261"></a>
-<span class="sourceLineNo">262</span> regionsToMerge[0] = tableRegions.get(0);<a name="line.262"></a>
-<span class="sourceLineNo">263</span> regionsToMerge[1] = tableRegions.get(1);<a name="line.263"></a>
+<span class="sourceLineNo">258</span> RegionInfo[] regionsToMerge = new RegionInfo[2];<a name="line.258"></a>
+<span class="sourceLineNo">259</span> regionsToMerge[0] = tableRegions.get(0);<a name="line.259"></a>
+<span class="sourceLineNo">260</span> regionsToMerge[1] = tableRegions.get(1);<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span> long procId = procExec.submitProcedure(<a name="line.262"></a>
+<span class="sourceLineNo">263</span> new MergeTableRegionsProcedure(procExec.getEnvironment(), regionsToMerge, true));<a name="line.263"></a>
<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span> long procId = procExec.submitProcedure(<a name="line.265"></a>
-<span class="sourceLineNo">266</span> new MergeTableRegionsProcedure(procExec.getEnvironment(), regionsToMerge, true));<a name="line.266"></a>
-<span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span> // Failing before MERGE_TABLE_REGIONS_CREATE_MERGED_REGION we should trigger the rollback<a name="line.268"></a>
-<span class="sourceLineNo">269</span> // NOTE: the 5 (number before MERGE_TABLE_REGIONS_CREATE_MERGED_REGION step) is<a name="line.269"></a>
-<span class="sourceLineNo">270</span> // hardcoded, so you have to look at this test at least once when you add a new step.<a name="line.270"></a>
-<span class="sourceLineNo">271</span> int numberOfSteps = 5;<a name="line.271"></a>
-<span class="sourceLineNo">272</span> MasterProcedureTestingUtility.testRollbackAndDoubleExecution(procExec, procId, numberOfSteps,<a name="line.272"></a>
-<span class="sourceLineNo">273</span> true);<a name="line.273"></a>
+<span class="sourceLineNo">265</span> // Failing before MERGE_TABLE_REGIONS_UPDATE_META we should trigger the rollback<a name="line.265"></a>
+<span class="sourceLineNo">266</span> // NOTE: the 8 (number of MERGE_TABLE_REGIONS_UPDATE_META step) is<a name="line.266"></a>
+<span class="sourceLineNo">267</span> // hardcoded, so you have to look at this test at least once when you add a new step.<a name="line.267"></a>
+<span class="sourceLineNo">268</span> int lastStep = 8;<a name="line.268"></a>
+<span class="sourceLineNo">269</span> MasterProcedureTestingUtility.testRollbackAndDoubleExecution(procExec, procId, lastStep, true);<a name="line.269"></a>
+<span class="sourceLineNo">270</span> assertEquals(initialRegionCount, UTIL.getAdmin().getRegions(tableName).size());<a name="line.270"></a>
+<span class="sourceLineNo">271</span> UTIL.waitUntilAllRegionsAssigned(tableName);<a name="line.271"></a>
+<span class="sourceLineNo">272</span> List<HRegion> regions = UTIL.getMiniHBaseCluster().getRegions(tableName);<a name="line.272"></a>
+<span class="sourceLineNo">273</span> assertEquals(initialRegionCount, regions.size());<a name="line.273"></a>
<span class="sourceLineNo">274</span> }<a name="line.274"></a>
<span class="sourceLineNo">275</span><a name="line.275"></a>
<span class="sourceLineNo">276</span> @Test<a name="line.276"></a>