hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From git-site-r...@apache.org
Subject [05/43] hbase-site git commit: Published site at 45bbee4905fb031259c935502444c729b32ddac8.
Date Sat, 10 Mar 2018 14:54:08 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/854846a5/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.InjectAbortOnLoadListener.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.InjectAbortOnLoadListener.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.InjectAbortOnLoadListener.html
index 18f8feb..ef82d80 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.InjectAbortOnLoadListener.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureTestingUtility.InjectAbortOnLoadListener.html
@@ -62,495 +62,514 @@
 <span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.master.TableStateManager;<a name="line.54"></a>
 <span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.master.assignment.AssignmentManager;<a name="line.55"></a>
 <span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.monitoring.TaskMonitor;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.util.MD5Hash;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.util.ModifyRegionUtils;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>import org.slf4j.Logger;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>import org.slf4j.LoggerFactory;<a name="line.65"></a>
-<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span>@InterfaceAudience.Private<a name="line.67"></a>
-<span class="sourceLineNo">068</span>public class MasterProcedureTestingUtility {<a name="line.68"></a>
-<span class="sourceLineNo">069</span>  private static final Logger LOG = LoggerFactory.getLogger(MasterProcedureTestingUtility.class);<a name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span>  private MasterProcedureTestingUtility() { }<a name="line.71"></a>
+<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.procedure2.Procedure;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.procedure2.StateMachineProcedure;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>import org.apache.hadoop.hbase.util.MD5Hash;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>import org.apache.hadoop.hbase.util.ModifyRegionUtils;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>import org.slf4j.Logger;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>import org.slf4j.LoggerFactory;<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span>@InterfaceAudience.Private<a name="line.69"></a>
+<span class="sourceLineNo">070</span>public class MasterProcedureTestingUtility {<a name="line.70"></a>
+<span class="sourceLineNo">071</span>  private static final Logger LOG = LoggerFactory.getLogger(MasterProcedureTestingUtility.class);<a name="line.71"></a>
 <span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span>  public static void restartMasterProcedureExecutor(ProcedureExecutor&lt;MasterProcedureEnv&gt; procExec)<a name="line.73"></a>
-<span class="sourceLineNo">074</span>      throws Exception {<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    final MasterProcedureEnv env = procExec.getEnvironment();<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    final HMaster master = (HMaster)env.getMasterServices();<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    ProcedureTestingUtility.restart(procExec, true, true,<a name="line.77"></a>
-<span class="sourceLineNo">078</span>      // stop services<a name="line.78"></a>
-<span class="sourceLineNo">079</span>      new Callable&lt;Void&gt;() {<a name="line.79"></a>
-<span class="sourceLineNo">080</span>        @Override<a name="line.80"></a>
-<span class="sourceLineNo">081</span>        public Void call() throws Exception {<a name="line.81"></a>
-<span class="sourceLineNo">082</span>          final AssignmentManager am = env.getAssignmentManager();<a name="line.82"></a>
-<span class="sourceLineNo">083</span>          // try to simulate a master restart by removing the ServerManager states about seqIDs<a name="line.83"></a>
-<span class="sourceLineNo">084</span>          for (RegionState regionState: am.getRegionStates().getRegionStates()) {<a name="line.84"></a>
-<span class="sourceLineNo">085</span>            env.getMasterServices().getServerManager().removeRegion(regionState.getRegion());<a name="line.85"></a>
-<span class="sourceLineNo">086</span>          }<a name="line.86"></a>
-<span class="sourceLineNo">087</span>          am.stop();<a name="line.87"></a>
-<span class="sourceLineNo">088</span>          master.setServerCrashProcessingEnabled(false);<a name="line.88"></a>
-<span class="sourceLineNo">089</span>          master.setInitialized(false);<a name="line.89"></a>
-<span class="sourceLineNo">090</span>          return null;<a name="line.90"></a>
-<span class="sourceLineNo">091</span>        }<a name="line.91"></a>
-<span class="sourceLineNo">092</span>      },<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      // restart services<a name="line.93"></a>
-<span class="sourceLineNo">094</span>      new Callable&lt;Void&gt;() {<a name="line.94"></a>
-<span class="sourceLineNo">095</span>        @Override<a name="line.95"></a>
-<span class="sourceLineNo">096</span>        public Void call() throws Exception {<a name="line.96"></a>
-<span class="sourceLineNo">097</span>          final AssignmentManager am = env.getAssignmentManager();<a name="line.97"></a>
-<span class="sourceLineNo">098</span>          am.start();<a name="line.98"></a>
-<span class="sourceLineNo">099</span>          MasterMetaBootstrap metaBootstrap = new MasterMetaBootstrap(master,<a name="line.99"></a>
-<span class="sourceLineNo">100</span>              TaskMonitor.get().createStatus("meta"));<a name="line.100"></a>
-<span class="sourceLineNo">101</span>          metaBootstrap.recoverMeta();<a name="line.101"></a>
-<span class="sourceLineNo">102</span>          metaBootstrap.processDeadServers();<a name="line.102"></a>
-<span class="sourceLineNo">103</span>          am.joinCluster();<a name="line.103"></a>
-<span class="sourceLineNo">104</span>          master.setInitialized(true);<a name="line.104"></a>
-<span class="sourceLineNo">105</span>          return null;<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>  // ==========================================================================<a name="line.110"></a>
-<span class="sourceLineNo">111</span>  //  Master failover utils<a name="line.111"></a>
+<span class="sourceLineNo">073</span>  private MasterProcedureTestingUtility() { }<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>  public static void restartMasterProcedureExecutor(ProcedureExecutor&lt;MasterProcedureEnv&gt; procExec)<a name="line.75"></a>
+<span class="sourceLineNo">076</span>      throws Exception {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    final MasterProcedureEnv env = procExec.getEnvironment();<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    final HMaster master = (HMaster)env.getMasterServices();<a name="line.78"></a>
+<span class="sourceLineNo">079</span>    ProcedureTestingUtility.restart(procExec, true, true,<a name="line.79"></a>
+<span class="sourceLineNo">080</span>      // stop services<a name="line.80"></a>
+<span class="sourceLineNo">081</span>      new Callable&lt;Void&gt;() {<a name="line.81"></a>
+<span class="sourceLineNo">082</span>        @Override<a name="line.82"></a>
+<span class="sourceLineNo">083</span>        public Void call() throws Exception {<a name="line.83"></a>
+<span class="sourceLineNo">084</span>          final AssignmentManager am = env.getAssignmentManager();<a name="line.84"></a>
+<span class="sourceLineNo">085</span>          // try to simulate a master restart by removing the ServerManager states about seqIDs<a name="line.85"></a>
+<span class="sourceLineNo">086</span>          for (RegionState regionState: am.getRegionStates().getRegionStates()) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span>            env.getMasterServices().getServerManager().removeRegion(regionState.getRegion());<a name="line.87"></a>
+<span class="sourceLineNo">088</span>          }<a name="line.88"></a>
+<span class="sourceLineNo">089</span>          am.stop();<a name="line.89"></a>
+<span class="sourceLineNo">090</span>          master.setServerCrashProcessingEnabled(false);<a name="line.90"></a>
+<span class="sourceLineNo">091</span>          master.setInitialized(false);<a name="line.91"></a>
+<span class="sourceLineNo">092</span>          return null;<a name="line.92"></a>
+<span class="sourceLineNo">093</span>        }<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      },<a name="line.94"></a>
+<span class="sourceLineNo">095</span>      // restart services<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      new Callable&lt;Void&gt;() {<a name="line.96"></a>
+<span class="sourceLineNo">097</span>        @Override<a name="line.97"></a>
+<span class="sourceLineNo">098</span>        public Void call() throws Exception {<a name="line.98"></a>
+<span class="sourceLineNo">099</span>          final AssignmentManager am = env.getAssignmentManager();<a name="line.99"></a>
+<span class="sourceLineNo">100</span>          am.start();<a name="line.100"></a>
+<span class="sourceLineNo">101</span>          MasterMetaBootstrap metaBootstrap = new MasterMetaBootstrap(master,<a name="line.101"></a>
+<span class="sourceLineNo">102</span>              TaskMonitor.get().createStatus("meta"));<a name="line.102"></a>
+<span class="sourceLineNo">103</span>          metaBootstrap.recoverMeta();<a name="line.103"></a>
+<span class="sourceLineNo">104</span>          metaBootstrap.processDeadServers();<a name="line.104"></a>
+<span class="sourceLineNo">105</span>          am.joinCluster();<a name="line.105"></a>
+<span class="sourceLineNo">106</span>          master.setInitialized(true);<a name="line.106"></a>
+<span class="sourceLineNo">107</span>          return null;<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>  }<a name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
 <span class="sourceLineNo">112</span>  // ==========================================================================<a name="line.112"></a>
-<span class="sourceLineNo">113</span>  public static void masterFailover(final HBaseTestingUtility testUtil)<a name="line.113"></a>
-<span class="sourceLineNo">114</span>      throws Exception {<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    MiniHBaseCluster cluster = testUtil.getMiniHBaseCluster();<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>    // Kill the master<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    HMaster oldMaster = cluster.getMaster();<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    cluster.killMaster(cluster.getMaster().getServerName());<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span>    // Wait the secondary<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    waitBackupMaster(testUtil, oldMaster);<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>  public static void waitBackupMaster(final HBaseTestingUtility testUtil,<a name="line.125"></a>
-<span class="sourceLineNo">126</span>      final HMaster oldMaster) throws Exception {<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    MiniHBaseCluster cluster = testUtil.getMiniHBaseCluster();<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span>    HMaster newMaster = cluster.getMaster();<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    while (newMaster == null || newMaster == oldMaster) {<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      Thread.sleep(250);<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      newMaster = cluster.getMaster();<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>    while (!(newMaster.isActiveMaster() &amp;&amp; newMaster.isInitialized())) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>      Thread.sleep(250);<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>  // ==========================================================================<a name="line.140"></a>
-<span class="sourceLineNo">141</span>  //  Table Helpers<a name="line.141"></a>
+<span class="sourceLineNo">113</span>  //  Master failover utils<a name="line.113"></a>
+<span class="sourceLineNo">114</span>  // ==========================================================================<a name="line.114"></a>
+<span class="sourceLineNo">115</span>  public static void masterFailover(final HBaseTestingUtility testUtil)<a name="line.115"></a>
+<span class="sourceLineNo">116</span>      throws Exception {<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    MiniHBaseCluster cluster = testUtil.getMiniHBaseCluster();<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span>    // Kill the master<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    HMaster oldMaster = cluster.getMaster();<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    cluster.killMaster(cluster.getMaster().getServerName());<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span>    // Wait the secondary<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    waitBackupMaster(testUtil, oldMaster);<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>  public static void waitBackupMaster(final HBaseTestingUtility testUtil,<a name="line.127"></a>
+<span class="sourceLineNo">128</span>      final HMaster oldMaster) throws Exception {<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    MiniHBaseCluster cluster = testUtil.getMiniHBaseCluster();<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span>    HMaster newMaster = cluster.getMaster();<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    while (newMaster == null || newMaster == oldMaster) {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      Thread.sleep(250);<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      newMaster = cluster.getMaster();<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>    while (!(newMaster.isActiveMaster() &amp;&amp; newMaster.isInitialized())) {<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      Thread.sleep(250);<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><a name="line.141"></a>
 <span class="sourceLineNo">142</span>  // ==========================================================================<a name="line.142"></a>
-<span class="sourceLineNo">143</span>  public static TableDescriptor createHTD(final TableName tableName, final String... family) {<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName);<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    for (int i = 0; i &lt; family.length; ++i) {<a name="line.145"></a>
-<span class="sourceLineNo">146</span>      builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(family[i]));<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    }<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    return builder.build();<a name="line.148"></a>
-<span class="sourceLineNo">149</span>  }<a name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span>  public static RegionInfo[] createTable(final ProcedureExecutor&lt;MasterProcedureEnv&gt; procExec,<a name="line.151"></a>
-<span class="sourceLineNo">152</span>      final TableName tableName, final byte[][] splitKeys, String... family) throws IOException {<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    TableDescriptor htd = createHTD(tableName, family);<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    RegionInfo[] regions = ModifyRegionUtils.createRegionInfos(htd, splitKeys);<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    long procId = ProcedureTestingUtility.submitAndWait(procExec,<a name="line.155"></a>
-<span class="sourceLineNo">156</span>      new CreateTableProcedure(procExec.getEnvironment(), htd, regions));<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    ProcedureTestingUtility.assertProcNotFailed(procExec.getResult(procId));<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    return regions;<a name="line.158"></a>
-<span class="sourceLineNo">159</span>  }<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span>  public static void validateTableCreation(final HMaster master, final TableName tableName,<a name="line.161"></a>
-<span class="sourceLineNo">162</span>      final RegionInfo[] regions, String... family) throws IOException {<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    validateTableCreation(master, tableName, regions, true, family);<a name="line.163"></a>
-<span class="sourceLineNo">164</span>  }<a name="line.164"></a>
-<span class="sourceLineNo">165</span><a name="line.165"></a>
-<span class="sourceLineNo">166</span>  public static void validateTableCreation(final HMaster master, final TableName tableName,<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      final RegionInfo[] regions, boolean hasFamilyDirs, String... family) throws IOException {<a name="line.167"></a>
-<span class="sourceLineNo">168</span>    // check filesystem<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    final FileSystem fs = master.getMasterFileSystem().getFileSystem();<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    final Path tableDir = FSUtils.getTableDir(master.getMasterFileSystem().getRootDir(), tableName);<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    assertTrue(fs.exists(tableDir));<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    FSUtils.logFileSystemState(fs, tableDir, LOG);<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    List&lt;Path&gt; unwantedRegionDirs = FSUtils.getRegionDirs(fs, tableDir);<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    for (int i = 0; i &lt; regions.length; ++i) {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>      Path regionDir = new Path(tableDir, regions[i].getEncodedName());<a name="line.175"></a>
-<span class="sourceLineNo">176</span>      assertTrue(regions[i] + " region dir does not exist", fs.exists(regionDir));<a name="line.176"></a>
-<span class="sourceLineNo">177</span>      assertTrue(unwantedRegionDirs.remove(regionDir));<a name="line.177"></a>
-<span class="sourceLineNo">178</span>      List&lt;Path&gt; allFamilyDirs = FSUtils.getFamilyDirs(fs, regionDir);<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      for (int j = 0; j &lt; family.length; ++j) {<a name="line.179"></a>
-<span class="sourceLineNo">180</span>        final Path familyDir = new Path(regionDir, family[j]);<a name="line.180"></a>
-<span class="sourceLineNo">181</span>        if (hasFamilyDirs) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span>          assertTrue(family[j] + " family dir does not exist", fs.exists(familyDir));<a name="line.182"></a>
-<span class="sourceLineNo">183</span>          assertTrue(allFamilyDirs.remove(familyDir));<a name="line.183"></a>
-<span class="sourceLineNo">184</span>        } else {<a name="line.184"></a>
-<span class="sourceLineNo">185</span>          // TODO: WARN: Modify Table/Families does not create a family dir<a name="line.185"></a>
-<span class="sourceLineNo">186</span>          if (!fs.exists(familyDir)) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>            LOG.warn(family[j] + " family dir does not exist");<a name="line.187"></a>
-<span class="sourceLineNo">188</span>          }<a name="line.188"></a>
-<span class="sourceLineNo">189</span>          allFamilyDirs.remove(familyDir);<a name="line.189"></a>
-<span class="sourceLineNo">190</span>        }<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      }<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      assertTrue("found extraneous families: " + allFamilyDirs, allFamilyDirs.isEmpty());<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    }<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    assertTrue("found extraneous regions: " + unwantedRegionDirs, unwantedRegionDirs.isEmpty());<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    LOG.debug("Table directory layout is as expected.");<a name="line.195"></a>
-<span class="sourceLineNo">196</span><a name="line.196"></a>
-<span class="sourceLineNo">197</span>    // check meta<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    assertTrue(MetaTableAccessor.tableExists(master.getConnection(), tableName));<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    assertEquals(regions.length, countMetaRegions(master, tableName));<a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span>    // check htd<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    TableDescriptor htd = master.getTableDescriptors().get(tableName);<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    assertTrue("table descriptor not found", htd != null);<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    for (int i = 0; i &lt; family.length; ++i) {<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      assertTrue("family not found " + family[i], htd.getColumnFamily(Bytes.toBytes(family[i])) != null);<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    }<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    assertEquals(family.length, htd.getColumnFamilyCount());<a name="line.207"></a>
-<span class="sourceLineNo">208</span>  }<a name="line.208"></a>
-<span class="sourceLineNo">209</span><a name="line.209"></a>
-<span class="sourceLineNo">210</span>  public static void validateTableDeletion(<a name="line.210"></a>
-<span class="sourceLineNo">211</span>      final HMaster master, final TableName tableName) throws IOException {<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    // check filesystem<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    final FileSystem fs = master.getMasterFileSystem().getFileSystem();<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    final Path tableDir = FSUtils.getTableDir(master.getMasterFileSystem().getRootDir(), tableName);<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    assertFalse(fs.exists(tableDir));<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span>    // check meta<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    assertFalse(MetaTableAccessor.tableExists(master.getConnection(), tableName));<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    assertEquals(0, countMetaRegions(master, tableName));<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span>    // check htd<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    assertTrue("found htd of deleted table",<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      master.getTableDescriptors().get(tableName) == null);<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>  private static int countMetaRegions(final HMaster master, final TableName tableName)<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      throws IOException {<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    final AtomicInteger actualRegCount = new AtomicInteger(0);<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    final MetaTableAccessor.Visitor visitor = new MetaTableAccessor.Visitor() {<a name="line.229"></a>
-<span class="sourceLineNo">230</span>      @Override<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      public boolean visit(Result rowResult) throws IOException {<a name="line.231"></a>
-<span class="sourceLineNo">232</span>        RegionLocations list = MetaTableAccessor.getRegionLocations(rowResult);<a name="line.232"></a>
-<span class="sourceLineNo">233</span>        if (list == null) {<a name="line.233"></a>
-<span class="sourceLineNo">234</span>          LOG.warn("No serialized RegionInfo in " + rowResult);<a name="line.234"></a>
-<span class="sourceLineNo">235</span>          return true;<a name="line.235"></a>
-<span class="sourceLineNo">236</span>        }<a name="line.236"></a>
-<span class="sourceLineNo">237</span>        HRegionLocation l = list.getRegionLocation();<a name="line.237"></a>
-<span class="sourceLineNo">238</span>        if (l == null) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>          return true;<a name="line.239"></a>
-<span class="sourceLineNo">240</span>        }<a name="line.240"></a>
-<span class="sourceLineNo">241</span>        if (!l.getRegionInfo().getTable().equals(tableName)) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span>          return false;<a name="line.242"></a>
-<span class="sourceLineNo">243</span>        }<a name="line.243"></a>
-<span class="sourceLineNo">244</span>        if (l.getRegionInfo().isOffline() || l.getRegionInfo().isSplit()) return true;<a name="line.244"></a>
-<span class="sourceLineNo">245</span>        HRegionLocation[] locations = list.getRegionLocations();<a name="line.245"></a>
-<span class="sourceLineNo">246</span>        for (HRegionLocation location : locations) {<a name="line.246"></a>
-<span class="sourceLineNo">247</span>          if (location == null) continue;<a name="line.247"></a>
-<span class="sourceLineNo">248</span>          ServerName serverName = location.getServerName();<a name="line.248"></a>
-<span class="sourceLineNo">249</span>          // Make sure that regions are assigned to server<a name="line.249"></a>
-<span class="sourceLineNo">250</span>          if (serverName != null &amp;&amp; serverName.getHostAndPort() != null) {<a name="line.250"></a>
-<span class="sourceLineNo">251</span>            actualRegCount.incrementAndGet();<a name="line.251"></a>
-<span class="sourceLineNo">252</span>          }<a name="line.252"></a>
-<span class="sourceLineNo">253</span>        }<a name="line.253"></a>
-<span class="sourceLineNo">254</span>        return true;<a name="line.254"></a>
-<span class="sourceLineNo">255</span>      }<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    };<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    MetaTableAccessor.scanMetaForTableRegions(master.getConnection(), visitor, tableName);<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    return actualRegCount.get();<a name="line.258"></a>
-<span class="sourceLineNo">259</span>  }<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span>  public static void validateTableIsEnabled(final HMaster master, final TableName tableName)<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      throws IOException {<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    TableStateManager tsm = master.getTableStateManager();<a name="line.263"></a>
-<span class="sourceLineNo">264</span>    assertTrue(tsm.getTableState(tableName).equals(TableState.State.ENABLED));<a name="line.264"></a>
-<span class="sourceLineNo">265</span>  }<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span>  public static void validateTableIsDisabled(final HMaster master, final TableName tableName)<a name="line.267"></a>
-<span class="sourceLineNo">268</span>      throws IOException {<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    TableStateManager tsm = master.getTableStateManager();<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    assertTrue(tsm.getTableState(tableName).equals(TableState.State.DISABLED));<a name="line.270"></a>
-<span class="sourceLineNo">271</span>  }<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span>  public static void validateColumnFamilyAddition(final HMaster master, final TableName tableName,<a name="line.273"></a>
-<span class="sourceLineNo">274</span>      final String family) throws IOException {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>    TableDescriptor htd = master.getTableDescriptors().get(tableName);<a name="line.275"></a>
-<span class="sourceLineNo">276</span>    assertTrue(htd != null);<a name="line.276"></a>
-<span class="sourceLineNo">277</span><a name="line.277"></a>
-<span class="sourceLineNo">278</span>    assertTrue(htd.hasColumnFamily(family.getBytes()));<a name="line.278"></a>
-<span class="sourceLineNo">279</span>  }<a name="line.279"></a>
-<span class="sourceLineNo">280</span><a name="line.280"></a>
-<span class="sourceLineNo">281</span>  public static void validateColumnFamilyDeletion(final HMaster master, final TableName tableName,<a name="line.281"></a>
-<span class="sourceLineNo">282</span>      final String family) throws IOException {<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    // verify htd<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    TableDescriptor htd = master.getTableDescriptors().get(tableName);<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    assertTrue(htd != null);<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    assertFalse(htd.hasColumnFamily(family.getBytes()));<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span>    // verify fs<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    final FileSystem fs = master.getMasterFileSystem().getFileSystem();<a name="line.289"></a>
-<span class="sourceLineNo">290</span>    final Path tableDir = FSUtils.getTableDir(master.getMasterFileSystem().getRootDir(), tableName);<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    for (Path regionDir: FSUtils.getRegionDirs(fs, tableDir)) {<a name="line.291"></a>
-<span class="sourceLineNo">292</span>      final Path familyDir = new Path(regionDir, family);<a name="line.292"></a>
-<span class="sourceLineNo">293</span>      assertFalse(family + " family dir should not exist", fs.exists(familyDir));<a name="line.293"></a>
-<span class="sourceLineNo">294</span>    }<a name="line.294"></a>
-<span class="sourceLineNo">295</span>  }<a name="line.295"></a>
-<span class="sourceLineNo">296</span><a name="line.296"></a>
-<span class="sourceLineNo">297</span>  public static void validateColumnFamilyModification(final HMaster master,<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      final TableName tableName, final String family, ColumnFamilyDescriptor columnDescriptor)<a name="line.298"></a>
-<span class="sourceLineNo">299</span>      throws IOException {<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    TableDescriptor htd = master.getTableDescriptors().get(tableName);<a name="line.300"></a>
-<span class="sourceLineNo">301</span>    assertTrue(htd != null);<a name="line.301"></a>
-<span class="sourceLineNo">302</span><a name="line.302"></a>
-<span class="sourceLineNo">303</span>    ColumnFamilyDescriptor hcfd = htd.getColumnFamily(family.getBytes());<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    assertEquals(0, ColumnFamilyDescriptor.COMPARATOR.compare(hcfd, columnDescriptor));<a name="line.304"></a>
-<span class="sourceLineNo">305</span>  }<a name="line.305"></a>
-<span class="sourceLineNo">306</span><a name="line.306"></a>
-<span class="sourceLineNo">307</span>  public static void loadData(final Connection connection, final TableName tableName,<a name="line.307"></a>
-<span class="sourceLineNo">308</span>      int rows, final byte[][] splitKeys,  final String... sfamilies) throws IOException {<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    byte[][] families = new byte[sfamilies.length][];<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    for (int i = 0; i &lt; families.length; ++i) {<a name="line.310"></a>
-<span class="sourceLineNo">311</span>      families[i] = Bytes.toBytes(sfamilies[i]);<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    }<a name="line.312"></a>
-<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span>    BufferedMutator mutator = connection.getBufferedMutator(tableName);<a name="line.314"></a>
+<span class="sourceLineNo">143</span>  //  Table Helpers<a name="line.143"></a>
+<span class="sourceLineNo">144</span>  // ==========================================================================<a name="line.144"></a>
+<span class="sourceLineNo">145</span>  public static TableDescriptor createHTD(final TableName tableName, final String... family) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(tableName);<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    for (int i = 0; i &lt; family.length; ++i) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      builder.addColumnFamily(ColumnFamilyDescriptorBuilder.of(family[i]));<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    }<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    return builder.build();<a name="line.150"></a>
+<span class="sourceLineNo">151</span>  }<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span>  public static RegionInfo[] createTable(final ProcedureExecutor&lt;MasterProcedureEnv&gt; procExec,<a name="line.153"></a>
+<span class="sourceLineNo">154</span>      final TableName tableName, final byte[][] splitKeys, String... family) throws IOException {<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    TableDescriptor htd = createHTD(tableName, family);<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    RegionInfo[] regions = ModifyRegionUtils.createRegionInfos(htd, splitKeys);<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    long procId = ProcedureTestingUtility.submitAndWait(procExec,<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      new CreateTableProcedure(procExec.getEnvironment(), htd, regions));<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    ProcedureTestingUtility.assertProcNotFailed(procExec.getResult(procId));<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    return regions;<a name="line.160"></a>
+<span class="sourceLineNo">161</span>  }<a name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span>  public static void validateTableCreation(final HMaster master, final TableName tableName,<a name="line.163"></a>
+<span class="sourceLineNo">164</span>      final RegionInfo[] regions, String... family) throws IOException {<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    validateTableCreation(master, tableName, regions, true, family);<a name="line.165"></a>
+<span class="sourceLineNo">166</span>  }<a name="line.166"></a>
+<span class="sourceLineNo">167</span><a name="line.167"></a>
+<span class="sourceLineNo">168</span>  public static void validateTableCreation(final HMaster master, final TableName tableName,<a name="line.168"></a>
+<span class="sourceLineNo">169</span>      final RegionInfo[] regions, boolean hasFamilyDirs, String... family) throws IOException {<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    // check filesystem<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    final FileSystem fs = master.getMasterFileSystem().getFileSystem();<a name="line.171"></a>
+<span class="sourceLineNo">172</span>    final Path tableDir = FSUtils.getTableDir(master.getMasterFileSystem().getRootDir(), tableName);<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    assertTrue(fs.exists(tableDir));<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    FSUtils.logFileSystemState(fs, tableDir, LOG);<a name="line.174"></a>
+<span class="sourceLineNo">175</span>    List&lt;Path&gt; unwantedRegionDirs = FSUtils.getRegionDirs(fs, tableDir);<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    for (int i = 0; i &lt; regions.length; ++i) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      Path regionDir = new Path(tableDir, regions[i].getEncodedName());<a name="line.177"></a>
+<span class="sourceLineNo">178</span>      assertTrue(regions[i] + " region dir does not exist", fs.exists(regionDir));<a name="line.178"></a>
+<span class="sourceLineNo">179</span>      assertTrue(unwantedRegionDirs.remove(regionDir));<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      List&lt;Path&gt; allFamilyDirs = FSUtils.getFamilyDirs(fs, regionDir);<a name="line.180"></a>
+<span class="sourceLineNo">181</span>      for (int j = 0; j &lt; family.length; ++j) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span>        final Path familyDir = new Path(regionDir, family[j]);<a name="line.182"></a>
+<span class="sourceLineNo">183</span>        if (hasFamilyDirs) {<a name="line.183"></a>
+<span class="sourceLineNo">184</span>          assertTrue(family[j] + " family dir does not exist", fs.exists(familyDir));<a name="line.184"></a>
+<span class="sourceLineNo">185</span>          assertTrue(allFamilyDirs.remove(familyDir));<a name="line.185"></a>
+<span class="sourceLineNo">186</span>        } else {<a name="line.186"></a>
+<span class="sourceLineNo">187</span>          // TODO: WARN: Modify Table/Families does not create a family dir<a name="line.187"></a>
+<span class="sourceLineNo">188</span>          if (!fs.exists(familyDir)) {<a name="line.188"></a>
+<span class="sourceLineNo">189</span>            LOG.warn(family[j] + " family dir does not exist");<a name="line.189"></a>
+<span class="sourceLineNo">190</span>          }<a name="line.190"></a>
+<span class="sourceLineNo">191</span>          allFamilyDirs.remove(familyDir);<a name="line.191"></a>
+<span class="sourceLineNo">192</span>        }<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      }<a name="line.193"></a>
+<span class="sourceLineNo">194</span>      assertTrue("found extraneous families: " + allFamilyDirs, allFamilyDirs.isEmpty());<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    }<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    assertTrue("found extraneous regions: " + unwantedRegionDirs, unwantedRegionDirs.isEmpty());<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    LOG.debug("Table directory layout is as expected.");<a name="line.197"></a>
+<span class="sourceLineNo">198</span><a name="line.198"></a>
+<span class="sourceLineNo">199</span>    // check meta<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    assertTrue(MetaTableAccessor.tableExists(master.getConnection(), tableName));<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    assertEquals(regions.length, countMetaRegions(master, tableName));<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span>    // check htd<a name="line.203"></a>
+<span class="sourceLineNo">204</span>    TableDescriptor htd = master.getTableDescriptors().get(tableName);<a name="line.204"></a>
+<span class="sourceLineNo">205</span>    assertTrue("table descriptor not found", htd != null);<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    for (int i = 0; i &lt; family.length; ++i) {<a name="line.206"></a>
+<span class="sourceLineNo">207</span>      assertTrue("family not found " + family[i], htd.getColumnFamily(Bytes.toBytes(family[i])) != null);<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    }<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    assertEquals(family.length, htd.getColumnFamilyCount());<a name="line.209"></a>
+<span class="sourceLineNo">210</span>  }<a name="line.210"></a>
+<span class="sourceLineNo">211</span><a name="line.211"></a>
+<span class="sourceLineNo">212</span>  public static void validateTableDeletion(<a name="line.212"></a>
+<span class="sourceLineNo">213</span>      final HMaster master, final TableName tableName) throws IOException {<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    // check filesystem<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    final FileSystem fs = master.getMasterFileSystem().getFileSystem();<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    final Path tableDir = FSUtils.getTableDir(master.getMasterFileSystem().getRootDir(), tableName);<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    assertFalse(fs.exists(tableDir));<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span>    // check meta<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    assertFalse(MetaTableAccessor.tableExists(master.getConnection(), tableName));<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    assertEquals(0, countMetaRegions(master, tableName));<a name="line.221"></a>
+<span class="sourceLineNo">222</span><a name="line.222"></a>
+<span class="sourceLineNo">223</span>    // check htd<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    assertTrue("found htd of deleted table",<a name="line.224"></a>
+<span class="sourceLineNo">225</span>      master.getTableDescriptors().get(tableName) == null);<a name="line.225"></a>
+<span class="sourceLineNo">226</span>  }<a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span>  private static int countMetaRegions(final HMaster master, final TableName tableName)<a name="line.228"></a>
+<span class="sourceLineNo">229</span>      throws IOException {<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    final AtomicInteger actualRegCount = new AtomicInteger(0);<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    final MetaTableAccessor.Visitor visitor = new MetaTableAccessor.Visitor() {<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      @Override<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      public boolean visit(Result rowResult) throws IOException {<a name="line.233"></a>
+<span class="sourceLineNo">234</span>        RegionLocations list = MetaTableAccessor.getRegionLocations(rowResult);<a name="line.234"></a>
+<span class="sourceLineNo">235</span>        if (list == null) {<a name="line.235"></a>
+<span class="sourceLineNo">236</span>          LOG.warn("No serialized RegionInfo in " + rowResult);<a name="line.236"></a>
+<span class="sourceLineNo">237</span>          return true;<a name="line.237"></a>
+<span class="sourceLineNo">238</span>        }<a name="line.238"></a>
+<span class="sourceLineNo">239</span>        HRegionLocation l = list.getRegionLocation();<a name="line.239"></a>
+<span class="sourceLineNo">240</span>        if (l == null) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span>          return true;<a name="line.241"></a>
+<span class="sourceLineNo">242</span>        }<a name="line.242"></a>
+<span class="sourceLineNo">243</span>        if (!l.getRegionInfo().getTable().equals(tableName)) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span>          return false;<a name="line.244"></a>
+<span class="sourceLineNo">245</span>        }<a name="line.245"></a>
+<span class="sourceLineNo">246</span>        if (l.getRegionInfo().isOffline() || l.getRegionInfo().isSplit()) return true;<a name="line.246"></a>
+<span class="sourceLineNo">247</span>        HRegionLocation[] locations = list.getRegionLocations();<a name="line.247"></a>
+<span class="sourceLineNo">248</span>        for (HRegionLocation location : locations) {<a name="line.248"></a>
+<span class="sourceLineNo">249</span>          if (location == null) continue;<a name="line.249"></a>
+<span class="sourceLineNo">250</span>          ServerName serverName = location.getServerName();<a name="line.250"></a>
+<span class="sourceLineNo">251</span>          // Make sure that regions are assigned to server<a name="line.251"></a>
+<span class="sourceLineNo">252</span>          if (serverName != null &amp;&amp; serverName.getHostAndPort() != null) {<a name="line.252"></a>
+<span class="sourceLineNo">253</span>            actualRegCount.incrementAndGet();<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>        return true;<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>    MetaTableAccessor.scanMetaForTableRegions(master.getConnection(), visitor, tableName);<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    return actualRegCount.get();<a name="line.260"></a>
+<span class="sourceLineNo">261</span>  }<a name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span>  public static void validateTableIsEnabled(final HMaster master, final TableName tableName)<a name="line.263"></a>
+<span class="sourceLineNo">264</span>      throws IOException {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    TableStateManager tsm = master.getTableStateManager();<a name="line.265"></a>
+<span class="sourceLineNo">266</span>    assertTrue(tsm.getTableState(tableName).equals(TableState.State.ENABLED));<a name="line.266"></a>
+<span class="sourceLineNo">267</span>  }<a name="line.267"></a>
+<span class="sourceLineNo">268</span><a name="line.268"></a>
+<span class="sourceLineNo">269</span>  public static void validateTableIsDisabled(final HMaster master, final TableName tableName)<a name="line.269"></a>
+<span class="sourceLineNo">270</span>      throws IOException {<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    TableStateManager tsm = master.getTableStateManager();<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    assertTrue(tsm.getTableState(tableName).equals(TableState.State.DISABLED));<a name="line.272"></a>
+<span class="sourceLineNo">273</span>  }<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span>  public static void validateColumnFamilyAddition(final HMaster master, final TableName tableName,<a name="line.275"></a>
+<span class="sourceLineNo">276</span>      final String family) throws IOException {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>    TableDescriptor htd = master.getTableDescriptors().get(tableName);<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    assertTrue(htd != null);<a name="line.278"></a>
+<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">280</span>    assertTrue(htd.hasColumnFamily(family.getBytes()));<a name="line.280"></a>
+<span class="sourceLineNo">281</span>  }<a name="line.281"></a>
+<span class="sourceLineNo">282</span><a name="line.282"></a>
+<span class="sourceLineNo">283</span>  public static void validateColumnFamilyDeletion(final HMaster master, final TableName tableName,<a name="line.283"></a>
+<span class="sourceLineNo">284</span>      final String family) throws IOException {<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    // verify htd<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    TableDescriptor htd = master.getTableDescriptors().get(tableName);<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    assertTrue(htd != null);<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    assertFalse(htd.hasColumnFamily(family.getBytes()));<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span>    // verify fs<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    final FileSystem fs = master.getMasterFileSystem().getFileSystem();<a name="line.291"></a>
+<span class="sourceLineNo">292</span>    final Path tableDir = FSUtils.getTableDir(master.getMasterFileSystem().getRootDir(), tableName);<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    for (Path regionDir: FSUtils.getRegionDirs(fs, tableDir)) {<a name="line.293"></a>
+<span class="sourceLineNo">294</span>      final Path familyDir = new Path(regionDir, family);<a name="line.294"></a>
+<span class="sourceLineNo">295</span>      assertFalse(family + " family dir should not exist", fs.exists(familyDir));<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    }<a name="line.296"></a>
+<span class="sourceLineNo">297</span>  }<a name="line.297"></a>
+<span class="sourceLineNo">298</span><a name="line.298"></a>
+<span class="sourceLineNo">299</span>  public static void validateColumnFamilyModification(final HMaster master,<a name="line.299"></a>
+<span class="sourceLineNo">300</span>      final TableName tableName, final String family, ColumnFamilyDescriptor columnDescriptor)<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      throws IOException {<a name="line.301"></a>
+<span class="sourceLineNo">302</span>    TableDescriptor htd = master.getTableDescriptors().get(tableName);<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    assertTrue(htd != null);<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span>    ColumnFamilyDescriptor hcfd = htd.getColumnFamily(family.getBytes());<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    assertEquals(0, ColumnFamilyDescriptor.COMPARATOR.compare(hcfd, columnDescriptor));<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>  public static void loadData(final Connection connection, final TableName tableName,<a name="line.309"></a>
+<span class="sourceLineNo">310</span>      int rows, final byte[][] splitKeys,  final String... sfamilies) throws IOException {<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    byte[][] families = new byte[sfamilies.length][];<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    for (int i = 0; i &lt; families.length; ++i) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>      families[i] = Bytes.toBytes(sfamilies[i]);<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    }<a name="line.314"></a>
 <span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span>    // Ensure one row per region<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    assertTrue(rows &gt;= splitKeys.length);<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    for (byte[] k: splitKeys) {<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      byte[] value = Bytes.add(Bytes.toBytes(System.currentTimeMillis()), k);<a name="line.319"></a>
-<span class="sourceLineNo">320</span>      byte[] key = Bytes.add(k, Bytes.toBytes(MD5Hash.getMD5AsHex(value)));<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      mutator.mutate(createPut(families, key, value));<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      rows--;<a name="line.322"></a>
-<span class="sourceLineNo">323</span>    }<a name="line.323"></a>
-<span class="sourceLineNo">324</span><a name="line.324"></a>
-<span class="sourceLineNo">325</span>    // Add other extra rows. more rows, more files<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    while (rows-- &gt; 0) {<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      byte[] value = Bytes.add(Bytes.toBytes(System.currentTimeMillis()), Bytes.toBytes(rows));<a name="line.327"></a>
-<span class="sourceLineNo">328</span>      byte[] key = Bytes.toBytes(MD5Hash.getMD5AsHex(value));<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      mutator.mutate(createPut(families, key, value));<a name="line.329"></a>
-<span class="sourceLineNo">330</span>    }<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    mutator.flush();<a name="line.331"></a>
-<span class="sourceLineNo">332</span>  }<a name="line.332"></a>
-<span class="sourceLineNo">333</span><a name="line.333"></a>
-<span class="sourceLineNo">334</span>  private static Put createPut(final byte[][] families, final byte[] key, final byte[] value) {<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    byte[] q = Bytes.toBytes("q");<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    Put put = new Put(key);<a name="line.336"></a>
-<span class="sourceLineNo">337</span>    put.setDurability(Durability.SKIP_WAL);<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    for (byte[] family: families) {<a name="line.338"></a>
-<span class="sourceLineNo">339</span>      put.addColumn(family, q, value);<a name="line.339"></a>
-<span class="sourceLineNo">340</span>    }<a name="line.340"></a>
-<span class="sourceLineNo">341</span>    return put;<a name="line.341"></a>
-<span class="sourceLineNo">342</span>  }<a name="line.342"></a>
-<span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span>  // ==========================================================================<a name="line.344"></a>
-<span class="sourceLineNo">345</span>  //  Procedure Helpers<a name="line.345"></a>
+<span class="sourceLineNo">316</span>    BufferedMutator mutator = connection.getBufferedMutator(tableName);<a name="line.316"></a>
+<span class="sourceLineNo">317</span><a name="line.317"></a>
+<span class="sourceLineNo">318</span>    // Ensure one row per region<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    assertTrue(rows &gt;= splitKeys.length);<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    for (byte[] k: splitKeys) {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      byte[] value = Bytes.add(Bytes.toBytes(System.currentTimeMillis()), k);<a name="line.321"></a>
+<span class="sourceLineNo">322</span>      byte[] key = Bytes.add(k, Bytes.toBytes(MD5Hash.getMD5AsHex(value)));<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      mutator.mutate(createPut(families, key, value));<a name="line.323"></a>
+<span class="sourceLineNo">324</span>      rows--;<a name="line.324"></a>
+<span class="sourceLineNo">325</span>    }<a name="line.325"></a>
+<span class="sourceLineNo">326</span><a name="line.326"></a>
+<span class="sourceLineNo">327</span>    // Add other extra rows. more rows, more files<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    while (rows-- &gt; 0) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span>      byte[] value = Bytes.add(Bytes.toBytes(System.currentTimeMillis()), Bytes.toBytes(rows));<a name="line.329"></a>
+<span class="sourceLineNo">330</span>      byte[] key = Bytes.toBytes(MD5Hash.getMD5AsHex(value));<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      mutator.mutate(createPut(families, key, value));<a name="line.331"></a>
+<span class="sourceLineNo">332</span>    }<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    mutator.flush();<a name="line.333"></a>
+<span class="sourceLineNo">334</span>  }<a name="line.334"></a>
+<span class="sourceLineNo">335</span><a name="line.335"></a>
+<span class="sourceLineNo">336</span>  private static Put createPut(final byte[][] families, final byte[] key, final byte[] value) {<a name="line.336"></a>
+<span class="sourceLineNo">337</span>    byte[] q = Bytes.toBytes("q");<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    Put put = new Put(key);<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    put.setDurability(Durability.SKIP_WAL);<a name="line.339"></a>
+<span class="sourceLineNo">340</span>    for (byte[] family: families) {<a name="line.340"></a>
+<span class="sourceLineNo">341</span>      put.addColumn(family, q, value);<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    }<a name="line.342"></a>
+<span class="sourceLineNo">343</span>    return put;<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>  // ==========================================================================<a name="line.346"></a>
-<span class="sourceLineNo">347</span>  public static long generateNonceGroup(final HMaster master) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    return master.getClusterConnection().getNonceGenerator().getNonceGroup();<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>  public static long generateNonce(final HMaster master) {<a name="line.351"></a>
-<span class="sourceLineNo">352</span>    return master.getClusterConnection().getNonceGenerator().newNonce();<a name="line.352"></a>
-<span class="sourceLineNo">353</span>  }<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span>  /**<a name="line.355"></a>
-<span class="sourceLineNo">356</span>   * Run through all procedure flow states TWICE while also restarting procedure executor at each<a name="line.356"></a>
-<span class="sourceLineNo">357</span>   * step; i.e force a reread of procedure store.<a name="line.357"></a>
-<span class="sourceLineNo">358</span>   *<a name="line.358"></a>
-<span class="sourceLineNo">359</span>   *&lt;p&gt;It does<a name="line.359"></a>
-<span class="sourceLineNo">360</span>   * &lt;ol&gt;&lt;li&gt;Execute step N - kill the executor before store update<a name="line.360"></a>
-<span class="sourceLineNo">361</span>   * &lt;li&gt;Restart executor/store<a name="line.361"></a>
-<span class="sourceLineNo">362</span>   * &lt;li&gt;Execute step N - and then save to store<a name="line.362"></a>
-<span class="sourceLineNo">363</span>   * &lt;/ol&gt;<a name="line.363"></a>
-<span class="sourceLineNo">364</span>   *<a name="line.364"></a>
-<span class="sourceLineNo">365</span>   *&lt;p&gt;This is a good test for finding state that needs persisting and steps that are not<a name="line.365"></a>
-<span class="sourceLineNo">366</span>   * idempotent. Use this version of the test when a procedure executes all flow steps from start to<a name="line.366"></a>
-<span class="sourceLineNo">367</span>   * finish.<a name="line.367"></a>
-<span class="sourceLineNo">368</span>   * @see #testRecoveryAndDoubleExecution(ProcedureExecutor, long)<a name="line.368"></a>
-<span class="sourceLineNo">369</span>   */<a name="line.369"></a>
-<span class="sourceLineNo">370</span>  public static void testRecoveryAndDoubleExecution(<a name="line.370"></a>
-<span class="sourceLineNo">371</span>      final ProcedureExecutor&lt;MasterProcedureEnv&gt; procExec, final long procId,<a name="line.371"></a>
-<span class="sourceLineNo">372</span>      final int numSteps, final boolean expectExecRunning) throws Exception {<a name="line.372"></a>
-<span class="sourceLineNo">373</span>    ProcedureTestingUtility.waitProcedure(procExec, procId);<a name="line.373"></a>
-<span class="sourceLineNo">374</span>    assertEquals(false, procExec.isRunning());<a name="line.374"></a>
-<span class="sourceLineNo">375</span><a name="line.375"></a>
-<span class="sourceLineNo">376</span>    // Restart the executor and execute the step twice<a name="line.376"></a>
-<span class="sourceLineNo">377</span>    //   execute step N - kill before store update<a name="line.377"></a>
-<span class="sourceLineNo">378</span>    //   restart executor/store<a name="line.378"></a>
-<span class="sourceLineNo">379</span>    //   execute step N - save on store<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    for (int i = 0; i &lt; numSteps; ++i) {<a name="line.380"></a>
-<span class="sourceLineNo">381</span>      LOG.info("Restart " + i + " exec state=" + procExec.getProcedure(procId));<a name="line.381"></a>
-<span class="sourceLineNo">382</span>      ProcedureTestingUtility.assertProcNotYetCompleted(procExec, procId);<a name="line.382"></a>
-<span class="sourceLineNo">383</span>      restartMasterProcedureExecutor(procExec);<a name="line.383"></a>
-<span class="sourceLineNo">384</span>      ProcedureTestingUtility.waitProcedure(procExec, procId);<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    }<a name="line.385"></a>
-<span class="sourceLineNo">386</span><a name="line.386"></a>
-<span class="sourceLineNo">387</span>    assertEquals(expectExecRunning, procExec.isRunning());<a name="line.387"></a>
-<span class="sourceLineNo">388</span>  }<a name="line.388"></a>
-<span class="sourceLineNo">389</span><a name="line.389"></a>
-<span class="sourceLineNo">390</span>  /**<a name="line.390"></a>
-<span class="sourceLineNo">391</span>   * Run through all procedure flow states TWICE while also restarting<a name="line.391"></a>
-<span class="sourceLineNo">392</span>   * procedure executor at each step; i.e force a reread of procedure store.<a name="line.392"></a>
-<span class="sourceLineNo">393</span>   *<a name="line.393"></a>
-<span class="sourceLineNo">394</span>   *&lt;p&gt;It does<a name="line.394"></a>
-<span class="sourceLineNo">395</span>   * &lt;ol&gt;&lt;li&gt;Execute step N - kill the executor before store update<a name="line.395"></a>
-<span class="sourceLineNo">396</span>   * &lt;li&gt;Restart executor/store<a name="line.396"></a>
-<span class="sourceLineNo">397</span>   * &lt;li&gt;Execute step N - and then save to store<a name="line.397"></a>
-<span class="sourceLineNo">398</span>   * &lt;/ol&gt;<a name="line.398"></a>
-<span class="sourceLineNo">399</span>   *<a name="line.399"></a>
-<span class="sourceLineNo">400</span>   *&lt;p&gt;This is a good test for finding state that needs persisting and steps that are not<a name="line.400"></a>
-<span class="sourceLineNo">401</span>   * idempotent. Use this version of the test when the order in which flow steps are executed is<a name="line.401"></a>
-<span class="sourceLineNo">402</span>   * not start to finish; where the procedure may vary the flow steps dependent on circumstance<a name="line.402"></a>
-<span class="sourceLineNo">403</span>   * found.<a name="line.403"></a>
-<span class="sourceLineNo">404</span>   * @see #testRecoveryAndDoubleExecution(ProcedureExecutor, long, int, boolean)<a name="line.404"></a>
-<span class="sourceLineNo">405</span>   */<a name="line.405"></a>
-<span class="sourceLineNo">406</span>  public static void testRecoveryAndDoubleExecution(<a name="line.406"></a>
-<span class="sourceLineNo">407</span>      final ProcedureExecutor&lt;MasterProcedureEnv&gt; procExec, final long procId) throws Exception {<a name="line.407"></a>
-<span class="sourceLineNo">408</span>    ProcedureTestingUtility.waitProcedure(procExec, procId);<a name="line.408"></a>
-<span class="sourceLineNo">409</span>    assertEquals(false, procExec.isRunning());<a name="line.409"></a>
-<span class="sourceLineNo">410</span>    for (int i = 0; !procExec.isFinished(procId); ++i) {<a name="line.410"></a>
-<span class="sourceLineNo">411</span>      LOG.info("Restart " + i + " exec state=" + procExec.getProcedure(procId));<a name="line.411"></a>
-<span class="sourceLineNo">412</span>      restartMasterProcedureExecutor(procExec);<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      ProcedureTestingUtility.waitProcedure(procExec, procId);<a name="line.413"></a>
-<span class="sourceLineNo">414</span>    }<a name="line.414"></a>
-<span class="sourceLineNo">415</span>    assertEquals(true, procExec.isRunning());<a name="line.415"></a>
-<span class="sourceLineNo">416</span>    ProcedureTestingUtility.assertProcNotFailed(procExec, procId);<a name="line.416"></a>
-<span class="sourceLineNo">417</span>  }<a name="line.417"></a>
-<span class="sourceLineNo">418</span><a name="line.418"></a>
-<span class="sourceLineNo">419</span>  /**<a name="line.419"></a>
-<span class="sourceLineNo">420</span>   * Execute the procedure up to "lastStep" and then the ProcedureExecutor<a name="line.420"></a>
-<span class="sourceLineNo">421</span>   * is restarted and an abort() is injected.<a name="line.421"></a>
-<span class="sourceLineNo">422</span>   * If the procedure implement abort() this should result in rollback being triggered.<a name="line.422"></a>
-<span class="sourceLineNo">423</span>   * Each rollback step is called twice, by restarting the executor after every step.<a name="line.423"></a>
-<span class="sourceLineNo">424</span>   * At the end of this call the procedure should be finished and rolledback.<a name="line.424"></a>
-<span class="sourceLineNo">425</span>   * This method assert on the procedure being terminated with an AbortException.<a name="line.425"></a>
-<span class="sourceLineNo">426</span>   */<a name="line.426"></a>
-<span class="sourceLineNo">427</span>  public static void testRollbackAndDoubleExecution(<a name="line.427"></a>
-<span class="sourceLineNo">428</span>      final ProcedureExecutor&lt;MasterProcedureEnv&gt; procExec, final long procId,<a name="line.428"></a>
-<span class="sourceLineNo">429</span>      final int lastStep) throws Exception {<a name="line.429"></a>
-<span class="sourceLineNo">430</span>    testRollbackAndDoubleExecution(procExec, procId, lastStep, false);<a name="line.430"></a>
-<span class="sourceLineNo">431</span>  }<a name="line.431"></a>
-<span class="sourceLineNo">432</span><a name="line.432"></a>
-<span class="sourceLineNo">433</span>  public static void testRollbackAndDoubleExecution(<a name="line.433"></a>
-<span class="sourceLineNo">434</span>      final ProcedureExecutor&lt;MasterProcedureEnv&gt; procExec, final long procId,<a name="line.434"></a>
-<span class="sourceLineNo">435</span>      final int lastStep, boolean waitForAsyncProcs) throws Exception {<a name="line.435"></a>
-<span class="sourceLineNo">436</span>    // Execute up to last step<a name="line.436"></a>
-<span class="sourceLineNo">437</span>    testRecoveryAndDoubleExecution(procExec, procId, lastStep, false);<a name="line.437"></a>
-<span class="sourceLineNo">438</span><a name="line.438"></a>
-<span class="sourceLineNo">439</span>    // Restart the executor and rollback the step twice<a name="line.439"></a>
-<span class="sourceLineNo">440</span>    //   rollback step N - kill before store update<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    //   restart executor/store<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    //   rollback step N - save on store<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    InjectAbortOnLoadListener abortListener = new InjectAbortOnLoadListener(procExec);<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    abortListener.addProcId(procId);<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    procExec.registerListener(abortListener);<a name="line.445"></a>
-<span class="sourceLineNo">446</span>    try {<a name="line.446"></a>
-<span class="sourceLineNo">447</span>      for (int i = 0; !procExec.isFinished(procId); ++i) {<a name="line.447"></a>
-<span class="sourceLineNo">448</span>        LOG.info("Restart " + i + " rollback state: " + procExec.getProcedure(procId));<a name="line.448"></a>
-<span class="sourceLineNo">449</span>        ProcedureTestingUtility.assertProcNotYetCompleted(procExec, procId);<a name="line.449"></a>
-<span class="sourceLineNo">450</span>        restartMasterProcedureExecutor(procExec);<a name="line.450"></a>
-<span class="sourceLineNo">451</span>        ProcedureTestingUtility.waitProcedure(procExec, procId);<a name="line.451"></a>
-<span class="sourceLineNo">452</span>      }<a name="line.452"></a>
-<span class="sourceLineNo">453</span>    } finally {<a name="line.453"></a>
-<span class="sourceLineNo">454</span>      assertTrue(procExec.unregisterListener(abortListener));<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    }<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span>    if (waitForAsyncProcs) {<a name="line.457"></a>
-<span class="sourceLineNo">458</span>      // Sometimes there are other procedures still executing (including asynchronously spawned by<a name="line.458"></a>
-<span class="sourceLineNo">459</span>      // procId) and due to KillAndToggleBeforeStoreUpdate flag ProcedureExecutor is stopped before<a name="line.459"></a>
-<span class="sourceLineNo">460</span>      // store update. Let all pending procedures finish normally.<a name="line.460"></a>
-<span class="sourceLineNo">461</span>      if (!procExec.isRunning()) {<a name="line.461"></a>
-<span class="sourceLineNo">462</span>        LOG.warn("ProcedureExecutor not running, may have been stopped by pending procedure due to"<a name="line.462"></a>
-<span class="sourceLineNo">463</span>            + " KillAndToggleBeforeStoreUpdate flag.");<a name="line.463"></a>
-<span class="sourceLineNo">464</span>        ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, false);<a name="line.464"></a>
-<span class="sourceLineNo">465</span>        restartMasterProcedureExecutor(procExec);<a name="line.465"></a>
-<span class="sourceLineNo">466</span>        ProcedureTestingUtility.waitNoProcedureRunning(procExec);<a name="line.466"></a>
-<span class="sourceLineNo">467</span>      }<a name="line.467"></a>
-<span class="sourceLineNo">468</span>    }<a name="line.468"></a>
-<span class="sourceLineNo">469</span><a name="line.469"></a>
-<span class="sourceLineNo">470</span>    assertEquals(true, procExec.isRunning());<a name="line.470"></a>
-<span class="sourceLineNo">471</span>    ProcedureTestingUtility.assertIsAbortException(procExec.getResult(procId));<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>  /**<a name="line.474"></a>
-<span class="sourceLineNo">475</span>   * Execute the procedure up to "lastStep" and then the ProcedureExecutor<a name="line.475"></a>
-<span class="sourceLineNo">476</span>   * is restarted and an abort() is injected.<a name="line.476"></a>
-<span class="sourceLineNo">477</span>   * If the procedure implement abort() this should result in rollback being triggered.<a name="line.477"></a>
-<span class="sourceLineNo">478</span>   * At the end of this call the procedure should be finished and rolledback.<a name="line.478"></a>
-<span class="sourceLineNo">479</span>   * This method assert on the procedure being terminated with an AbortException.<a name="line.479"></a>
-<span class="sourceLineNo">480</span>   */<a name="line.480"></a>
-<span class="sourceLineNo">481</span>  public static void testRollbackRetriableFailure(<a name="line.481"></a>
-<span class="sourceLineNo">482</span>      final ProcedureExecutor&lt;MasterProcedureEnv&gt; procExec, final long procId,<a name="line.482"></a>
-<span class="sourceLineNo">483</span>      final int lastStep) throws Exception {<a name="line.483"></a>
-<span class="sourceLineNo">484</span>    // Execute up to last step<a name="line.484"></a>
-<span class="sourceLineNo">485</span>    testRecoveryAndDoubleExecution(procExec, procId, lastStep, false);<a name="line.485"></a>
-<span class="sourceLineNo">486</span><a name="line.486"></a>
-<span class="sourceLineNo">487</span>    // execute the rollback<a name="line.487"></a>
-<span class="sourceLineNo">488</span>    testRestartWithAbort(procExec, procId);<a name="line.488"></a>
-<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span>    assertEquals(true, procExec.isRunning());<a name="line.490"></a>
-<span class="sourceLineNo">491</span>    ProcedureTestingUtility.assertIsAbortException(procExec.getResult(procId));<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>  /**<a name="line.494"></a>
-<span class="sourceLineNo">495</span>   * Restart the ProcedureExecutor and inject an abort to the specified procedure.<a name="line.495"></a>
+<span class="sourceLineNo">347</span>  //  Procedure Helpers<a name="line.347"></a>
+<span class="sourceLineNo">348</span>  // ==========================================================================<a name="line.348"></a>
+<span class="sourceLineNo">349</span>  public static long generateNonceGroup(final HMaster master) {<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    return master.getClusterConnection().getNonceGenerator().getNonceGroup();<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>  public static long generateNonce(final HMaster master) {<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    return master.getClusterConnection().getNonceGenerator().newNonce();<a name="line.354"></a>
+<span class="sourceLineNo">355</span>  }<a name="line.355"></a>
+<span class="sourceLineNo">356</span><a name="line.356"></a>
+<span class="sourceLineNo">357</span>  /**<a name="line.357"></a>
+<span class="sourceLineNo">358</span>   * Run through all procedure flow states TWICE while also restarting procedure executor at each<a name="line.358"></a>
+<span class="sourceLineNo">359</span>   * step; i.e force a reread of procedure store.<a name="line.359"></a>
+<span class="sourceLineNo">360</span>   *<a name="line.360"></a>
+<span class="sourceLineNo">361</span>   *&lt;p&gt;It does<a name="line.361"></a>
+<span class="sourceLineNo">362</span>   * &lt;ol&gt;&lt;li&gt;Execute step N - kill the executor before store update<a name="line.362"></a>
+<span class="sourceLineNo">363</span>   * &lt;li&gt;Restart executor/store<a name="line.363"></a>
+<span class="sourceLineNo">364</span>   * &lt;li&gt;Execute step N - and then save to store<a name="line.364"></a>
+<span class="sourceLineNo">365</span>   * &lt;/ol&gt;<a name="line.365"></a>
+<span class="sourceLineNo">366</span>   *<a name="line.366"></a>
+<span class="sourceLineNo">367</span>   *&lt;p&gt;This is a good test for finding state that needs persisting and steps that are not<a name="line.367"></a>
+<span class="sourceLineNo">368</span>   * idempotent. Use this version of the test when a procedure executes all flow steps from start to<a name="line.368"></a>
+<span class="sourceLineNo">369</span>   * finish.<a name="line.369"></a>
+<span class="sourceLineNo">370</span>   * @see #testRecoveryAndDoubleExecution(ProcedureExecutor, long)<a name="line.370"></a>
+<span class="sourceLineNo">371</span>   */<a name="line.371"></a>
+<span class="sourceLineNo">372</span>  public static void testRecoveryAndDoubleExecution(<a name="line.372"></a>
+<span class="sourceLineNo">373</span>      final ProcedureExecutor&lt;MasterProcedureEnv&gt; procExec, final long procId,<a name="line.373"></a>
+<span class="sourceLineNo">374</span>      final int numSteps, final boolean expectExecRunning) throws Exception {<a name="line.374"></a>
+<span class="sourceLineNo">375</span>    ProcedureTestingUtility.waitProcedure(procExec, procId);<a name="line.375"></a>
+<span class="sourceLineNo">376</span>    assertEquals(false, procExec.isRunning());<a name="line.376"></a>
+<span class="sourceLineNo">377</span><a name="line.377"></a>
+<span class="sourceLineNo">378</span>    // Restart the executor and execute the step twice<a name="line.378"></a>
+<span class="sourceLineNo">379</span>    //   execute step N - kill before store update<a name="line.379"></a>
+<span class="sourceLineNo">380</span>    //   restart executor/store<a name="line.380"></a>
+<span class="sourceLineNo">381</span>    //   execute step N - save on store<a name="line.381"></a>
+<span class="sourceLineNo">382</span>    // NOTE: currently we make assumption that states/ steps are sequential. There are already<a name="line.382"></a>
+<span class="sourceLineNo">383</span>    // instances of a procedures which skip (don't use) intermediate states/ steps. In future,<a name="line.383"></a>
+<span class="sourceLineNo">384</span>    // intermediate states/ steps can be added with ordinal greater than lastStep. If and when<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    // that happens the states can not be treated as sequential steps and the condition in<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    // following while loop needs to be changed. We can use euqals/ not equals operator to check<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    // if the procedure has reached the user specified state. But there is a possibility that<a name="line.387"></a>
+<span class="sourceLineNo">388</span>    // while loop may not get the control back exaclty when the procedure is in lastStep. Proper<a name="line.388"></a>
+<span class="sourceLineNo">389</span>    // fix would be get all visited states by the procedure and then check if user speccified<a name="line.389"></a>
+<span class="sourceLineNo">390</span>    // state is in that list. Current assumption of sequential proregression of steps/ states is<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    // made at multiple places so we can keep while condition below for simplicity.<a name="line.391"></a>
+<span class="sourceLineNo">392</span>    Procedure proc = procExec.getProcedure(procId);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    int stepNum = proc instanceof StateMachineProcedure ?<a name="line.393"></a>
+<span class="sourceLineNo">394</span>        ((StateMachineProcedure) proc).getCurrentStateId() : 0;<a name="line.394"></a>
+<span class="sourceLineNo">395</span>    while (stepNum &lt; numSteps) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span>      LOG.info("Restart " + stepNum + " exec state=" + proc);<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      ProcedureTestingUtility.assertProcNotYetCompleted(procExec, procId);<a name="line.397"></a>
+<span class="sourceLineNo">398</span>      restartMasterProcedureExecutor(procExec);<a name="line.398"></a>
+<span class="sourceLineNo">399</span>      ProcedureTestingUtility.waitProcedure(procExec, procId);<a name="line.399"></a>
+<span class="sourceLineNo">400</span>      // Old proc object is stale, need to get the new one after ProcedureExecutor restart<a name="line.400"></a>
+<span class="sourceLineNo">401</span>      proc = procExec.getProcedure(procId);<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      stepNum = proc instanceof StateMachineProcedure ?<a name="line.402"></a>
+<span class="sourceLineNo">403</span>          ((StateMachineProcedure) proc).getCurrentStateId() : stepNum + 1;<a name="line.403"></a>
+<span class="sourceLineNo">404</span>    }<a name="line.404"></a>
+<span class="sourceLineNo">405</span><a name="line.405"></a>
+<span class="sourceLineNo">406</span>    assertEquals(expectExecRunning, procExec.isRunning());<a name="line.406"></a>
+<span class="sourceLineNo">407</span>  }<a name="line.407"></a>
+<span class="sourceLineNo">408</span><a name="line.408"></a>
+<span class="sourceLineNo">409</span>  /**<a name="line.409"></a>
+<span class="sourceLineNo">410</span>   * Run through all procedure flow states TWICE while also restarting<a name="line.410"></a>
+<span class="sourceLineNo">411</span>   * procedure executor at each step; i.e force a reread of procedure store.<a name="line.411"></a>
+<span class="sourceLineNo">412</span>   *<a name="line.412"></a>
+<span class="sourceLineNo">413</span>   *&lt;p&gt;It does<a name="line.413"></a>
+<span class="sourceLineNo">414</span>   * &lt;ol&gt;&lt;li&gt;Execute step N - kill the executor before store update<a name="line.414"></a>
+<span class="sourceLineNo">415</span>   * &lt;li&gt;Restart executor/store<a name="line.415"></a>
+<span class="sourceLineNo">416</span>   * &lt;li&gt;Execute step N - and then save to store<a name="line.416"></a>
+<span class="sourceLineNo">417</span>   * &lt;/ol&gt;<a name="line.417"></a>
+<span class="sourceLineNo">418</span>   *<a name="line.418"></a>
+<span class="sourceLineNo">419</span>   *&lt;p&gt;This is a good test for finding state that needs persisting and steps that are not<a name="line.419"></a>
+<span class="sourceLineNo">420</span>   * idempotent. Use this version of the test when the order in which flow steps are executed is<a name="line.420"></a>
+<span class="sourceLineNo">421</span>   * not start to finish; where the procedure may vary the flow steps dependent on circumstance<a name="line.421"></a>
+<span class="sourceLineNo">422</span>   * found.<a name="line.422"></a>
+<span class="sourceLineNo">423</span>   * @see #testRecoveryAndDoubleExecution(ProcedureExecutor, long, int, boolean)<a name="line.423"></a>
+<span class="sourceLineNo">424</span>   */<a name="line.424"></a>
+<span class="sourceLineNo">425</span>  public static void testRecoveryAndDoubleExecution(<a name="line.425"></a>
+<span class="sourceLineNo">426</span>      final ProcedureExecutor&lt;MasterProcedureEnv&gt; procExec, final long procId) throws Exception {<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    ProcedureTestingUtility.waitProcedure(procExec, procId);<a name="line.427"></a>
+<span class="sourceLineNo">428</span>    assertEquals(false, procExec.isRunning());<a name="line.428"></a>
+<span class="sourceLineNo">429</span>    for (int i = 0; !procExec.isFinished(procId); ++i) {<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      LOG.info("Restart " + i + " exec state=" + procExec.getProcedure(procId));<a name="line.430"></a>
+<span class="sourceLineNo">431</span>      restartMasterProcedureExecutor(procExec);<a name="line.431"></a>
+<span class="sourceLineNo">432</span>      ProcedureTestingUtility.waitProcedure(procExec, procId);<a name="line.432"></a>
+<span class="sourceLineNo">433</span>    }<a name="line.433"></a>
+<span class="sourceLineNo">434</span>    assertEquals(true, procExec.isRunning());<a name="line.434"></a>
+<span class="sourceLineNo">435</span>    ProcedureTestingUtility.assertProcNotFailed(procExec, procId);<a name="line.435"></a>
+<span class="sourceLineNo">436</span>  }<a name="line.436"></a>
+<span class="sourceLineNo">437</span><a name="line.437"></a>
+<span class="sourceLineNo">438</span>  /**<a name="line.438"></a>
+<span class="sourceLineNo">439</span>   * Execute the procedure up to "lastStep" and then the ProcedureExecutor<a name="line.439"></a>
+<span class="sourceLineNo">440</span>   * is restarted and an abort() is injected.<a name="line.440"></a>
+<span class="sourceLineNo">441</span>   * If the procedure implement abort() this should result in rollback being triggered.<a name="line.441"></a>
+<span class="sourceLineNo">442</span>   * Each rollback step is called twice, by restarting the executor after every step.<a name="line.442"></a>
+<span class="sourceLineNo">443</span>   * At the end of this call the procedure should be finished and rolledback.<a name="line.443"></a>
+<span class="sourceLineNo">444</span>   * This method assert on the procedure being terminated with an AbortException.<a name="line.444"></a>
+<span class="sourceLineNo">445</span>   */<a name="line.445"></a>
+<span class="sourceLineNo">446</span>  public static void testRollbackAndDoubleExecution(<a name="line.446"></a>
+<span class="sourceLineNo">447</span>      final ProcedureExecutor&lt;MasterProcedureEnv&gt; procExec, final long procId,<a name="line.447"></a>
+<span class="sourceLineNo">448</span>      final int lastStep) throws Exception {<a name="line.448"></a>
+<span class="sourceLineNo">449</span>    testRollbackAndDoubleExecution(procExec, procId, lastStep, false);<a name="line.449"></a>
+<span class="sourceLineNo">450</span>  }<a name="line.450"></a>
+<span class="sourceLineNo">451</span><a name="line.451"></a>
+<span class="sourceLineNo">452</span>  public static void testRollbackAndDoubleExecution(<a name="line.452"></a>
+<span class="sourceLineNo">453</span>      final ProcedureExecutor&lt;MasterProcedureEnv&gt; procExec, final long procId,<a name="line.453"></a>
+<span class="sourceLineNo">454</span>      final int lastStep, boolean waitForAsyncProcs) throws Exception {<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    // Execute up to last step<a name="line.455"></a>
+<span class="sourceLineNo">456</span>    testRecoveryAndDoubleExecution(procExec, procId, lastStep, false);<a name="line.456"></a>
+<span class="sourceLineNo">457</span><a name="line.457"></a>
+<span class="sourceLineNo">458</span>    // Restart the executor and rollback the step twice<a name="line.458"></a>
+<span class="sourceLineNo">459</span>    //   rollback step N - kill before store update<a name="line.459"></a>
+<span class="source

<TRUNCATED>

Mime
View raw message