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 2017/08/01 15:07:44 UTC
[02/43] hbase-site git commit: Published site at
82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/110df817/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.html
index 002995b..5a0af9d 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.html
@@ -100,436 +100,433 @@
<span class="sourceLineNo">092</span> public Void call() throws Exception {<a name="line.92"></a>
<span class="sourceLineNo">093</span> final AssignmentManager am = env.getAssignmentManager();<a name="line.93"></a>
<span class="sourceLineNo">094</span> am.start();<a name="line.94"></a>
-<span class="sourceLineNo">095</span> if (true) {<a name="line.95"></a>
-<span class="sourceLineNo">096</span> MasterMetaBootstrap metaBootstrap = new MasterMetaBootstrap(master,<a name="line.96"></a>
-<span class="sourceLineNo">097</span> TaskMonitor.get().createStatus("meta"));<a name="line.97"></a>
-<span class="sourceLineNo">098</span> metaBootstrap.splitMetaLogsBeforeAssignment();<a name="line.98"></a>
-<span class="sourceLineNo">099</span> metaBootstrap.assignMeta();<a name="line.99"></a>
-<span class="sourceLineNo">100</span> metaBootstrap.processDeadServers();<a name="line.100"></a>
-<span class="sourceLineNo">101</span> }<a name="line.101"></a>
-<span class="sourceLineNo">102</span> am.joinCluster();<a name="line.102"></a>
-<span class="sourceLineNo">103</span> master.setInitialized(true);<a name="line.103"></a>
-<span class="sourceLineNo">104</span> return null;<a name="line.104"></a>
-<span class="sourceLineNo">105</span> }<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><a name="line.108"></a>
-<span class="sourceLineNo">109</span> // ==========================================================================<a name="line.109"></a>
-<span class="sourceLineNo">110</span> // Master failover utils<a name="line.110"></a>
-<span class="sourceLineNo">111</span> // ==========================================================================<a name="line.111"></a>
-<span class="sourceLineNo">112</span> public static void masterFailover(final HBaseTestingUtility testUtil)<a name="line.112"></a>
-<span class="sourceLineNo">113</span> throws Exception {<a name="line.113"></a>
-<span class="sourceLineNo">114</span> MiniHBaseCluster cluster = testUtil.getMiniHBaseCluster();<a name="line.114"></a>
-<span class="sourceLineNo">115</span><a name="line.115"></a>
-<span class="sourceLineNo">116</span> // Kill the master<a name="line.116"></a>
-<span class="sourceLineNo">117</span> HMaster oldMaster = cluster.getMaster();<a name="line.117"></a>
-<span class="sourceLineNo">118</span> cluster.killMaster(cluster.getMaster().getServerName());<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span> // Wait the secondary<a name="line.120"></a>
-<span class="sourceLineNo">121</span> waitBackupMaster(testUtil, oldMaster);<a name="line.121"></a>
-<span class="sourceLineNo">122</span> }<a name="line.122"></a>
-<span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span> public static void waitBackupMaster(final HBaseTestingUtility testUtil,<a name="line.124"></a>
-<span class="sourceLineNo">125</span> final HMaster oldMaster) throws Exception {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> MiniHBaseCluster cluster = testUtil.getMiniHBaseCluster();<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span> HMaster newMaster = cluster.getMaster();<a name="line.128"></a>
-<span class="sourceLineNo">129</span> while (newMaster == null || newMaster == oldMaster) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span> Thread.sleep(250);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> newMaster = cluster.getMaster();<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> while (!(newMaster.isActiveMaster() && newMaster.isInitialized())) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> Thread.sleep(250);<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><a name="line.138"></a>
-<span class="sourceLineNo">139</span> // ==========================================================================<a name="line.139"></a>
-<span class="sourceLineNo">140</span> // Table Helpers<a name="line.140"></a>
-<span class="sourceLineNo">141</span> // ==========================================================================<a name="line.141"></a>
-<span class="sourceLineNo">142</span> public static HTableDescriptor createHTD(final TableName tableName, final String... family) {<a name="line.142"></a>
-<span class="sourceLineNo">143</span> HTableDescriptor htd = new HTableDescriptor(tableName);<a name="line.143"></a>
-<span class="sourceLineNo">144</span> for (int i = 0; i < family.length; ++i) {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> htd.addFamily(new HColumnDescriptor(family[i]));<a name="line.145"></a>
-<span class="sourceLineNo">146</span> }<a name="line.146"></a>
-<span class="sourceLineNo">147</span> return htd;<a name="line.147"></a>
-<span class="sourceLineNo">148</span> }<a name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span> public static HRegionInfo[] createTable(final ProcedureExecutor<MasterProcedureEnv> procExec,<a name="line.150"></a>
-<span class="sourceLineNo">151</span> final TableName tableName, final byte[][] splitKeys, String... family) throws IOException {<a name="line.151"></a>
-<span class="sourceLineNo">152</span> HTableDescriptor htd = createHTD(tableName, family);<a name="line.152"></a>
-<span class="sourceLineNo">153</span> HRegionInfo[] regions = ModifyRegionUtils.createHRegionInfos(htd, splitKeys);<a name="line.153"></a>
-<span class="sourceLineNo">154</span> long procId = ProcedureTestingUtility.submitAndWait(procExec,<a name="line.154"></a>
-<span class="sourceLineNo">155</span> new CreateTableProcedure(procExec.getEnvironment(), htd, regions));<a name="line.155"></a>
-<span class="sourceLineNo">156</span> ProcedureTestingUtility.assertProcNotFailed(procExec.getResult(procId));<a name="line.156"></a>
-<span class="sourceLineNo">157</span> return regions;<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> public static void validateTableCreation(final HMaster master, final TableName tableName,<a name="line.160"></a>
-<span class="sourceLineNo">161</span> final HRegionInfo[] regions, String... family) throws IOException {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> validateTableCreation(master, tableName, regions, true, family);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> }<a name="line.163"></a>
-<span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span> public static void validateTableCreation(final HMaster master, final TableName tableName,<a name="line.165"></a>
-<span class="sourceLineNo">166</span> final HRegionInfo[] regions, boolean hasFamilyDirs, String... family) throws IOException {<a name="line.166"></a>
-<span class="sourceLineNo">167</span> // check filesystem<a name="line.167"></a>
-<span class="sourceLineNo">168</span> final FileSystem fs = master.getMasterFileSystem().getFileSystem();<a name="line.168"></a>
-<span class="sourceLineNo">169</span> final Path tableDir = FSUtils.getTableDir(master.getMasterFileSystem().getRootDir(), tableName);<a name="line.169"></a>
-<span class="sourceLineNo">170</span> assertTrue(fs.exists(tableDir));<a name="line.170"></a>
-<span class="sourceLineNo">171</span> FSUtils.logFileSystemState(fs, tableDir, LOG);<a name="line.171"></a>
-<span class="sourceLineNo">172</span> List<Path> allRegionDirs = FSUtils.getRegionDirs(fs, tableDir);<a name="line.172"></a>
-<span class="sourceLineNo">173</span> for (int i = 0; i < regions.length; ++i) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span> Path regionDir = new Path(tableDir, regions[i].getEncodedName());<a name="line.174"></a>
-<span class="sourceLineNo">175</span> assertTrue(regions[i] + " region dir does not exist", fs.exists(regionDir));<a name="line.175"></a>
-<span class="sourceLineNo">176</span> assertTrue(allRegionDirs.remove(regionDir));<a name="line.176"></a>
-<span class="sourceLineNo">177</span> List<Path> allFamilyDirs = FSUtils.getFamilyDirs(fs, regionDir);<a name="line.177"></a>
-<span class="sourceLineNo">178</span> for (int j = 0; j < family.length; ++j) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> final Path familyDir = new Path(regionDir, family[j]);<a name="line.179"></a>
-<span class="sourceLineNo">180</span> if (hasFamilyDirs) {<a name="line.180"></a>
-<span class="sourceLineNo">181</span> assertTrue(family[j] + " family dir does not exist", fs.exists(familyDir));<a name="line.181"></a>
-<span class="sourceLineNo">182</span> assertTrue(allFamilyDirs.remove(familyDir));<a name="line.182"></a>
-<span class="sourceLineNo">183</span> } else {<a name="line.183"></a>
-<span class="sourceLineNo">184</span> // TODO: WARN: Modify Table/Families does not create a family dir<a name="line.184"></a>
-<span class="sourceLineNo">185</span> if (!fs.exists(familyDir)) {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> LOG.warn(family[j] + " family dir does not exist");<a name="line.186"></a>
-<span class="sourceLineNo">187</span> }<a name="line.187"></a>
-<span class="sourceLineNo">188</span> allFamilyDirs.remove(familyDir);<a name="line.188"></a>
-<span class="sourceLineNo">189</span> }<a name="line.189"></a>
-<span class="sourceLineNo">190</span> }<a name="line.190"></a>
-<span class="sourceLineNo">191</span> assertTrue("found extraneous families: " + allFamilyDirs, allFamilyDirs.isEmpty());<a name="line.191"></a>
-<span class="sourceLineNo">192</span> }<a name="line.192"></a>
-<span class="sourceLineNo">193</span> assertTrue("found extraneous regions: " + allRegionDirs, allRegionDirs.isEmpty());<a name="line.193"></a>
-<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span> // check meta<a name="line.195"></a>
-<span class="sourceLineNo">196</span> assertTrue(MetaTableAccessor.tableExists(master.getConnection(), tableName));<a name="line.196"></a>
-<span class="sourceLineNo">197</span> assertEquals(regions.length, countMetaRegions(master, tableName));<a name="line.197"></a>
-<span class="sourceLineNo">198</span><a name="line.198"></a>
-<span class="sourceLineNo">199</span> // check htd<a name="line.199"></a>
-<span class="sourceLineNo">200</span> HTableDescriptor htd = master.getTableDescriptors().get(tableName);<a name="line.200"></a>
-<span class="sourceLineNo">201</span> assertTrue("table descriptor not found", htd != null);<a name="line.201"></a>
-<span class="sourceLineNo">202</span> for (int i = 0; i < family.length; ++i) {<a name="line.202"></a>
-<span class="sourceLineNo">203</span> assertTrue("family not found " + family[i], htd.getFamily(Bytes.toBytes(family[i])) != null);<a name="line.203"></a>
-<span class="sourceLineNo">204</span> }<a name="line.204"></a>
-<span class="sourceLineNo">205</span> assertEquals(family.length, htd.getFamilies().size());<a name="line.205"></a>
-<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span><a name="line.207"></a>
-<span class="sourceLineNo">208</span> public static void validateTableDeletion(<a name="line.208"></a>
-<span class="sourceLineNo">209</span> final HMaster master, final TableName tableName) throws IOException {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> // check filesystem<a name="line.210"></a>
-<span class="sourceLineNo">211</span> final FileSystem fs = master.getMasterFileSystem().getFileSystem();<a name="line.211"></a>
-<span class="sourceLineNo">212</span> final Path tableDir = FSUtils.getTableDir(master.getMasterFileSystem().getRootDir(), tableName);<a name="line.212"></a>
-<span class="sourceLineNo">213</span> assertFalse(fs.exists(tableDir));<a name="line.213"></a>
-<span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span> // check meta<a name="line.215"></a>
-<span class="sourceLineNo">216</span> assertFalse(MetaTableAccessor.tableExists(master.getConnection(), tableName));<a name="line.216"></a>
-<span class="sourceLineNo">217</span> assertEquals(0, countMetaRegions(master, tableName));<a name="line.217"></a>
-<span class="sourceLineNo">218</span><a name="line.218"></a>
-<span class="sourceLineNo">219</span> // check htd<a name="line.219"></a>
-<span class="sourceLineNo">220</span> assertTrue("found htd of deleted table",<a name="line.220"></a>
-<span class="sourceLineNo">221</span> master.getTableDescriptors().get(tableName) == null);<a name="line.221"></a>
-<span class="sourceLineNo">222</span> }<a name="line.222"></a>
-<span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span> private static int countMetaRegions(final HMaster master, final TableName tableName)<a name="line.224"></a>
-<span class="sourceLineNo">225</span> throws IOException {<a name="line.225"></a>
-<span class="sourceLineNo">226</span> final AtomicInteger actualRegCount = new AtomicInteger(0);<a name="line.226"></a>
-<span class="sourceLineNo">227</span> final MetaTableAccessor.Visitor visitor = new MetaTableAccessor.Visitor() {<a name="line.227"></a>
-<span class="sourceLineNo">228</span> @Override<a name="line.228"></a>
-<span class="sourceLineNo">229</span> public boolean visit(Result rowResult) throws IOException {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> RegionLocations list = MetaTableAccessor.getRegionLocations(rowResult);<a name="line.230"></a>
-<span class="sourceLineNo">231</span> if (list == null) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span> LOG.warn("No serialized HRegionInfo in " + rowResult);<a name="line.232"></a>
-<span class="sourceLineNo">233</span> return true;<a name="line.233"></a>
-<span class="sourceLineNo">234</span> }<a name="line.234"></a>
-<span class="sourceLineNo">235</span> HRegionLocation l = list.getRegionLocation();<a name="line.235"></a>
-<span class="sourceLineNo">236</span> if (l == null) {<a name="line.236"></a>
-<span class="sourceLineNo">237</span> return true;<a name="line.237"></a>
+<span class="sourceLineNo">095</span> MasterMetaBootstrap metaBootstrap = new MasterMetaBootstrap(master,<a name="line.95"></a>
+<span class="sourceLineNo">096</span> TaskMonitor.get().createStatus("meta"));<a name="line.96"></a>
+<span class="sourceLineNo">097</span> metaBootstrap.recoverMeta();<a name="line.97"></a>
+<span class="sourceLineNo">098</span> metaBootstrap.processDeadServers();<a name="line.98"></a>
+<span class="sourceLineNo">099</span> am.joinCluster();<a name="line.99"></a>
+<span class="sourceLineNo">100</span> master.setInitialized(true);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> return null;<a name="line.101"></a>
+<span class="sourceLineNo">102</span> }<a name="line.102"></a>
+<span class="sourceLineNo">103</span> });<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> // ==========================================================================<a name="line.106"></a>
+<span class="sourceLineNo">107</span> // Master failover utils<a name="line.107"></a>
+<span class="sourceLineNo">108</span> // ==========================================================================<a name="line.108"></a>
+<span class="sourceLineNo">109</span> public static void masterFailover(final HBaseTestingUtility testUtil)<a name="line.109"></a>
+<span class="sourceLineNo">110</span> throws Exception {<a name="line.110"></a>
+<span class="sourceLineNo">111</span> MiniHBaseCluster cluster = testUtil.getMiniHBaseCluster();<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span> // Kill the master<a name="line.113"></a>
+<span class="sourceLineNo">114</span> HMaster oldMaster = cluster.getMaster();<a name="line.114"></a>
+<span class="sourceLineNo">115</span> cluster.killMaster(cluster.getMaster().getServerName());<a name="line.115"></a>
+<span class="sourceLineNo">116</span><a name="line.116"></a>
+<span class="sourceLineNo">117</span> // Wait the secondary<a name="line.117"></a>
+<span class="sourceLineNo">118</span> waitBackupMaster(testUtil, oldMaster);<a name="line.118"></a>
+<span class="sourceLineNo">119</span> }<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span> public static void waitBackupMaster(final HBaseTestingUtility testUtil,<a name="line.121"></a>
+<span class="sourceLineNo">122</span> final HMaster oldMaster) throws Exception {<a name="line.122"></a>
+<span class="sourceLineNo">123</span> MiniHBaseCluster cluster = testUtil.getMiniHBaseCluster();<a name="line.123"></a>
+<span class="sourceLineNo">124</span><a name="line.124"></a>
+<span class="sourceLineNo">125</span> HMaster newMaster = cluster.getMaster();<a name="line.125"></a>
+<span class="sourceLineNo">126</span> while (newMaster == null || newMaster == oldMaster) {<a name="line.126"></a>
+<span class="sourceLineNo">127</span> Thread.sleep(250);<a name="line.127"></a>
+<span class="sourceLineNo">128</span> newMaster = cluster.getMaster();<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> while (!(newMaster.isActiveMaster() && newMaster.isInitialized())) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span> Thread.sleep(250);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> }<a name="line.133"></a>
+<span class="sourceLineNo">134</span> }<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> // Table Helpers<a name="line.137"></a>
+<span class="sourceLineNo">138</span> // ==========================================================================<a name="line.138"></a>
+<span class="sourceLineNo">139</span> public static HTableDescriptor createHTD(final TableName tableName, final String... family) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span> HTableDescriptor htd = new HTableDescriptor(tableName);<a name="line.140"></a>
+<span class="sourceLineNo">141</span> for (int i = 0; i < family.length; ++i) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> htd.addFamily(new HColumnDescriptor(family[i]));<a name="line.142"></a>
+<span class="sourceLineNo">143</span> }<a name="line.143"></a>
+<span class="sourceLineNo">144</span> return htd;<a name="line.144"></a>
+<span class="sourceLineNo">145</span> }<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span> public static HRegionInfo[] createTable(final ProcedureExecutor<MasterProcedureEnv> procExec,<a name="line.147"></a>
+<span class="sourceLineNo">148</span> final TableName tableName, final byte[][] splitKeys, String... family) throws IOException {<a name="line.148"></a>
+<span class="sourceLineNo">149</span> HTableDescriptor htd = createHTD(tableName, family);<a name="line.149"></a>
+<span class="sourceLineNo">150</span> HRegionInfo[] regions = ModifyRegionUtils.createHRegionInfos(htd, splitKeys);<a name="line.150"></a>
+<span class="sourceLineNo">151</span> long procId = ProcedureTestingUtility.submitAndWait(procExec,<a name="line.151"></a>
+<span class="sourceLineNo">152</span> new CreateTableProcedure(procExec.getEnvironment(), htd, regions));<a name="line.152"></a>
+<span class="sourceLineNo">153</span> ProcedureTestingUtility.assertProcNotFailed(procExec.getResult(procId));<a name="line.153"></a>
+<span class="sourceLineNo">154</span> return regions;<a name="line.154"></a>
+<span class="sourceLineNo">155</span> }<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span> public static void validateTableCreation(final HMaster master, final TableName tableName,<a name="line.157"></a>
+<span class="sourceLineNo">158</span> final HRegionInfo[] regions, String... family) throws IOException {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> validateTableCreation(master, tableName, regions, true, family);<a name="line.159"></a>
+<span class="sourceLineNo">160</span> }<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span> public static void validateTableCreation(final HMaster master, final TableName tableName,<a name="line.162"></a>
+<span class="sourceLineNo">163</span> final HRegionInfo[] regions, boolean hasFamilyDirs, String... family) throws IOException {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> // check filesystem<a name="line.164"></a>
+<span class="sourceLineNo">165</span> final FileSystem fs = master.getMasterFileSystem().getFileSystem();<a name="line.165"></a>
+<span class="sourceLineNo">166</span> final Path tableDir = FSUtils.getTableDir(master.getMasterFileSystem().getRootDir(), tableName);<a name="line.166"></a>
+<span class="sourceLineNo">167</span> assertTrue(fs.exists(tableDir));<a name="line.167"></a>
+<span class="sourceLineNo">168</span> FSUtils.logFileSystemState(fs, tableDir, LOG);<a name="line.168"></a>
+<span class="sourceLineNo">169</span> List<Path> allRegionDirs = FSUtils.getRegionDirs(fs, tableDir);<a name="line.169"></a>
+<span class="sourceLineNo">170</span> for (int i = 0; i < regions.length; ++i) {<a name="line.170"></a>
+<span class="sourceLineNo">171</span> Path regionDir = new Path(tableDir, regions[i].getEncodedName());<a name="line.171"></a>
+<span class="sourceLineNo">172</span> assertTrue(regions[i] + " region dir does not exist", fs.exists(regionDir));<a name="line.172"></a>
+<span class="sourceLineNo">173</span> assertTrue(allRegionDirs.remove(regionDir));<a name="line.173"></a>
+<span class="sourceLineNo">174</span> List<Path> allFamilyDirs = FSUtils.getFamilyDirs(fs, regionDir);<a name="line.174"></a>
+<span class="sourceLineNo">175</span> for (int j = 0; j < family.length; ++j) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span> final Path familyDir = new Path(regionDir, family[j]);<a name="line.176"></a>
+<span class="sourceLineNo">177</span> if (hasFamilyDirs) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span> assertTrue(family[j] + " family dir does not exist", fs.exists(familyDir));<a name="line.178"></a>
+<span class="sourceLineNo">179</span> assertTrue(allFamilyDirs.remove(familyDir));<a name="line.179"></a>
+<span class="sourceLineNo">180</span> } else {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> // TODO: WARN: Modify Table/Families does not create a family dir<a name="line.181"></a>
+<span class="sourceLineNo">182</span> if (!fs.exists(familyDir)) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> LOG.warn(family[j] + " family dir does not exist");<a name="line.183"></a>
+<span class="sourceLineNo">184</span> }<a name="line.184"></a>
+<span class="sourceLineNo">185</span> allFamilyDirs.remove(familyDir);<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> assertTrue("found extraneous families: " + allFamilyDirs, allFamilyDirs.isEmpty());<a name="line.188"></a>
+<span class="sourceLineNo">189</span> }<a name="line.189"></a>
+<span class="sourceLineNo">190</span> assertTrue("found extraneous regions: " + allRegionDirs, allRegionDirs.isEmpty());<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span> // check meta<a name="line.192"></a>
+<span class="sourceLineNo">193</span> assertTrue(MetaTableAccessor.tableExists(master.getConnection(), tableName));<a name="line.193"></a>
+<span class="sourceLineNo">194</span> assertEquals(regions.length, countMetaRegions(master, tableName));<a name="line.194"></a>
+<span class="sourceLineNo">195</span><a name="line.195"></a>
+<span class="sourceLineNo">196</span> // check htd<a name="line.196"></a>
+<span class="sourceLineNo">197</span> HTableDescriptor htd = master.getTableDescriptors().get(tableName);<a name="line.197"></a>
+<span class="sourceLineNo">198</span> assertTrue("table descriptor not found", htd != null);<a name="line.198"></a>
+<span class="sourceLineNo">199</span> for (int i = 0; i < family.length; ++i) {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> assertTrue("family not found " + family[i], htd.getFamily(Bytes.toBytes(family[i])) != null);<a name="line.200"></a>
+<span class="sourceLineNo">201</span> }<a name="line.201"></a>
+<span class="sourceLineNo">202</span> assertEquals(family.length, htd.getFamilies().size());<a name="line.202"></a>
+<span class="sourceLineNo">203</span> }<a name="line.203"></a>
+<span class="sourceLineNo">204</span><a name="line.204"></a>
+<span class="sourceLineNo">205</span> public static void validateTableDeletion(<a name="line.205"></a>
+<span class="sourceLineNo">206</span> final HMaster master, final TableName tableName) throws IOException {<a name="line.206"></a>
+<span class="sourceLineNo">207</span> // check filesystem<a name="line.207"></a>
+<span class="sourceLineNo">208</span> final FileSystem fs = master.getMasterFileSystem().getFileSystem();<a name="line.208"></a>
+<span class="sourceLineNo">209</span> final Path tableDir = FSUtils.getTableDir(master.getMasterFileSystem().getRootDir(), tableName);<a name="line.209"></a>
+<span class="sourceLineNo">210</span> assertFalse(fs.exists(tableDir));<a name="line.210"></a>
+<span class="sourceLineNo">211</span><a name="line.211"></a>
+<span class="sourceLineNo">212</span> // check meta<a name="line.212"></a>
+<span class="sourceLineNo">213</span> assertFalse(MetaTableAccessor.tableExists(master.getConnection(), tableName));<a name="line.213"></a>
+<span class="sourceLineNo">214</span> assertEquals(0, countMetaRegions(master, tableName));<a name="line.214"></a>
+<span class="sourceLineNo">215</span><a name="line.215"></a>
+<span class="sourceLineNo">216</span> // check htd<a name="line.216"></a>
+<span class="sourceLineNo">217</span> assertTrue("found htd of deleted table",<a name="line.217"></a>
+<span class="sourceLineNo">218</span> master.getTableDescriptors().get(tableName) == null);<a name="line.218"></a>
+<span class="sourceLineNo">219</span> }<a name="line.219"></a>
+<span class="sourceLineNo">220</span><a name="line.220"></a>
+<span class="sourceLineNo">221</span> private static int countMetaRegions(final HMaster master, final TableName tableName)<a name="line.221"></a>
+<span class="sourceLineNo">222</span> throws IOException {<a name="line.222"></a>
+<span class="sourceLineNo">223</span> final AtomicInteger actualRegCount = new AtomicInteger(0);<a name="line.223"></a>
+<span class="sourceLineNo">224</span> final MetaTableAccessor.Visitor visitor = new MetaTableAccessor.Visitor() {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> @Override<a name="line.225"></a>
+<span class="sourceLineNo">226</span> public boolean visit(Result rowResult) throws IOException {<a name="line.226"></a>
+<span class="sourceLineNo">227</span> RegionLocations list = MetaTableAccessor.getRegionLocations(rowResult);<a name="line.227"></a>
+<span class="sourceLineNo">228</span> if (list == null) {<a name="line.228"></a>
+<span class="sourceLineNo">229</span> LOG.warn("No serialized HRegionInfo in " + rowResult);<a name="line.229"></a>
+<span class="sourceLineNo">230</span> return true;<a name="line.230"></a>
+<span class="sourceLineNo">231</span> }<a name="line.231"></a>
+<span class="sourceLineNo">232</span> HRegionLocation l = list.getRegionLocation();<a name="line.232"></a>
+<span class="sourceLineNo">233</span> if (l == null) {<a name="line.233"></a>
+<span class="sourceLineNo">234</span> return true;<a name="line.234"></a>
+<span class="sourceLineNo">235</span> }<a name="line.235"></a>
+<span class="sourceLineNo">236</span> if (!l.getRegionInfo().getTable().equals(tableName)) {<a name="line.236"></a>
+<span class="sourceLineNo">237</span> return false;<a name="line.237"></a>
<span class="sourceLineNo">238</span> }<a name="line.238"></a>
-<span class="sourceLineNo">239</span> if (!l.getRegionInfo().getTable().equals(tableName)) {<a name="line.239"></a>
-<span class="sourceLineNo">240</span> return false;<a name="line.240"></a>
-<span class="sourceLineNo">241</span> }<a name="line.241"></a>
-<span class="sourceLineNo">242</span> if (l.getRegionInfo().isOffline() || l.getRegionInfo().isSplit()) return true;<a name="line.242"></a>
-<span class="sourceLineNo">243</span> HRegionLocation[] locations = list.getRegionLocations();<a name="line.243"></a>
-<span class="sourceLineNo">244</span> for (HRegionLocation location : locations) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span> if (location == null) continue;<a name="line.245"></a>
-<span class="sourceLineNo">246</span> ServerName serverName = location.getServerName();<a name="line.246"></a>
-<span class="sourceLineNo">247</span> // Make sure that regions are assigned to server<a name="line.247"></a>
-<span class="sourceLineNo">248</span> if (serverName != null && serverName.getHostAndPort() != null) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span> actualRegCount.incrementAndGet();<a name="line.249"></a>
-<span class="sourceLineNo">250</span> }<a name="line.250"></a>
-<span class="sourceLineNo">251</span> }<a name="line.251"></a>
-<span class="sourceLineNo">252</span> return true;<a name="line.252"></a>
-<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span> };<a name="line.254"></a>
-<span class="sourceLineNo">255</span> MetaTableAccessor.scanMetaForTableRegions(master.getConnection(), visitor, tableName);<a name="line.255"></a>
-<span class="sourceLineNo">256</span> return actualRegCount.get();<a name="line.256"></a>
-<span class="sourceLineNo">257</span> }<a name="line.257"></a>
-<span class="sourceLineNo">258</span><a name="line.258"></a>
-<span class="sourceLineNo">259</span> public static void validateTableIsEnabled(final HMaster master, final TableName tableName)<a name="line.259"></a>
-<span class="sourceLineNo">260</span> throws IOException {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> TableStateManager tsm = master.getTableStateManager();<a name="line.261"></a>
-<span class="sourceLineNo">262</span> assertTrue(tsm.getTableState(tableName).equals(TableState.State.ENABLED));<a name="line.262"></a>
-<span class="sourceLineNo">263</span> }<a name="line.263"></a>
-<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span> public static void validateTableIsDisabled(final HMaster master, final TableName tableName)<a name="line.265"></a>
-<span class="sourceLineNo">266</span> throws IOException {<a name="line.266"></a>
-<span class="sourceLineNo">267</span> TableStateManager tsm = master.getTableStateManager();<a name="line.267"></a>
-<span class="sourceLineNo">268</span> assertTrue(tsm.getTableState(tableName).equals(TableState.State.DISABLED));<a name="line.268"></a>
-<span class="sourceLineNo">269</span> }<a name="line.269"></a>
-<span class="sourceLineNo">270</span><a name="line.270"></a>
-<span class="sourceLineNo">271</span> public static void validateColumnFamilyAddition(final HMaster master, final TableName tableName,<a name="line.271"></a>
-<span class="sourceLineNo">272</span> final String family) throws IOException {<a name="line.272"></a>
-<span class="sourceLineNo">273</span> HTableDescriptor htd = master.getTableDescriptors().get(tableName);<a name="line.273"></a>
-<span class="sourceLineNo">274</span> assertTrue(htd != null);<a name="line.274"></a>
+<span class="sourceLineNo">239</span> if (l.getRegionInfo().isOffline() || l.getRegionInfo().isSplit()) return true;<a name="line.239"></a>
+<span class="sourceLineNo">240</span> HRegionLocation[] locations = list.getRegionLocations();<a name="line.240"></a>
+<span class="sourceLineNo">241</span> for (HRegionLocation location : locations) {<a name="line.241"></a>
+<span class="sourceLineNo">242</span> if (location == null) continue;<a name="line.242"></a>
+<span class="sourceLineNo">243</span> ServerName serverName = location.getServerName();<a name="line.243"></a>
+<span class="sourceLineNo">244</span> // Make sure that regions are assigned to server<a name="line.244"></a>
+<span class="sourceLineNo">245</span> if (serverName != null && serverName.getHostAndPort() != null) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span> actualRegCount.incrementAndGet();<a name="line.246"></a>
+<span class="sourceLineNo">247</span> }<a name="line.247"></a>
+<span class="sourceLineNo">248</span> }<a name="line.248"></a>
+<span class="sourceLineNo">249</span> return true;<a name="line.249"></a>
+<span class="sourceLineNo">250</span> }<a name="line.250"></a>
+<span class="sourceLineNo">251</span> };<a name="line.251"></a>
+<span class="sourceLineNo">252</span> MetaTableAccessor.scanMetaForTableRegions(master.getConnection(), visitor, tableName);<a name="line.252"></a>
+<span class="sourceLineNo">253</span> return actualRegCount.get();<a name="line.253"></a>
+<span class="sourceLineNo">254</span> }<a name="line.254"></a>
+<span class="sourceLineNo">255</span><a name="line.255"></a>
+<span class="sourceLineNo">256</span> public static void validateTableIsEnabled(final HMaster master, final TableName tableName)<a name="line.256"></a>
+<span class="sourceLineNo">257</span> throws IOException {<a name="line.257"></a>
+<span class="sourceLineNo">258</span> TableStateManager tsm = master.getTableStateManager();<a name="line.258"></a>
+<span class="sourceLineNo">259</span> assertTrue(tsm.getTableState(tableName).equals(TableState.State.ENABLED));<a name="line.259"></a>
+<span class="sourceLineNo">260</span> }<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span> public static void validateTableIsDisabled(final HMaster master, final TableName tableName)<a name="line.262"></a>
+<span class="sourceLineNo">263</span> throws IOException {<a name="line.263"></a>
+<span class="sourceLineNo">264</span> TableStateManager tsm = master.getTableStateManager();<a name="line.264"></a>
+<span class="sourceLineNo">265</span> assertTrue(tsm.getTableState(tableName).equals(TableState.State.DISABLED));<a name="line.265"></a>
+<span class="sourceLineNo">266</span> }<a name="line.266"></a>
+<span class="sourceLineNo">267</span><a name="line.267"></a>
+<span class="sourceLineNo">268</span> public static void validateColumnFamilyAddition(final HMaster master, final TableName tableName,<a name="line.268"></a>
+<span class="sourceLineNo">269</span> final String family) throws IOException {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> HTableDescriptor htd = master.getTableDescriptors().get(tableName);<a name="line.270"></a>
+<span class="sourceLineNo">271</span> assertTrue(htd != null);<a name="line.271"></a>
+<span class="sourceLineNo">272</span><a name="line.272"></a>
+<span class="sourceLineNo">273</span> assertTrue(htd.hasFamily(family.getBytes()));<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> assertTrue(htd.hasFamily(family.getBytes()));<a name="line.276"></a>
-<span class="sourceLineNo">277</span> }<a name="line.277"></a>
-<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span> public static void validateColumnFamilyDeletion(final HMaster master, final TableName tableName,<a name="line.279"></a>
-<span class="sourceLineNo">280</span> final String family) throws IOException {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> // verify htd<a name="line.281"></a>
-<span class="sourceLineNo">282</span> HTableDescriptor htd = master.getTableDescriptors().get(tableName);<a name="line.282"></a>
-<span class="sourceLineNo">283</span> assertTrue(htd != null);<a name="line.283"></a>
-<span class="sourceLineNo">284</span> assertFalse(htd.hasFamily(family.getBytes()));<a name="line.284"></a>
-<span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span> // verify fs<a name="line.286"></a>
-<span class="sourceLineNo">287</span> final FileSystem fs = master.getMasterFileSystem().getFileSystem();<a name="line.287"></a>
-<span class="sourceLineNo">288</span> final Path tableDir = FSUtils.getTableDir(master.getMasterFileSystem().getRootDir(), tableName);<a name="line.288"></a>
-<span class="sourceLineNo">289</span> for (Path regionDir: FSUtils.getRegionDirs(fs, tableDir)) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> final Path familyDir = new Path(regionDir, family);<a name="line.290"></a>
-<span class="sourceLineNo">291</span> assertFalse(family + " family dir should not exist", fs.exists(familyDir));<a name="line.291"></a>
-<span class="sourceLineNo">292</span> }<a name="line.292"></a>
-<span class="sourceLineNo">293</span> }<a name="line.293"></a>
-<span class="sourceLineNo">294</span><a name="line.294"></a>
-<span class="sourceLineNo">295</span> public static void validateColumnFamilyModification(final HMaster master,<a name="line.295"></a>
-<span class="sourceLineNo">296</span> final TableName tableName, final String family, HColumnDescriptor columnDescriptor)<a name="line.296"></a>
-<span class="sourceLineNo">297</span> throws IOException {<a name="line.297"></a>
-<span class="sourceLineNo">298</span> HTableDescriptor htd = master.getTableDescriptors().get(tableName);<a name="line.298"></a>
-<span class="sourceLineNo">299</span> assertTrue(htd != null);<a name="line.299"></a>
-<span class="sourceLineNo">300</span><a name="line.300"></a>
-<span class="sourceLineNo">301</span> HColumnDescriptor hcfd = htd.getFamily(family.getBytes());<a name="line.301"></a>
-<span class="sourceLineNo">302</span> assertTrue(hcfd.equals(columnDescriptor));<a name="line.302"></a>
-<span class="sourceLineNo">303</span> }<a name="line.303"></a>
-<span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span> public static void loadData(final Connection connection, final TableName tableName,<a name="line.305"></a>
-<span class="sourceLineNo">306</span> int rows, final byte[][] splitKeys, final String... sfamilies) throws IOException {<a name="line.306"></a>
-<span class="sourceLineNo">307</span> byte[][] families = new byte[sfamilies.length][];<a name="line.307"></a>
-<span class="sourceLineNo">308</span> for (int i = 0; i < families.length; ++i) {<a name="line.308"></a>
-<span class="sourceLineNo">309</span> families[i] = Bytes.toBytes(sfamilies[i]);<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> BufferedMutator mutator = connection.getBufferedMutator(tableName);<a name="line.312"></a>
-<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span> // Ensure one row per region<a name="line.314"></a>
-<span class="sourceLineNo">315</span> assertTrue(rows >= splitKeys.length);<a name="line.315"></a>
-<span class="sourceLineNo">316</span> for (byte[] k: splitKeys) {<a name="line.316"></a>
-<span class="sourceLineNo">317</span> byte[] value = Bytes.add(Bytes.toBytes(System.currentTimeMillis()), k);<a name="line.317"></a>
-<span class="sourceLineNo">318</span> byte[] key = Bytes.add(k, Bytes.toBytes(MD5Hash.getMD5AsHex(value)));<a name="line.318"></a>
-<span class="sourceLineNo">319</span> mutator.mutate(createPut(families, key, value));<a name="line.319"></a>
-<span class="sourceLineNo">320</span> rows--;<a name="line.320"></a>
-<span class="sourceLineNo">321</span> }<a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span> // Add other extra rows. more rows, more files<a name="line.323"></a>
-<span class="sourceLineNo">324</span> while (rows-- > 0) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span> byte[] value = Bytes.add(Bytes.toBytes(System.currentTimeMillis()), Bytes.toBytes(rows));<a name="line.325"></a>
-<span class="sourceLineNo">326</span> byte[] key = Bytes.toBytes(MD5Hash.getMD5AsHex(value));<a name="line.326"></a>
-<span class="sourceLineNo">327</span> mutator.mutate(createPut(families, key, value));<a name="line.327"></a>
-<span class="sourceLineNo">328</span> }<a name="line.328"></a>
-<span class="sourceLineNo">329</span> mutator.flush();<a name="line.329"></a>
-<span class="sourceLineNo">330</span> }<a name="line.330"></a>
-<span class="sourceLineNo">331</span><a name="line.331"></a>
-<span class="sourceLineNo">332</span> private static Put createPut(final byte[][] families, final byte[] key, final byte[] value) {<a name="line.332"></a>
-<span class="sourceLineNo">333</span> byte[] q = Bytes.toBytes("q");<a name="line.333"></a>
-<span class="sourceLineNo">334</span> Put put = new Put(key);<a name="line.334"></a>
-<span class="sourceLineNo">335</span> put.setDurability(Durability.SKIP_WAL);<a name="line.335"></a>
-<span class="sourceLineNo">336</span> for (byte[] family: families) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span> put.addColumn(family, q, value);<a name="line.337"></a>
-<span class="sourceLineNo">338</span> }<a name="line.338"></a>
-<span class="sourceLineNo">339</span> return put;<a name="line.339"></a>
-<span class="sourceLineNo">340</span> }<a name="line.340"></a>
-<span class="sourceLineNo">341</span><a name="line.341"></a>
-<span class="sourceLineNo">342</span> // ==========================================================================<a name="line.342"></a>
-<span class="sourceLineNo">343</span> // Procedure Helpers<a name="line.343"></a>
-<span class="sourceLineNo">344</span> // ==========================================================================<a name="line.344"></a>
-<span class="sourceLineNo">345</span> public static long generateNonceGroup(final HMaster master) {<a name="line.345"></a>
-<span class="sourceLineNo">346</span> return master.getClusterConnection().getNonceGenerator().getNonceGroup();<a name="line.346"></a>
-<span class="sourceLineNo">347</span> }<a name="line.347"></a>
-<span class="sourceLineNo">348</span><a name="line.348"></a>
-<span class="sourceLineNo">349</span> public static long generateNonce(final HMaster master) {<a name="line.349"></a>
-<span class="sourceLineNo">350</span> return master.getClusterConnection().getNonceGenerator().newNonce();<a name="line.350"></a>
-<span class="sourceLineNo">351</span> }<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> /**<a name="line.353"></a>
-<span class="sourceLineNo">354</span> * Run through all procedure flow states TWICE while also restarting procedure executor at each<a name="line.354"></a>
-<span class="sourceLineNo">355</span> * step; i.e force a reread of procedure store.<a name="line.355"></a>
-<span class="sourceLineNo">356</span> *<a name="line.356"></a>
-<span class="sourceLineNo">357</span> *<p>It does<a name="line.357"></a>
-<span class="sourceLineNo">358</span> * <ol><li>Execute step N - kill the executor before store update<a name="line.358"></a>
-<span class="sourceLineNo">359</span> * <li>Restart executor/store<a name="line.359"></a>
-<span class="sourceLineNo">360</span> * <li>Execute step N - and then save to store<a name="line.360"></a>
-<span class="sourceLineNo">361</span> * </ol><a name="line.361"></a>
-<span class="sourceLineNo">362</span> *<a name="line.362"></a>
-<span class="sourceLineNo">363</span> *<p>This is a good test for finding state that needs persisting and steps that are not<a name="line.363"></a>
-<span class="sourceLineNo">364</span> * idempotent. Use this version of the test when a procedure executes all flow steps from start to<a name="line.364"></a>
-<span class="sourceLineNo">365</span> * finish.<a name="line.365"></a>
-<span class="sourceLineNo">366</span> * @see #testRecoveryAndDoubleExecution(ProcedureExecutor, long)<a name="line.366"></a>
-<span class="sourceLineNo">367</span> */<a name="line.367"></a>
-<span class="sourceLineNo">368</span> private static void testRecoveryAndDoubleExecution(<a name="line.368"></a>
-<span class="sourceLineNo">369</span> final ProcedureExecutor<MasterProcedureEnv> procExec, final long procId,<a name="line.369"></a>
-<span class="sourceLineNo">370</span> final int numSteps, final boolean expectExecRunning) throws Exception {<a name="line.370"></a>
-<span class="sourceLineNo">371</span> ProcedureTestingUtility.waitProcedure(procExec, procId);<a name="line.371"></a>
-<span class="sourceLineNo">372</span> assertEquals(false, procExec.isRunning());<a name="line.372"></a>
-<span class="sourceLineNo">373</span><a name="line.373"></a>
-<span class="sourceLineNo">374</span> // Restart the executor and execute the step twice<a name="line.374"></a>
-<span class="sourceLineNo">375</span> // execute step N - kill before store update<a name="line.375"></a>
-<span class="sourceLineNo">376</span> // restart executor/store<a name="line.376"></a>
-<span class="sourceLineNo">377</span> // execute step N - save on store<a name="line.377"></a>
-<span class="sourceLineNo">378</span> for (int i = 0; i < numSteps; ++i) {<a name="line.378"></a>
-<span class="sourceLineNo">379</span> LOG.info("Restart " + i + " exec state=" + procExec.getProcedure(procId));<a name="line.379"></a>
-<span class="sourceLineNo">380</span> ProcedureTestingUtility.assertProcNotYetCompleted(procExec, procId);<a name="line.380"></a>
-<span class="sourceLineNo">381</span> restartMasterProcedureExecutor(procExec);<a name="line.381"></a>
-<span class="sourceLineNo">382</span> ProcedureTestingUtility.waitProcedure(procExec, procId);<a name="line.382"></a>
-<span class="sourceLineNo">383</span> }<a name="line.383"></a>
+<span class="sourceLineNo">276</span> public static void validateColumnFamilyDeletion(final HMaster master, final TableName tableName,<a name="line.276"></a>
+<span class="sourceLineNo">277</span> final String family) throws IOException {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> // verify htd<a name="line.278"></a>
+<span class="sourceLineNo">279</span> HTableDescriptor htd = master.getTableDescriptors().get(tableName);<a name="line.279"></a>
+<span class="sourceLineNo">280</span> assertTrue(htd != null);<a name="line.280"></a>
+<span class="sourceLineNo">281</span> assertFalse(htd.hasFamily(family.getBytes()));<a name="line.281"></a>
+<span class="sourceLineNo">282</span><a name="line.282"></a>
+<span class="sourceLineNo">283</span> // verify fs<a name="line.283"></a>
+<span class="sourceLineNo">284</span> final FileSystem fs = master.getMasterFileSystem().getFileSystem();<a name="line.284"></a>
+<span class="sourceLineNo">285</span> final Path tableDir = FSUtils.getTableDir(master.getMasterFileSystem().getRootDir(), tableName);<a name="line.285"></a>
+<span class="sourceLineNo">286</span> for (Path regionDir: FSUtils.getRegionDirs(fs, tableDir)) {<a name="line.286"></a>
+<span class="sourceLineNo">287</span> final Path familyDir = new Path(regionDir, family);<a name="line.287"></a>
+<span class="sourceLineNo">288</span> assertFalse(family + " family dir should not exist", fs.exists(familyDir));<a name="line.288"></a>
+<span class="sourceLineNo">289</span> }<a name="line.289"></a>
+<span class="sourceLineNo">290</span> }<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span> public static void validateColumnFamilyModification(final HMaster master,<a name="line.292"></a>
+<span class="sourceLineNo">293</span> final TableName tableName, final String family, HColumnDescriptor columnDescriptor)<a name="line.293"></a>
+<span class="sourceLineNo">294</span> throws IOException {<a name="line.294"></a>
+<span class="sourceLineNo">295</span> HTableDescriptor htd = master.getTableDescriptors().get(tableName);<a name="line.295"></a>
+<span class="sourceLineNo">296</span> assertTrue(htd != null);<a name="line.296"></a>
+<span class="sourceLineNo">297</span><a name="line.297"></a>
+<span class="sourceLineNo">298</span> HColumnDescriptor hcfd = htd.getFamily(family.getBytes());<a name="line.298"></a>
+<span class="sourceLineNo">299</span> assertTrue(hcfd.equals(columnDescriptor));<a name="line.299"></a>
+<span class="sourceLineNo">300</span> }<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span> public static void loadData(final Connection connection, final TableName tableName,<a name="line.302"></a>
+<span class="sourceLineNo">303</span> int rows, final byte[][] splitKeys, final String... sfamilies) throws IOException {<a name="line.303"></a>
+<span class="sourceLineNo">304</span> byte[][] families = new byte[sfamilies.length][];<a name="line.304"></a>
+<span class="sourceLineNo">305</span> for (int i = 0; i < families.length; ++i) {<a name="line.305"></a>
+<span class="sourceLineNo">306</span> families[i] = Bytes.toBytes(sfamilies[i]);<a name="line.306"></a>
+<span class="sourceLineNo">307</span> }<a name="line.307"></a>
+<span class="sourceLineNo">308</span><a name="line.308"></a>
+<span class="sourceLineNo">309</span> BufferedMutator mutator = connection.getBufferedMutator(tableName);<a name="line.309"></a>
+<span class="sourceLineNo">310</span><a name="line.310"></a>
+<span class="sourceLineNo">311</span> // Ensure one row per region<a name="line.311"></a>
+<span class="sourceLineNo">312</span> assertTrue(rows >= splitKeys.length);<a name="line.312"></a>
+<span class="sourceLineNo">313</span> for (byte[] k: splitKeys) {<a name="line.313"></a>
+<span class="sourceLineNo">314</span> byte[] value = Bytes.add(Bytes.toBytes(System.currentTimeMillis()), k);<a name="line.314"></a>
+<span class="sourceLineNo">315</span> byte[] key = Bytes.add(k, Bytes.toBytes(MD5Hash.getMD5AsHex(value)));<a name="line.315"></a>
+<span class="sourceLineNo">316</span> mutator.mutate(createPut(families, key, value));<a name="line.316"></a>
+<span class="sourceLineNo">317</span> rows--;<a name="line.317"></a>
+<span class="sourceLineNo">318</span> }<a name="line.318"></a>
+<span class="sourceLineNo">319</span><a name="line.319"></a>
+<span class="sourceLineNo">320</span> // Add other extra rows. more rows, more files<a name="line.320"></a>
+<span class="sourceLineNo">321</span> while (rows-- > 0) {<a name="line.321"></a>
+<span class="sourceLineNo">322</span> byte[] value = Bytes.add(Bytes.toBytes(System.currentTimeMillis()), Bytes.toBytes(rows));<a name="line.322"></a>
+<span class="sourceLineNo">323</span> byte[] key = Bytes.toBytes(MD5Hash.getMD5AsHex(value));<a name="line.323"></a>
+<span class="sourceLineNo">324</span> mutator.mutate(createPut(families, key, value));<a name="line.324"></a>
+<span class="sourceLineNo">325</span> }<a name="line.325"></a>
+<span class="sourceLineNo">326</span> mutator.flush();<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> private static Put createPut(final byte[][] families, final byte[] key, final byte[] value) {<a name="line.329"></a>
+<span class="sourceLineNo">330</span> byte[] q = Bytes.toBytes("q");<a name="line.330"></a>
+<span class="sourceLineNo">331</span> Put put = new Put(key);<a name="line.331"></a>
+<span class="sourceLineNo">332</span> put.setDurability(Durability.SKIP_WAL);<a name="line.332"></a>
+<span class="sourceLineNo">333</span> for (byte[] family: families) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span> put.addColumn(family, q, value);<a name="line.334"></a>
+<span class="sourceLineNo">335</span> }<a name="line.335"></a>
+<span class="sourceLineNo">336</span> return put;<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> // ==========================================================================<a name="line.339"></a>
+<span class="sourceLineNo">340</span> // Procedure Helpers<a name="line.340"></a>
+<span class="sourceLineNo">341</span> // ==========================================================================<a name="line.341"></a>
+<span class="sourceLineNo">342</span> public static long generateNonceGroup(final HMaster master) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span> return master.getClusterConnection().getNonceGenerator().getNonceGroup();<a name="line.343"></a>
+<span class="sourceLineNo">344</span> }<a name="line.344"></a>
+<span class="sourceLineNo">345</span><a name="line.345"></a>
+<span class="sourceLineNo">346</span> public static long generateNonce(final HMaster master) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span> return master.getClusterConnection().getNonceGenerator().newNonce();<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> /**<a name="line.350"></a>
+<span class="sourceLineNo">351</span> * Run through all procedure flow states TWICE while also restarting procedure executor at each<a name="line.351"></a>
+<span class="sourceLineNo">352</span> * step; i.e force a reread of procedure store.<a name="line.352"></a>
+<span class="sourceLineNo">353</span> *<a name="line.353"></a>
+<span class="sourceLineNo">354</span> *<p>It does<a name="line.354"></a>
+<span class="sourceLineNo">355</span> * <ol><li>Execute step N - kill the executor before store update<a name="line.355"></a>
+<span class="sourceLineNo">356</span> * <li>Restart executor/store<a name="line.356"></a>
+<span class="sourceLineNo">357</span> * <li>Execute step N - and then save to store<a name="line.357"></a>
+<span class="sourceLineNo">358</span> * </ol><a name="line.358"></a>
+<span class="sourceLineNo">359</span> *<a name="line.359"></a>
+<span class="sourceLineNo">360</span> *<p>This is a good test for finding state that needs persisting and steps that are not<a name="line.360"></a>
+<span class="sourceLineNo">361</span> * idempotent. Use this version of the test when a procedure executes all flow steps from start to<a name="line.361"></a>
+<span class="sourceLineNo">362</span> * finish.<a name="line.362"></a>
+<span class="sourceLineNo">363</span> * @see #testRecoveryAndDoubleExecution(ProcedureExecutor, long)<a name="line.363"></a>
+<span class="sourceLineNo">364</span> */<a name="line.364"></a>
+<span class="sourceLineNo">365</span> private static void testRecoveryAndDoubleExecution(<a name="line.365"></a>
+<span class="sourceLineNo">366</span> final ProcedureExecutor<MasterProcedureEnv> procExec, final long procId,<a name="line.366"></a>
+<span class="sourceLineNo">367</span> final int numSteps, final boolean expectExecRunning) throws Exception {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> ProcedureTestingUtility.waitProcedure(procExec, procId);<a name="line.368"></a>
+<span class="sourceLineNo">369</span> assertEquals(false, procExec.isRunning());<a name="line.369"></a>
+<span class="sourceLineNo">370</span><a name="line.370"></a>
+<span class="sourceLineNo">371</span> // Restart the executor and execute the step twice<a name="line.371"></a>
+<span class="sourceLineNo">372</span> // execute step N - kill before store update<a name="line.372"></a>
+<span class="sourceLineNo">373</span> // restart executor/store<a name="line.373"></a>
+<span class="sourceLineNo">374</span> // execute step N - save on store<a name="line.374"></a>
+<span class="sourceLineNo">375</span> for (int i = 0; i < numSteps; ++i) {<a name="line.375"></a>
+<span class="sourceLineNo">376</span> LOG.info("Restart " + i + " exec state=" + procExec.getProcedure(procId));<a name="line.376"></a>
+<span class="sourceLineNo">377</span> ProcedureTestingUtility.assertProcNotYetCompleted(procExec, procId);<a name="line.377"></a>
+<span class="sourceLineNo">378</span> restartMasterProcedureExecutor(procExec);<a name="line.378"></a>
+<span class="sourceLineNo">379</span> ProcedureTestingUtility.waitProcedure(procExec, procId);<a name="line.379"></a>
+<span class="sourceLineNo">380</span> }<a name="line.380"></a>
+<span class="sourceLineNo">381</span><a name="line.381"></a>
+<span class="sourceLineNo">382</span> assertEquals(expectExecRunning, procExec.isRunning());<a name="line.382"></a>
+<span class="sourceLineNo">383</span> }<a name="line.383"></a>
<span class="sourceLineNo">384</span><a name="line.384"></a>
-<span class="sourceLineNo">385</span> assertEquals(expectExecRunning, procExec.isRunning());<a name="line.385"></a>
-<span class="sourceLineNo">386</span> }<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> * Run through all procedure flow states TWICE while also restarting<a name="line.389"></a>
-<span class="sourceLineNo">390</span> * procedure executor at each step; i.e force a reread of procedure store.<a name="line.390"></a>
-<span class="sourceLineNo">391</span> *<a name="line.391"></a>
-<span class="sourceLineNo">392</span> *<p>It does<a name="line.392"></a>
-<span class="sourceLineNo">393</span> * <ol><li>Execute step N - kill the executor before store update<a name="line.393"></a>
-<span class="sourceLineNo">394</span> * <li>Restart executor/store<a name="line.394"></a>
-<span class="sourceLineNo">395</span> * <li>Execute step N - and then save to store<a name="line.395"></a>
-<span class="sourceLineNo">396</span> * </ol><a name="line.396"></a>
-<span class="sourceLineNo">397</span> *<a name="line.397"></a>
-<span class="sourceLineNo">398</span> *<p>This is a good test for finding state that needs persisting and steps that are not<a name="line.398"></a>
-<span class="sourceLineNo">399</span> * idempotent. Use this version of the test when the order in which flow steps are executed is<a name="line.399"></a>
-<span class="sourceLineNo">400</span> * not start to finish; where the procedure may vary the flow steps dependent on circumstance<a name="line.400"></a>
-<span class="sourceLineNo">401</span> * found.<a name="line.401"></a>
-<span class="sourceLineNo">402</span> * @see #testRecoveryAndDoubleExecution(ProcedureExecutor, long, int)<a name="line.402"></a>
-<span class="sourceLineNo">403</span> */<a name="line.403"></a>
-<span class="sourceLineNo">404</span> public static void testRecoveryAndDoubleExecution(<a name="line.404"></a>
-<span class="sourceLineNo">405</span> final ProcedureExecutor<MasterProcedureEnv> procExec, final long procId) throws Exception {<a name="line.405"></a>
-<span class="sourceLineNo">406</span> ProcedureTestingUtility.waitProcedure(procExec, procId);<a name="line.406"></a>
-<span class="sourceLineNo">407</span> assertEquals(false, procExec.isRunning());<a name="line.407"></a>
-<span class="sourceLineNo">408</span> for (int i = 0; !procExec.isFinished(procId); ++i) {<a name="line.408"></a>
-<span class="sourceLineNo">409</span> LOG.info("Restart " + i + " exec state=" + procExec.getProcedure(procId));<a name="line.409"></a>
-<span class="sourceLineNo">410</span> restartMasterProcedureExecutor(procExec);<a name="line.410"></a>
-<span class="sourceLineNo">411</span> ProcedureTestingUtility.waitProcedure(procExec, procId);<a name="line.411"></a>
-<span class="sourceLineNo">412</span> }<a name="line.412"></a>
-<span class="sourceLineNo">413</span> assertEquals(true, procExec.isRunning());<a name="line.413"></a>
-<span class="sourceLineNo">414</span> ProcedureTestingUtility.assertProcNotFailed(procExec, procId);<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<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> * Execute the procedure up to "lastStep" and then the ProcedureExecutor<a name="line.418"></a>
-<span class="sourceLineNo">419</span> * is restarted and an abort() is injected.<a name="line.419"></a>
-<span class="sourceLineNo">420</span> * If the procedure implement abort() this should result in rollback being triggered.<a name="line.420"></a>
-<span class="sourceLineNo">421</span> * Each rollback step is called twice, by restarting the executor after every step.<a name="line.421"></a>
-<span class="sourceLineNo">422</span> * At the end of this call the procedure should be finished and rolledback.<a name="line.422"></a>
-<span class="sourceLineNo">423</span> * This method assert on the procedure being terminated with an AbortException.<a name="line.423"></a>
-<span class="sourceLineNo">424</span> */<a name="line.424"></a>
-<span class="sourceLineNo">425</span> public static void testRollbackAndDoubleExecution(<a name="line.425"></a>
-<span class="sourceLineNo">426</span> final ProcedureExecutor<MasterProcedureEnv> procExec, final long procId,<a name="line.426"></a>
-<span class="sourceLineNo">427</span> final int lastStep) throws Exception {<a name="line.427"></a>
-<span class="sourceLineNo">428</span> // Execute up to last step<a name="line.428"></a>
-<span class="sourceLineNo">429</span> testRecoveryAndDoubleExecution(procExec, procId, lastStep, false);<a name="line.429"></a>
-<span class="sourceLineNo">430</span><a name="line.430"></a>
-<span class="sourceLineNo">431</span> // Restart the executor and rollback the step twice<a name="line.431"></a>
-<span class="sourceLineNo">432</span> // rollback step N - kill before store update<a name="line.432"></a>
-<span class="sourceLineNo">433</span> // restart executor/store<a name="line.433"></a>
-<span class="sourceLineNo">434</span> // rollback step N - save on store<a name="line.434"></a>
-<span class="sourceLineNo">435</span> InjectAbortOnLoadListener abortListener = new InjectAbortOnLoadListener(procExec);<a name="line.435"></a>
-<span class="sourceLineNo">436</span> abortListener.addProcId(procId);<a name="line.436"></a>
-<span class="sourceLineNo">437</span> procExec.registerListener(abortListener);<a name="line.437"></a>
-<span class="sourceLineNo">438</span> try {<a name="line.438"></a>
-<span class="sourceLineNo">439</span> for (int i = 0; !procExec.isFinished(procId); ++i) {<a name="line.439"></a>
-<span class="sourceLineNo">440</span> LOG.info("Restart " + i + " rollback state: " + procExec.getProcedure(procId));<a name="line.440"></a>
-<span class="sourceLineNo">441</span> ProcedureTestingUtility.assertProcNotYetCompleted(procExec, procId);<a name="line.441"></a>
-<span class="sourceLineNo">442</span> restartMasterProcedureExecutor(procExec);<a name="line.442"></a>
-<span class="sourceLineNo">443</span> ProcedureTestingUtility.waitProcedure(procExec, procId);<a name="line.443"></a>
-<span class="sourceLineNo">444</span> }<a name="line.444"></a>
-<span class="sourceLineNo">445</span> } finally {<a name="line.445"></a>
-<span class="sourceLineNo">446</span> assertTrue(procExec.unregisterListener(abortListener));<a name="line.446"></a>
-<span class="sourceLineNo">447</span> }<a name="line.447"></a>
-<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span> assertEquals(true, procExec.isRunning());<a name="line.449"></a>
-<span class="sourceLineNo">450</span> ProcedureTestingUtility.assertIsAbortException(procExec.getResult(procId));<a name="line.450"></a>
-<span class="sourceLineNo">451</span> }<a name="line.451"></a>
-<span class="sourceLineNo">452</span><a name="line.452"></a>
-<span class="sourceLineNo">453</span> /**<a name="line.453"></a>
-<span class="sourceLineNo">454</span> * Execute the procedure up to "lastStep" and then the ProcedureExecutor<a name="line.454"></a>
-<span class="sourceLineNo">455</span> * is restarted and an abort() is injected.<a name="line.455"></a>
-<span class="sourceLineNo">456</span> * If the procedure implement abort() this should result in rollback being triggered.<a name="line.456"></a>
-<span class="sourceLineNo">457</span> * At the end of this call the procedure should be finished and rolledback.<a name="line.457"></a>
-<span class="sourceLineNo">458</span> * This method assert on the procedure being terminated with an AbortException.<a name="line.458"></a>
-<span class="sourceLineNo">459</span> */<a name="line.459"></a>
-<span class="sourceLineNo">460</span> public static void testRollbackRetriableFailure(<a name="line.460"></a>
-<span class="sourceLineNo">461</span> final ProcedureExecutor<MasterProcedureEnv> procExec, final long procId,<a name="line.461"></a>
-<span class="sourceLineNo">462</span> final int lastStep) throws Exception {<a name="line.462"></a>
-<span class="sourceLineNo">463</span> // Execute up to last step<a name="line.463"></a>
-<span class="sourceLineNo">464</span> testRecoveryAndDoubleExecution(procExec, procId, lastStep, false);<a name="line.464"></a>
+<span class="sourceLineNo">385</span> /**<a name="line.385"></a>
+<span class="sourceLineNo">386</span> * Run through all procedure flow states TWICE while also restarting<a name="line.386"></a>
+<span class="sourceLineNo">387</span> * procedure executor at each step; i.e force a reread of procedure store.<a name="line.387"></a>
+<span class="sourceLineNo">388</span> *<a name="line.388"></a>
+<span class="sourceLineNo">389</span> *<p>It does<a name="line.389"></a>
+<span class="sourceLineNo">390</span> * <ol><li>Execute step N - kill the executor before store update<a name="line.390"></a>
+<span class="sourceLineNo">391</span> * <li>Restart executor/store<a name="line.391"></a>
+<span class="sourceLineNo">392</span> * <li>Execute step N - and then save to store<a name="line.392"></a>
+<span class="sourceLineNo">393</span> * </ol><a name="line.393"></a>
+<span class="sourceLineNo">394</span> *<a name="line.394"></a>
+<span class="sourceLineNo">395</span> *<p>This is a good test for finding state that needs persisting and steps that are not<a name="line.395"></a>
+<span class="sourceLineNo">396</span> * idempotent. Use this version of the test when the order in which flow steps are executed is<a name="line.396"></a>
+<span class="sourceLineNo">397</span> * not start to finish; where the procedure may vary the flow steps dependent on circumstance<a name="line.397"></a>
+<span class="sourceLineNo">398</span> * found.<a name="line.398"></a>
+<span class="sourceLineNo">399</span> * @see #testRecoveryAndDoubleExecution(ProcedureExecutor, long, int)<a name="line.399"></a>
+<span class="sourceLineNo">400</span> */<a name="line.400"></a>
+<span class="sourceLineNo">401</span> public static void testRecoveryAndDoubleExecution(<a name="line.401"></a>
+<span class="sourceLineNo">402</span> final ProcedureExecutor<MasterProcedureEnv> procExec, final long procId) throws Exception {<a name="line.402"></a>
+<span class="sourceLineNo">403</span> ProcedureTestingUtility.waitProcedure(procExec, procId);<a name="line.403"></a>
+<span class="sourceLineNo">404</span> assertEquals(false, procExec.isRunning());<a name="line.404"></a>
+<span class="sourceLineNo">405</span> for (int i = 0; !procExec.isFinished(procId); ++i) {<a name="line.405"></a>
+<span class="sourceLineNo">406</span> LOG.info("Restart " + i + " exec state=" + procExec.getProcedure(procId));<a name="line.406"></a>
+<span class="sourceLineNo">407</span> restartMasterProcedureExecutor(procExec);<a name="line.407"></a>
+<span class="sourceLineNo">408</span> ProcedureTestingUtility.waitProcedure(procExec, procId);<a name="line.408"></a>
+<span class="sourceLineNo">409</span> }<a name="line.409"></a>
+<span class="sourceLineNo">410</span> assertEquals(true, procExec.isRunning());<a name="line.410"></a>
+<span class="sourceLineNo">411</span> ProcedureTestingUtility.assertProcNotFailed(procExec, procId);<a name="line.411"></a>
+<span class="sourceLineNo">412</span> }<a name="line.412"></a>
+<span class="sourceLineNo">413</span><a name="line.413"></a>
+<span class="sourceLineNo">414</span> /**<a name="line.414"></a>
+<span class="sourceLineNo">415</span> * Execute the procedure up to "lastStep" and then the ProcedureExecutor<a name="line.415"></a>
+<span class="sourceLineNo">416</span> * is restarted and an abort() is injected.<a name="line.416"></a>
+<span class="sourceLineNo">417</span> * If the procedure implement abort() this should result in rollback being triggered.<a name="line.417"></a>
+<span class="sourceLineNo">418</span> * Each rollback step is called twice, by restarting the executor after every step.<a name="line.418"></a>
+<span class="sourceLineNo">419</span> * At the end of this call the procedure should be finished and rolledback.<a name="line.419"></a>
+<span class="sourceLineNo">420</span> * This method assert on the procedure being terminated with an AbortException.<a name="line.420"></a>
+<span class="sourceLineNo">421</span> */<a name="line.421"></a>
+<span class="sourceLineNo">422</span> public static void testRollbackAndDoubleExecution(<a name="line.422"></a>
+<span class="sourceLineNo">423</span> final ProcedureExecutor<MasterProcedureEnv> procExec, final long procId,<a name="line.423"></a>
+<span class="sourceLineNo">424</span> final int lastStep) throws Exception {<a name="line.424"></a>
+<span class="sourceLineNo">425</span> // Execute up to last step<a name="line.425"></a>
+<span class="sourceLineNo">426</span> testRecoveryAndDoubleExecution(procExec, procId, lastStep, false);<a name="line.426"></a>
+<span class="sourceLineNo">427</span><a name="line.427"></a>
+<span class="sourceLineNo">428</span> // Restart the executor and rollback the step twice<a name="line.428"></a>
+<span class="sourceLineNo">429</span> // rollback step N - kill before store update<a name="line.429"></a>
+<span class="sourceLineNo">430</span> // restart executor/store<a name="line.430"></a>
+<span class="sourceLineNo">431</span> // rollback step N - save on store<a name="line.431"></a>
+<span class="sourceLineNo">432</span> InjectAbortOnLoadListener abortListener = new InjectAbortOnLoadListener(procExec);<a name="line.432"></a>
+<span class="sourceLineNo">433</span> abortListener.addProcId(procId);<a name="line.433"></a>
+<span class="sourceLineNo">434</span> procExec.registerListener(abortListener);<a name="line.434"></a>
+<span class="sourceLineNo">435</span> try {<a name="line.435"></a>
+<span class="sourceLineNo">436</span> for (int i = 0; !procExec.isFinished(procId); ++i) {<a name="line.436"></a>
+<span class="sourceLineNo">437</span> LOG.info("Restart " + i + " rollback state: " + procExec.getProcedure(procId));<a name="line.437"></a>
+<span class="sourceLineNo">438</span> ProcedureTestingUtility.assertProcNotYetCompleted(procExec, procId);<a name="line.438"></a>
+<span class="sourceLineNo">439</span> restartMasterProcedureExecutor(procExec);<a name="line.439"></a>
+<span class="sourceLineNo">440</span> ProcedureTestingUtility.waitProcedure(procExec, procId);<a name="line.440"></a>
+<span class="sourceLineNo">441</span> }<a name="line.441"></a>
+<span class="sourceLineNo">442</span> } finally {<a name="line.442"></a>
+<span class="sourceLineNo">443</span> assertTrue(procExec.unregisterListener(abortListener));<a name="line.443"></a>
+<span class="sourceLineNo">444</span> }<a name="line.444"></a>
+<span class="sourceLineNo">445</span><a name="line.445"></a>
+<span class="sourceLineNo">446</span> assertEquals(true, procExec.isRunning());<a name="line.446"></a>
+<span class="sourceLineNo">447</span> ProcedureTestingUtility.assertIsAbortException(procExec.getResult(procId));<a name="line.447"></a>
+<span class="sourceLineNo">448</span> }<a name="line.448"></a>
+<span class="sourceLineNo">449</span><a name="line.449"></a>
+<span class="sourceLineNo">450</span> /**<a name="line.450"></a>
+<span class="sourceLineNo">451</span> * Execute the procedure up to "lastStep" and then the ProcedureExecutor<a name="line.451"></a>
+<span class="sourceLineNo">452</span> * is restarted and an abort() is injected.<a name="line.452"></a>
+<span class="sourceLineNo">453</span> * If the procedure implement abort() this should result in rollback being triggered.<a name="line.453"></a>
+<span class="sourceLineNo">454</span> * At the end of this call the procedure should be finished and rolledback.<a name="line.454"></a>
+<span class="sourceLineNo">455</span> * This method assert on the procedure being terminated with an AbortException.<a name="line.455"></a>
+<span class="sourceLineNo">456</span> */<a name="line.456"></a>
+<span class="sourceLineNo">457</span> public static void testRollbackRetriableFailure(<a name="line.457"></a>
+<span class="sourceLineNo">458</span> final ProcedureExecutor<MasterProcedureEnv> procExec, final long procId,<a name="line.458"></a>
+<span class="sourceLineNo">459</span> final int lastStep) throws Exception {<a name="line.459"></a>
+<span class="sourceLineNo">460</span> // Execute up to last step<a name="line.460"></a>
+<span class="sourceLineNo">461</span> testRecoveryAndDoubleExecution(procExec, procId, lastStep, false);<a name="line.461"></a>
+<span class="sourceLineNo">462</span><a name="line.462"></a>
+<span class="sourceLineNo">463</span> // execute the rollback<a name="line.463"></a>
+<span class="sourceLineNo">464</span> testRestartWithAbort(procExec, procId);<a name="line.464"></a>
<span class="sourceLineNo">465</span><a name="line.465"></a>
-<span class="sourceLineNo">466</span> // execute the rollback<a name="line.466"></a>
-<span class="sourceLineNo">467</span> testRestartWithAbort(procExec, procId);<a name="line.467"></a>
-<span class="sourceLineNo">468</span><a name="line.468"></a>
-<span class="sourceLineNo">469</span> assertEquals(true, procExec.isRunning());<a name="line.469"></a>
-<span class="sourceLineNo">470</span> ProcedureTestingUtility.assertIsAbortException(procExec.getResult(procId));<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> /**<a name="line.473"></a>
-<span class="sourceLineNo">474</span> * Restart the ProcedureExecutor and inject an abort to the specified procedure.<a name="line.474"></a>
-<span class="sourceLineNo">475</span> * If the procedure implement abort() this should result in rollback being triggered.<a name="line.475"></a>
-<span class="sourceLineNo">476</span> * At the end of this call the procedure should be finished and rolledback, if abort is implemnted<a name="line.476"></a>
-<span class="sourceLineNo">477</span> */<a name="line.477"></a>
-<span class="sourceLineNo">478</span> public static void testRestartWithAbort(ProcedureExecutor<MasterProcedureEnv> procExec,<a name="line.478"></a>
-<span class="sourceLineNo">479</span> long procId) throws Exception {<a name="line.479"></a>
-<span class="sourceLineNo">480</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, false);<a name="line.480"></a>
-<span class="sourceLineNo">481</span> InjectAbortOnLoadListener abortListener = new InjectAbortOnLoadListener(procExec);<a name="line.481"></a>
-<span class="sourceLineNo">482</span> abortListener.addProcId(procId);<a name="line.482"></a>
-<span class="sourceLineNo">483</span> procExec.registerListener(abortListener);<a name="line.483"></a>
-<span class="sourceLineNo">484</span> try {<a name="line.484"></a>
-<span class="sourceLineNo">485</span> ProcedureTestingUtility.assertProcNotYetCompleted(procExec, procId);<a name="line.485"></a>
-<span class="sourceLineNo">486</span> LOG.info("Restart and rollback procId=" + procId);<a name="line.486"></a>
-<span class="sourceLineNo">487</span> restartMasterProcedureExecutor(procExec);<a name="line.487"></a>
-<span class="sourceLineNo">488</span> ProcedureTestingUtility.waitProcedure(procExec, procId);<a name="line.488"></a>
-<span class="sourceLineNo">489</span> } finally {<a name="line.489"></a>
-<span class="sourceLineNo">490</span> assertTrue(procExec.unregisterListener(abortListener));<a name="line.490"></a>
-<span class="sourceLineNo">491</span> }<a name="line.491"></a>
-<span class="sourceLineNo">492</span> }<a name="line.492"></a>
-<span class="sourceLineNo">493</span><a name="line.493"></a>
-<span class="sourceLineNo">494</span> public static class InjectAbortOnLoadListener<a name="line.494"></a>
-<span class="sourceLineNo">495</span> implements ProcedureExecutor.ProcedureExecutorListener {<a name="line.495"></a>
-<span class="sourceLineNo">496</span> private final ProcedureExecutor<MasterProcedureEnv> procExec;<a name="line.496"></a>
-<span class="sourceLineNo">497</span> private TreeSet<Long> procsToAbort = null;<a name="line.497"></a>
-<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span> public InjectAbortOnLoadListener(final ProcedureExecutor<MasterProcedureEnv> procExec) {<a name="line.499"></a>
-<span class="sourceLineNo">500</span> this.procExec = procExec;<a name="line.500"></a>
-<span class="sourceLineNo">501</span> }<a name="line.501"></a>
-<span class="sourceLineNo">502</span><a name="line.502"></a>
-<span class="sourceLineNo">503</span> public void addProcId(long procId) {<a name="line.503"></a>
-<span class="sourceLineNo">504</span> if (procsToAbort == null) {<a name="line.504"></a>
-<span class="sourceLineNo">505</span> procsToAbort = new TreeSet<>();<a name="line.505"></a>
-<span class="sourceLineNo">506</span> }<a name="line.506"></a>
-<span class="sourceLineNo">507</span> procsToAbort.add(procId);<a name="line.507"></a>
-<span class="sourceLineNo">508</span> }<a name="line.508"></a>
-<span class="sourceLineNo">509</span><a name="line.509"></a>
-<span class="sourceLineNo">510</span> @Override<a name="line.510"></a>
-<span class="sourceLineNo">511</span> public void procedureLoaded(long procId) {<a name="line.511"></a>
-<span class="sourceLineNo">512</span> if (procsToAbort != null && !procsToAbort.contains(procId)) {<a name="line.512"></a>
-<span class="sourceLineNo">513</span> return;<a name="line.513"></a>
-<span class="sourceLineNo">514</span> }<a name="line.514"></a>
-<span class="sourceLineNo">515</span> procExec.abort(procId);<a name="line.515"></a>
-<span class="sourceLineNo">516</span> }<a name="line.516"></a>
+<span class="sourceLineNo">466</span> assertEquals(true, procExec.isRunning());<a name="line.466"></a>
+<span class="sourceLineNo">467</span> ProcedureTestingUtility.assertIsAbortException(procExec.getResult(procId));<a name="line.467"></a>
+<span class="sourceLineNo">468</span> }<a name="line.468"></a>
+<span class="sourceLineNo">469</span><a name="line.469"></a>
+<span class="sourceLineNo">470</span> /**<a name="line.470"></a>
+<span class="sourceLineNo">471</span> * Restart the ProcedureExecutor and inject an abort to the specified procedure.<a name="line.471"></a>
+<span class="sourceLineNo">472</span> * If the procedure implement abort() this should result in rollback being triggered.<a name="line.472"></a>
+<span class="sourceLineNo">473</span> * At the end of this call the procedure should be finished and rolledback, if abort is implemnted<a name="line.473"></a>
+<span class="sourceLineNo">474</span> */<a name="line.474"></a>
+<span class="sourceLineNo">475</span> public static void testRestartWithAbort(ProcedureExecutor<MasterProcedureEnv> procExec,<a name="line.475"></a>
+<span class="sourceLineNo">476</span> long procId) throws Exception {<a name="line.476"></a>
+<span class="sourceLineNo">477</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, false);<a name="line.477"></a>
+<span class="sourceLineNo">478</span> InjectAbortOnLoadListener abortListener = new InjectAbortOnLoadListener(procExec);<a name="line.478"></a>
+<span class="sourceLineNo">479</span> abortListener.addProcId(procId);<a name="line.479"></a>
+<span class="sourceLineNo">480</span> procExec.registerListener(abortListener);<a name="line.480"></a>
+<span class="sourceLineNo">481</span> try {<a name="line.481"></a>
+<span class="sourceLineNo">482</span> ProcedureTestingUtility.assertProcNotYetCompleted(procExec, procId);<a name="line.482"></a>
+<span class="sourceLineNo">483</span> LOG.info("Restart and rollback procId=" + procId);<a name="line.483"></a>
+<span class="sourceLineNo">484</span> restartMasterProcedureExecutor(procExec);<a name="line.484"></a>
+<span class="sourceLineNo">485</span> ProcedureTestingUtility.waitProcedure(procExec, procId);<a name="line.485"></a>
+<span class="sourceLineNo">486</span> } finally {<a name="line.486"></a>
+<span class="sourceLineNo">487</span> assertTrue(procExec.unregisterListener(abortListener));<a name="line.487"></a>
+<span class="sourceLineNo">488</span> }<a name="line.488"></a>
+<span class="sourceLineNo">489</span> }<a name="line.489"></a>
+<span class="sourceLineNo">490</span><a name="line.490"></a>
+<span class="sourceLineNo">491</span> public static class InjectAbortOnLoadListener<a name="line.491"></a>
+<span class="sourceLineNo">492</span> implements ProcedureExecutor.ProcedureExecutorListener {<a name="line.492"></a>
+<span class="sourceLineNo">493</span> private final ProcedureExecutor<MasterProcedureEnv> procExec;<a name="line.493"></a>
+<span class="sourceLineNo">494</span> private TreeSet<Long> procsToAbort = null;<a name="line.494"></a>
+<span class="sourceLineNo">495</span><a name="line.495"></a>
+<span class="sourceLineNo">496</span> public InjectAbortOnLoadListener(final ProcedureExecutor<MasterProcedureEnv> procExec) {<a name="line.496"></a>
+<span class="sourceLineNo">497</span> this.procExec = procExec;<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> public void addProcId(long procId) {<a name="line.500"></a>
+<span class="sourceLineNo">501</span> if (procsToAbort == null) {<a name="line.501"></a>
+<span class="sourceLineNo">502</span> procsToAbort = new TreeSet<>();<a name="line.502"></a>
+<span class="sourceLineNo">503</span> }<a name="line.503"></a>
+<span class="sourceLineNo">504</span> procsToAbort.add(procId);<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> @Override<a name="line.507"></a>
+<span class="sourceLineNo">508</span> public void procedureLoaded(long procId) {<a name="line.508"></a>
+<span class="sourceLineNo">509</span> if (procsToAbort != null && !procsToAbort.contains(procId)) {<a name="line.509"></a>
+<span class="sourceLineNo">510</span> return;<a name="line.510"></a>
+<span class="sourceLineNo">511</span> }<a name="line.511"></a>
+<span class="sourceLineNo">512</span> procExec.abort(procId);<a name="line.512"></a>
+<span class="sourceLineNo">513</span> }<a name="line.513"></a>
+<span class="sourceLineNo">514</span><a name="line.514"></a>
+<span class="sourceLineNo">515</span> @Override<a name="line.515"></a>
+<span class="sourceLineNo">516</span> public void procedureAdded(long procId) { /* no-op */ }<a name="line.516"></a>
<span class="sourceLineNo">517</span><a name="line.517"></a>
<span class="sourceLineNo">518</span> @Override<a name="line.518"></a>
-<span class="sourceLineNo">519</span> public void procedureAdded(long procId) { /* no-op */ }<a name="line.519"></a>
-<span class="sourceLineNo">520</span><a name="line.520"></a>
-<span class="sourceLineNo">521</span> @Override<a name="line.521"></a>
-<span class="sourceLineNo">522</span> public void procedureFinished(long procId) { /* no-op */ }<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">519</span> public void procedureFinished(long procId) { /* no-op */ }<a name="line.519"></a>
+<span class="sourceLineNo">520</span> }<a name="line.520"></a>
+<span class="sourceLineNo">521</span>}<a name="line.521"></a>