You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/10/16 14:54:25 UTC
[04/51] [partial] hbase-site git commit: Published site at
821e4d7de2d576189f4288d1c2acf9e9a9471f5c.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/323b17d9/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TestModifyTableProcedure.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TestModifyTableProcedure.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TestModifyTableProcedure.html
index ad8e4a5..ec3e399 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TestModifyTableProcedure.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TestModifyTableProcedure.html
@@ -30,385 +30,383 @@
<span class="sourceLineNo">022</span>import static org.junit.Assert.assertTrue;<a name="line.22"></a>
<span class="sourceLineNo">023</span><a name="line.23"></a>
<span class="sourceLineNo">024</span>import java.io.IOException;<a name="line.24"></a>
-<span class="sourceLineNo">025</span><a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.DoNotRetryIOException;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.InvalidFamilyOperationException;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.TableName;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.client.PerClientRandomNonceGenerator;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.client.TableDescriptor;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.client.TableDescriptorBuilder;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.master.procedure.MasterProcedureTestingUtility.StepHook;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.procedure2.Procedure;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.util.NonceKey;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.junit.Assert;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.junit.ClassRule;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.junit.Rule;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.junit.Test;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.junit.experimental.categories.Category;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.junit.rules.TestName;<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>@Category({MasterTests.class, MediumTests.class})<a name="line.52"></a>
-<span class="sourceLineNo">053</span>public class TestModifyTableProcedure extends TestTableDDLProcedureBase {<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span> @ClassRule<a name="line.55"></a>
-<span class="sourceLineNo">056</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.56"></a>
-<span class="sourceLineNo">057</span> HBaseClassTestRule.forClass(TestModifyTableProcedure.class);<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span> @Rule public TestName name = new TestName();<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span> @Test<a name="line.61"></a>
-<span class="sourceLineNo">062</span> public void testModifyTable() throws Exception {<a name="line.62"></a>
-<span class="sourceLineNo">063</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.63"></a>
-<span class="sourceLineNo">064</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span> MasterProcedureTestingUtility.createTable(procExec, tableName, null, "cf");<a name="line.66"></a>
-<span class="sourceLineNo">067</span> UTIL.getAdmin().disableTable(tableName);<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span> // Modify the table descriptor<a name="line.69"></a>
-<span class="sourceLineNo">070</span> HTableDescriptor htd = new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span> // Test 1: Modify 1 property<a name="line.72"></a>
-<span class="sourceLineNo">073</span> long newMaxFileSize = htd.getMaxFileSize() * 2;<a name="line.73"></a>
-<span class="sourceLineNo">074</span> htd.setMaxFileSize(newMaxFileSize);<a name="line.74"></a>
-<span class="sourceLineNo">075</span> htd.setRegionReplication(3);<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span> long procId1 = ProcedureTestingUtility.submitAndWait(<a name="line.77"></a>
-<span class="sourceLineNo">078</span> procExec, new ModifyTableProcedure(procExec.getEnvironment(), htd));<a name="line.78"></a>
-<span class="sourceLineNo">079</span> ProcedureTestingUtility.assertProcNotFailed(procExec.getResult(procId1));<a name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span> HTableDescriptor currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);<a name="line.81"></a>
-<span class="sourceLineNo">082</span> assertEquals(newMaxFileSize, currentHtd.getMaxFileSize());<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span> // Test 2: Modify multiple properties<a name="line.84"></a>
-<span class="sourceLineNo">085</span> boolean newReadOnlyOption = htd.isReadOnly() ? false : true;<a name="line.85"></a>
-<span class="sourceLineNo">086</span> long newMemStoreFlushSize = htd.getMemStoreFlushSize() * 2;<a name="line.86"></a>
-<span class="sourceLineNo">087</span> htd.setReadOnly(newReadOnlyOption);<a name="line.87"></a>
-<span class="sourceLineNo">088</span> htd.setMemStoreFlushSize(newMemStoreFlushSize);<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span> long procId2 = ProcedureTestingUtility.submitAndWait(<a name="line.90"></a>
-<span class="sourceLineNo">091</span> procExec, new ModifyTableProcedure(procExec.getEnvironment(), htd));<a name="line.91"></a>
-<span class="sourceLineNo">092</span> ProcedureTestingUtility.assertProcNotFailed(procExec.getResult(procId2));<a name="line.92"></a>
-<span class="sourceLineNo">093</span><a name="line.93"></a>
-<span class="sourceLineNo">094</span> currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);<a name="line.94"></a>
-<span class="sourceLineNo">095</span> assertEquals(newReadOnlyOption, currentHtd.isReadOnly());<a name="line.95"></a>
-<span class="sourceLineNo">096</span> assertEquals(newMemStoreFlushSize, currentHtd.getMemStoreFlushSize());<a name="line.96"></a>
-<span class="sourceLineNo">097</span> }<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span> @Test<a name="line.99"></a>
-<span class="sourceLineNo">100</span> public void testModifyTableAddCF() throws Exception {<a name="line.100"></a>
-<span class="sourceLineNo">101</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.101"></a>
-<span class="sourceLineNo">102</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.102"></a>
-<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span> MasterProcedureTestingUtility.createTable(procExec, tableName, null, "cf1");<a name="line.104"></a>
-<span class="sourceLineNo">105</span> HTableDescriptor currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);<a name="line.105"></a>
-<span class="sourceLineNo">106</span> assertEquals(1, currentHtd.getFamiliesKeys().size());<a name="line.106"></a>
-<span class="sourceLineNo">107</span><a name="line.107"></a>
-<span class="sourceLineNo">108</span> // Test 1: Modify the table descriptor online<a name="line.108"></a>
-<span class="sourceLineNo">109</span> String cf2 = "cf2";<a name="line.109"></a>
-<span class="sourceLineNo">110</span> HTableDescriptor htd = new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));<a name="line.110"></a>
-<span class="sourceLineNo">111</span> htd.addFamily(new HColumnDescriptor(cf2));<a name="line.111"></a>
-<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span> long procId = ProcedureTestingUtility.submitAndWait(<a name="line.113"></a>
-<span class="sourceLineNo">114</span> procExec, new ModifyTableProcedure(procExec.getEnvironment(), htd));<a name="line.114"></a>
-<span class="sourceLineNo">115</span> ProcedureTestingUtility.assertProcNotFailed(procExec.getResult(procId));<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span> currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);<a name="line.117"></a>
-<span class="sourceLineNo">118</span> assertEquals(2, currentHtd.getFamiliesKeys().size());<a name="line.118"></a>
-<span class="sourceLineNo">119</span> assertTrue(currentHtd.hasFamily(Bytes.toBytes(cf2)));<a name="line.119"></a>
-<span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span> // Test 2: Modify the table descriptor offline<a name="line.121"></a>
-<span class="sourceLineNo">122</span> UTIL.getAdmin().disableTable(tableName);<a name="line.122"></a>
-<span class="sourceLineNo">123</span> ProcedureTestingUtility.waitNoProcedureRunning(procExec);<a name="line.123"></a>
-<span class="sourceLineNo">124</span> String cf3 = "cf3";<a name="line.124"></a>
-<span class="sourceLineNo">125</span> HTableDescriptor htd2 =<a name="line.125"></a>
-<span class="sourceLineNo">126</span> new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));<a name="line.126"></a>
-<span class="sourceLineNo">127</span> htd2.addFamily(new HColumnDescriptor(cf3));<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span> long procId2 =<a name="line.129"></a>
-<span class="sourceLineNo">130</span> ProcedureTestingUtility.submitAndWait(procExec,<a name="line.130"></a>
-<span class="sourceLineNo">131</span> new ModifyTableProcedure(procExec.getEnvironment(), htd2));<a name="line.131"></a>
-<span class="sourceLineNo">132</span> ProcedureTestingUtility.assertProcNotFailed(procExec.getResult(procId2));<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span> currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);<a name="line.134"></a>
-<span class="sourceLineNo">135</span> assertTrue(currentHtd.hasFamily(Bytes.toBytes(cf3)));<a name="line.135"></a>
-<span class="sourceLineNo">136</span> assertEquals(3, currentHtd.getFamiliesKeys().size());<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> @Test<a name="line.139"></a>
-<span class="sourceLineNo">140</span> public void testModifyTableDeleteCF() throws Exception {<a name="line.140"></a>
-<span class="sourceLineNo">141</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.141"></a>
-<span class="sourceLineNo">142</span> final String cf1 = "cf1";<a name="line.142"></a>
-<span class="sourceLineNo">143</span> final String cf2 = "cf2";<a name="line.143"></a>
-<span class="sourceLineNo">144</span> final String cf3 = "cf3";<a name="line.144"></a>
-<span class="sourceLineNo">145</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span> MasterProcedureTestingUtility.createTable(procExec, tableName, null, cf1, cf2, cf3);<a name="line.147"></a>
-<span class="sourceLineNo">148</span> HTableDescriptor currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);<a name="line.148"></a>
-<span class="sourceLineNo">149</span> assertEquals(3, currentHtd.getFamiliesKeys().size());<a name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span> // Test 1: Modify the table descriptor<a name="line.151"></a>
-<span class="sourceLineNo">152</span> HTableDescriptor htd = new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));<a name="line.152"></a>
-<span class="sourceLineNo">153</span> htd.removeFamily(Bytes.toBytes(cf2));<a name="line.153"></a>
-<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span> long procId = ProcedureTestingUtility.submitAndWait(<a name="line.155"></a>
-<span class="sourceLineNo">156</span> procExec, new ModifyTableProcedure(procExec.getEnvironment(), htd));<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><a name="line.158"></a>
-<span class="sourceLineNo">159</span> currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);<a name="line.159"></a>
-<span class="sourceLineNo">160</span> assertEquals(2, currentHtd.getFamiliesKeys().size());<a name="line.160"></a>
-<span class="sourceLineNo">161</span> assertFalse(currentHtd.hasFamily(Bytes.toBytes(cf2)));<a name="line.161"></a>
-<span class="sourceLineNo">162</span><a name="line.162"></a>
-<span class="sourceLineNo">163</span> // Test 2: Modify the table descriptor offline<a name="line.163"></a>
-<span class="sourceLineNo">164</span> UTIL.getAdmin().disableTable(tableName);<a name="line.164"></a>
-<span class="sourceLineNo">165</span> ProcedureTestingUtility.waitNoProcedureRunning(procExec);<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span> HTableDescriptor htd2 =<a name="line.167"></a>
-<span class="sourceLineNo">168</span> new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));<a name="line.168"></a>
-<span class="sourceLineNo">169</span> htd2.removeFamily(Bytes.toBytes(cf3));<a name="line.169"></a>
-<span class="sourceLineNo">170</span> // Disable Sanity check<a name="line.170"></a>
-<span class="sourceLineNo">171</span> htd2.setConfiguration("hbase.table.sanity.checks", Boolean.FALSE.toString());<a name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span> long procId2 =<a name="line.173"></a>
-<span class="sourceLineNo">174</span> ProcedureTestingUtility.submitAndWait(procExec,<a name="line.174"></a>
-<span class="sourceLineNo">175</span> new ModifyTableProcedure(procExec.getEnvironment(), htd2));<a name="line.175"></a>
-<span class="sourceLineNo">176</span> ProcedureTestingUtility.assertProcNotFailed(procExec.getResult(procId2));<a name="line.176"></a>
-<span class="sourceLineNo">177</span><a name="line.177"></a>
-<span class="sourceLineNo">178</span> currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);<a name="line.178"></a>
-<span class="sourceLineNo">179</span> assertEquals(1, currentHtd.getFamiliesKeys().size());<a name="line.179"></a>
-<span class="sourceLineNo">180</span> assertFalse(currentHtd.hasFamily(Bytes.toBytes(cf3)));<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span> //Removing the last family will fail<a name="line.182"></a>
-<span class="sourceLineNo">183</span> HTableDescriptor htd3 =<a name="line.183"></a>
-<span class="sourceLineNo">184</span> new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));<a name="line.184"></a>
-<span class="sourceLineNo">185</span> htd3.removeFamily(Bytes.toBytes(cf1));<a name="line.185"></a>
-<span class="sourceLineNo">186</span> long procId3 =<a name="line.186"></a>
-<span class="sourceLineNo">187</span> ProcedureTestingUtility.submitAndWait(procExec,<a name="line.187"></a>
-<span class="sourceLineNo">188</span> new ModifyTableProcedure(procExec.getEnvironment(), htd3));<a name="line.188"></a>
-<span class="sourceLineNo">189</span> final Procedure<?> result = procExec.getResult(procId3);<a name="line.189"></a>
-<span class="sourceLineNo">190</span> assertEquals(true, result.isFailed());<a name="line.190"></a>
-<span class="sourceLineNo">191</span> Throwable cause = ProcedureTestingUtility.getExceptionCause(result);<a name="line.191"></a>
-<span class="sourceLineNo">192</span> assertTrue("expected DoNotRetryIOException, got " + cause,<a name="line.192"></a>
-<span class="sourceLineNo">193</span> cause instanceof DoNotRetryIOException);<a name="line.193"></a>
-<span class="sourceLineNo">194</span> assertEquals(1, currentHtd.getFamiliesKeys().size());<a name="line.194"></a>
-<span class="sourceLineNo">195</span> assertTrue(currentHtd.hasFamily(Bytes.toBytes(cf1)));<a name="line.195"></a>
-<span class="sourceLineNo">196</span> }<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span> @Test<a name="line.198"></a>
-<span class="sourceLineNo">199</span> public void testRecoveryAndDoubleExecutionOffline() throws Exception {<a name="line.199"></a>
-<span class="sourceLineNo">200</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.200"></a>
-<span class="sourceLineNo">201</span> final String cf2 = "cf2";<a name="line.201"></a>
-<span class="sourceLineNo">202</span> final String cf3 = "cf3";<a name="line.202"></a>
-<span class="sourceLineNo">203</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span> // create the table<a name="line.205"></a>
-<span class="sourceLineNo">206</span> RegionInfo[] regions = MasterProcedureTestingUtility.createTable(<a name="line.206"></a>
-<span class="sourceLineNo">207</span> procExec, tableName, null, "cf1", cf3);<a name="line.207"></a>
-<span class="sourceLineNo">208</span> UTIL.getAdmin().disableTable(tableName);<a name="line.208"></a>
-<span class="sourceLineNo">209</span><a name="line.209"></a>
-<span class="sourceLineNo">210</span> ProcedureTestingUtility.waitNoProcedureRunning(procExec);<a name="line.210"></a>
-<span class="sourceLineNo">211</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);<a name="line.211"></a>
-<span class="sourceLineNo">212</span><a name="line.212"></a>
-<span class="sourceLineNo">213</span> // Modify multiple properties of the table.<a name="line.213"></a>
-<span class="sourceLineNo">214</span> TableDescriptor oldDescriptor = UTIL.getAdmin().getDescriptor(tableName);<a name="line.214"></a>
-<span class="sourceLineNo">215</span> TableDescriptor newDescriptor = TableDescriptorBuilder.newBuilder(oldDescriptor)<a name="line.215"></a>
-<span class="sourceLineNo">216</span> .setCompactionEnabled(!oldDescriptor.isCompactionEnabled())<a name="line.216"></a>
-<span class="sourceLineNo">217</span> .setColumnFamily(ColumnFamilyDescriptorBuilder.of(cf2))<a name="line.217"></a>
-<span class="sourceLineNo">218</span> .removeColumnFamily(Bytes.toBytes(cf3))<a name="line.218"></a>
-<span class="sourceLineNo">219</span> .setRegionReplication(3)<a name="line.219"></a>
-<span class="sourceLineNo">220</span> .build();<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span> // Start the Modify procedure && kill the executor<a name="line.222"></a>
-<span class="sourceLineNo">223</span> long procId = procExec.submitProcedure(<a name="line.223"></a>
-<span class="sourceLineNo">224</span> new ModifyTableProcedure(procExec.getEnvironment(), newDescriptor));<a name="line.224"></a>
-<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span> // Restart the executor and execute the step twice<a name="line.226"></a>
-<span class="sourceLineNo">227</span> MasterProcedureTestingUtility.testRecoveryAndDoubleExecution(procExec, procId);<a name="line.227"></a>
-<span class="sourceLineNo">228</span><a name="line.228"></a>
-<span class="sourceLineNo">229</span> // Validate descriptor<a name="line.229"></a>
-<span class="sourceLineNo">230</span> TableDescriptor currentDescriptor = UTIL.getAdmin().getDescriptor(tableName);<a name="line.230"></a>
-<span class="sourceLineNo">231</span> assertEquals(newDescriptor.isCompactionEnabled(), currentDescriptor.isCompactionEnabled());<a name="line.231"></a>
-<span class="sourceLineNo">232</span> assertEquals(2, newDescriptor.getColumnFamilyNames().size());<a name="line.232"></a>
-<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span> // cf2 should be added cf3 should be removed<a name="line.234"></a>
-<span class="sourceLineNo">235</span> MasterProcedureTestingUtility.validateTableCreation(UTIL.getHBaseCluster().getMaster(),<a name="line.235"></a>
-<span class="sourceLineNo">236</span> tableName, regions, false, "cf1", cf2);<a name="line.236"></a>
-<span class="sourceLineNo">237</span> }<a name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span> @Test<a name="line.239"></a>
-<span class="sourceLineNo">240</span> public void testRecoveryAndDoubleExecutionOnline() throws Exception {<a name="line.240"></a>
-<span class="sourceLineNo">241</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.241"></a>
-<span class="sourceLineNo">242</span> final String cf2 = "cf2";<a name="line.242"></a>
-<span class="sourceLineNo">243</span> final String cf3 = "cf3";<a name="line.243"></a>
-<span class="sourceLineNo">244</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.244"></a>
-<span class="sourceLineNo">245</span><a name="line.245"></a>
-<span class="sourceLineNo">246</span> // create the table<a name="line.246"></a>
-<span class="sourceLineNo">247</span> RegionInfo[] regions = MasterProcedureTestingUtility.createTable(<a name="line.247"></a>
-<span class="sourceLineNo">248</span> procExec, tableName, null, "cf1", cf3);<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);<a name="line.250"></a>
-<span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span> // Modify multiple properties of the table.<a name="line.252"></a>
-<span class="sourceLineNo">253</span> HTableDescriptor htd = new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));<a name="line.253"></a>
-<span class="sourceLineNo">254</span> boolean newCompactionEnableOption = htd.isCompactionEnabled() ? false : true;<a name="line.254"></a>
-<span class="sourceLineNo">255</span> htd.setCompactionEnabled(newCompactionEnableOption);<a name="line.255"></a>
-<span class="sourceLineNo">256</span> htd.addFamily(new HColumnDescriptor(cf2));<a name="line.256"></a>
-<span class="sourceLineNo">257</span> htd.removeFamily(Bytes.toBytes(cf3));<a name="line.257"></a>
-<span class="sourceLineNo">258</span><a name="line.258"></a>
-<span class="sourceLineNo">259</span> // Start the Modify procedure && kill the executor<a name="line.259"></a>
-<span class="sourceLineNo">260</span> long procId = procExec.submitProcedure(<a name="line.260"></a>
-<span class="sourceLineNo">261</span> new ModifyTableProcedure(procExec.getEnvironment(), htd));<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span> // Restart the executor and execute the step twice<a name="line.263"></a>
-<span class="sourceLineNo">264</span> MasterProcedureTestingUtility.testRecoveryAndDoubleExecution(procExec, procId);<a name="line.264"></a>
-<span class="sourceLineNo">265</span><a name="line.265"></a>
-<span class="sourceLineNo">266</span> // Validate descriptor<a name="line.266"></a>
-<span class="sourceLineNo">267</span> HTableDescriptor currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);<a name="line.267"></a>
-<span class="sourceLineNo">268</span> assertEquals(newCompactionEnableOption, currentHtd.isCompactionEnabled());<a name="line.268"></a>
-<span class="sourceLineNo">269</span> assertEquals(2, currentHtd.getFamiliesKeys().size());<a name="line.269"></a>
-<span class="sourceLineNo">270</span> assertTrue(currentHtd.hasFamily(Bytes.toBytes(cf2)));<a name="line.270"></a>
-<span class="sourceLineNo">271</span> assertFalse(currentHtd.hasFamily(Bytes.toBytes(cf3)));<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span> // cf2 should be added cf3 should be removed<a name="line.273"></a>
-<span class="sourceLineNo">274</span> MasterProcedureTestingUtility.validateTableCreation(UTIL.getHBaseCluster().getMaster(),<a name="line.274"></a>
-<span class="sourceLineNo">275</span> tableName, regions, "cf1", cf2);<a name="line.275"></a>
-<span class="sourceLineNo">276</span> }<a name="line.276"></a>
-<span class="sourceLineNo">277</span><a name="line.277"></a>
-<span class="sourceLineNo">278</span> @Test<a name="line.278"></a>
-<span class="sourceLineNo">279</span> public void testColumnFamilyAdditionTwiceWithNonce() throws Exception {<a name="line.279"></a>
-<span class="sourceLineNo">280</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.280"></a>
-<span class="sourceLineNo">281</span> final String cf2 = "cf2";<a name="line.281"></a>
-<span class="sourceLineNo">282</span> final String cf3 = "cf3";<a name="line.282"></a>
-<span class="sourceLineNo">283</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span> // create the table<a name="line.285"></a>
-<span class="sourceLineNo">286</span> RegionInfo[] regions =<a name="line.286"></a>
-<span class="sourceLineNo">287</span> MasterProcedureTestingUtility.createTable(procExec, tableName, null, "cf1", cf3);<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);<a name="line.289"></a>
-<span class="sourceLineNo">290</span> // Modify multiple properties of the table.<a name="line.290"></a>
-<span class="sourceLineNo">291</span> final HTableDescriptor htd =<a name="line.291"></a>
-<span class="sourceLineNo">292</span> new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));<a name="line.292"></a>
-<span class="sourceLineNo">293</span> boolean newCompactionEnableOption = htd.isCompactionEnabled() ? false : true;<a name="line.293"></a>
-<span class="sourceLineNo">294</span> htd.setCompactionEnabled(newCompactionEnableOption);<a name="line.294"></a>
-<span class="sourceLineNo">295</span> htd.addFamily(new HColumnDescriptor(cf2));<a name="line.295"></a>
-<span class="sourceLineNo">296</span><a name="line.296"></a>
-<span class="sourceLineNo">297</span> PerClientRandomNonceGenerator nonceGenerator = PerClientRandomNonceGenerator.get();<a name="line.297"></a>
-<span class="sourceLineNo">298</span> long nonceGroup = nonceGenerator.getNonceGroup();<a name="line.298"></a>
-<span class="sourceLineNo">299</span> long newNonce = nonceGenerator.newNonce();<a name="line.299"></a>
-<span class="sourceLineNo">300</span> NonceKey nonceKey = new NonceKey(nonceGroup, newNonce);<a name="line.300"></a>
-<span class="sourceLineNo">301</span> procExec.registerNonce(nonceKey);<a name="line.301"></a>
-<span class="sourceLineNo">302</span><a name="line.302"></a>
-<span class="sourceLineNo">303</span> // Start the Modify procedure && kill the executor<a name="line.303"></a>
-<span class="sourceLineNo">304</span> final long procId = procExec<a name="line.304"></a>
-<span class="sourceLineNo">305</span> .submitProcedure(new ModifyTableProcedure(procExec.getEnvironment(), htd), nonceKey);<a name="line.305"></a>
-<span class="sourceLineNo">306</span><a name="line.306"></a>
-<span class="sourceLineNo">307</span> // Restart the executor after MODIFY_TABLE_UPDATE_TABLE_DESCRIPTOR and try to add column family<a name="line.307"></a>
-<span class="sourceLineNo">308</span> // as nonce are there , we should not fail<a name="line.308"></a>
-<span class="sourceLineNo">309</span> MasterProcedureTestingUtility.testRecoveryAndDoubleExecution(procExec, procId, new StepHook() {<a name="line.309"></a>
-<span class="sourceLineNo">310</span> @Override<a name="line.310"></a>
-<span class="sourceLineNo">311</span> public boolean execute(int step) throws IOException {<a name="line.311"></a>
-<span class="sourceLineNo">312</span> if (step == 3) {<a name="line.312"></a>
-<span class="sourceLineNo">313</span> return procId == UTIL.getHBaseCluster().getMaster().addColumn(tableName,<a name="line.313"></a>
-<span class="sourceLineNo">314</span> ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes(cf2)).build(), nonceGroup,<a name="line.314"></a>
-<span class="sourceLineNo">315</span> newNonce);<a name="line.315"></a>
-<span class="sourceLineNo">316</span> }<a name="line.316"></a>
-<span class="sourceLineNo">317</span> return true;<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><a name="line.320"></a>
-<span class="sourceLineNo">321</span> //Try with different nonce, now it should fail the checks<a name="line.321"></a>
-<span class="sourceLineNo">322</span> try {<a name="line.322"></a>
-<span class="sourceLineNo">323</span> UTIL.getHBaseCluster().getMaster().addColumn(tableName,<a name="line.323"></a>
-<span class="sourceLineNo">324</span> ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes(cf2)).build(), nonceGroup,<a name="line.324"></a>
-<span class="sourceLineNo">325</span> nonceGenerator.newNonce());<a name="line.325"></a>
-<span class="sourceLineNo">326</span> Assert.fail();<a name="line.326"></a>
-<span class="sourceLineNo">327</span> } catch (InvalidFamilyOperationException e) {<a name="line.327"></a>
-<span class="sourceLineNo">328</span> }<a name="line.328"></a>
-<span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span> // Validate descriptor<a name="line.330"></a>
-<span class="sourceLineNo">331</span> HTableDescriptor currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);<a name="line.331"></a>
-<span class="sourceLineNo">332</span> assertEquals(newCompactionEnableOption, currentHtd.isCompactionEnabled());<a name="line.332"></a>
-<span class="sourceLineNo">333</span> assertEquals(3, currentHtd.getFamiliesKeys().size());<a name="line.333"></a>
-<span class="sourceLineNo">334</span> assertTrue(currentHtd.hasFamily(Bytes.toBytes(cf2)));<a name="line.334"></a>
-<span class="sourceLineNo">335</span> assertTrue(currentHtd.hasFamily(Bytes.toBytes(cf3)));<a name="line.335"></a>
-<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span> // cf2 should be added<a name="line.337"></a>
-<span class="sourceLineNo">338</span> MasterProcedureTestingUtility.validateTableCreation(UTIL.getHBaseCluster().getMaster(),<a name="line.338"></a>
-<span class="sourceLineNo">339</span> tableName, regions, "cf1", cf2, cf3);<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> @Test<a name="line.342"></a>
-<span class="sourceLineNo">343</span> public void testRollbackAndDoubleExecutionOnline() throws Exception {<a name="line.343"></a>
-<span class="sourceLineNo">344</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.344"></a>
-<span class="sourceLineNo">345</span> final String familyName = "cf2";<a name="line.345"></a>
-<span class="sourceLineNo">346</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.346"></a>
-<span class="sourceLineNo">347</span><a name="line.347"></a>
-<span class="sourceLineNo">348</span> // create the table<a name="line.348"></a>
-<span class="sourceLineNo">349</span> RegionInfo[] regions = MasterProcedureTestingUtility.createTable(<a name="line.349"></a>
-<span class="sourceLineNo">350</span> procExec, tableName, null, "cf1");<a name="line.350"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.DoNotRetryIOException;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.InvalidFamilyOperationException;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.TableName;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.client.PerClientRandomNonceGenerator;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.client.TableDescriptor;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.client.TableDescriptorBuilder;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.master.procedure.MasterProcedureTestingUtility.StepHook;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.procedure2.Procedure;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.util.NonceKey;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.junit.Assert;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.junit.ClassRule;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.junit.Rule;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.junit.Test;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.junit.experimental.categories.Category;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.junit.rules.TestName;<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>@Category({MasterTests.class, MediumTests.class})<a name="line.51"></a>
+<span class="sourceLineNo">052</span>public class TestModifyTableProcedure extends TestTableDDLProcedureBase {<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span> @ClassRule<a name="line.54"></a>
+<span class="sourceLineNo">055</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.55"></a>
+<span class="sourceLineNo">056</span> HBaseClassTestRule.forClass(TestModifyTableProcedure.class);<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span> @Rule public TestName name = new TestName();<a name="line.58"></a>
+<span class="sourceLineNo">059</span><a name="line.59"></a>
+<span class="sourceLineNo">060</span> @Test<a name="line.60"></a>
+<span class="sourceLineNo">061</span> public void testModifyTable() throws Exception {<a name="line.61"></a>
+<span class="sourceLineNo">062</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.62"></a>
+<span class="sourceLineNo">063</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span> MasterProcedureTestingUtility.createTable(procExec, tableName, null, "cf");<a name="line.65"></a>
+<span class="sourceLineNo">066</span> UTIL.getAdmin().disableTable(tableName);<a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span> // Modify the table descriptor<a name="line.68"></a>
+<span class="sourceLineNo">069</span> HTableDescriptor htd = new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span> // Test 1: Modify 1 property<a name="line.71"></a>
+<span class="sourceLineNo">072</span> long newMaxFileSize = htd.getMaxFileSize() * 2;<a name="line.72"></a>
+<span class="sourceLineNo">073</span> htd.setMaxFileSize(newMaxFileSize);<a name="line.73"></a>
+<span class="sourceLineNo">074</span> htd.setRegionReplication(3);<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span> long procId1 = ProcedureTestingUtility.submitAndWait(<a name="line.76"></a>
+<span class="sourceLineNo">077</span> procExec, new ModifyTableProcedure(procExec.getEnvironment(), htd));<a name="line.77"></a>
+<span class="sourceLineNo">078</span> ProcedureTestingUtility.assertProcNotFailed(procExec.getResult(procId1));<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span> HTableDescriptor currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);<a name="line.80"></a>
+<span class="sourceLineNo">081</span> assertEquals(newMaxFileSize, currentHtd.getMaxFileSize());<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span> // Test 2: Modify multiple properties<a name="line.83"></a>
+<span class="sourceLineNo">084</span> boolean newReadOnlyOption = htd.isReadOnly() ? false : true;<a name="line.84"></a>
+<span class="sourceLineNo">085</span> long newMemStoreFlushSize = htd.getMemStoreFlushSize() * 2;<a name="line.85"></a>
+<span class="sourceLineNo">086</span> htd.setReadOnly(newReadOnlyOption);<a name="line.86"></a>
+<span class="sourceLineNo">087</span> htd.setMemStoreFlushSize(newMemStoreFlushSize);<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span> long procId2 = ProcedureTestingUtility.submitAndWait(<a name="line.89"></a>
+<span class="sourceLineNo">090</span> procExec, new ModifyTableProcedure(procExec.getEnvironment(), htd));<a name="line.90"></a>
+<span class="sourceLineNo">091</span> ProcedureTestingUtility.assertProcNotFailed(procExec.getResult(procId2));<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span> currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);<a name="line.93"></a>
+<span class="sourceLineNo">094</span> assertEquals(newReadOnlyOption, currentHtd.isReadOnly());<a name="line.94"></a>
+<span class="sourceLineNo">095</span> assertEquals(newMemStoreFlushSize, currentHtd.getMemStoreFlushSize());<a name="line.95"></a>
+<span class="sourceLineNo">096</span> }<a name="line.96"></a>
+<span class="sourceLineNo">097</span><a name="line.97"></a>
+<span class="sourceLineNo">098</span> @Test<a name="line.98"></a>
+<span class="sourceLineNo">099</span> public void testModifyTableAddCF() throws Exception {<a name="line.99"></a>
+<span class="sourceLineNo">100</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.100"></a>
+<span class="sourceLineNo">101</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.101"></a>
+<span class="sourceLineNo">102</span><a name="line.102"></a>
+<span class="sourceLineNo">103</span> MasterProcedureTestingUtility.createTable(procExec, tableName, null, "cf1");<a name="line.103"></a>
+<span class="sourceLineNo">104</span> HTableDescriptor currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);<a name="line.104"></a>
+<span class="sourceLineNo">105</span> assertEquals(1, currentHtd.getFamiliesKeys().size());<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span> // Test 1: Modify the table descriptor online<a name="line.107"></a>
+<span class="sourceLineNo">108</span> String cf2 = "cf2";<a name="line.108"></a>
+<span class="sourceLineNo">109</span> HTableDescriptor htd = new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));<a name="line.109"></a>
+<span class="sourceLineNo">110</span> htd.addFamily(new HColumnDescriptor(cf2));<a name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span> long procId = ProcedureTestingUtility.submitAndWait(<a name="line.112"></a>
+<span class="sourceLineNo">113</span> procExec, new ModifyTableProcedure(procExec.getEnvironment(), htd));<a name="line.113"></a>
+<span class="sourceLineNo">114</span> ProcedureTestingUtility.assertProcNotFailed(procExec.getResult(procId));<a name="line.114"></a>
+<span class="sourceLineNo">115</span><a name="line.115"></a>
+<span class="sourceLineNo">116</span> currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);<a name="line.116"></a>
+<span class="sourceLineNo">117</span> assertEquals(2, currentHtd.getFamiliesKeys().size());<a name="line.117"></a>
+<span class="sourceLineNo">118</span> assertTrue(currentHtd.hasFamily(Bytes.toBytes(cf2)));<a name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span> // Test 2: Modify the table descriptor offline<a name="line.120"></a>
+<span class="sourceLineNo">121</span> UTIL.getAdmin().disableTable(tableName);<a name="line.121"></a>
+<span class="sourceLineNo">122</span> ProcedureTestingUtility.waitNoProcedureRunning(procExec);<a name="line.122"></a>
+<span class="sourceLineNo">123</span> String cf3 = "cf3";<a name="line.123"></a>
+<span class="sourceLineNo">124</span> HTableDescriptor htd2 =<a name="line.124"></a>
+<span class="sourceLineNo">125</span> new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));<a name="line.125"></a>
+<span class="sourceLineNo">126</span> htd2.addFamily(new HColumnDescriptor(cf3));<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span> long procId2 =<a name="line.128"></a>
+<span class="sourceLineNo">129</span> ProcedureTestingUtility.submitAndWait(procExec,<a name="line.129"></a>
+<span class="sourceLineNo">130</span> new ModifyTableProcedure(procExec.getEnvironment(), htd2));<a name="line.130"></a>
+<span class="sourceLineNo">131</span> ProcedureTestingUtility.assertProcNotFailed(procExec.getResult(procId2));<a name="line.131"></a>
+<span class="sourceLineNo">132</span><a name="line.132"></a>
+<span class="sourceLineNo">133</span> currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);<a name="line.133"></a>
+<span class="sourceLineNo">134</span> assertTrue(currentHtd.hasFamily(Bytes.toBytes(cf3)));<a name="line.134"></a>
+<span class="sourceLineNo">135</span> assertEquals(3, currentHtd.getFamiliesKeys().size());<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> @Test<a name="line.138"></a>
+<span class="sourceLineNo">139</span> public void testModifyTableDeleteCF() throws Exception {<a name="line.139"></a>
+<span class="sourceLineNo">140</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.140"></a>
+<span class="sourceLineNo">141</span> final String cf1 = "cf1";<a name="line.141"></a>
+<span class="sourceLineNo">142</span> final String cf2 = "cf2";<a name="line.142"></a>
+<span class="sourceLineNo">143</span> final String cf3 = "cf3";<a name="line.143"></a>
+<span class="sourceLineNo">144</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span> MasterProcedureTestingUtility.createTable(procExec, tableName, null, cf1, cf2, cf3);<a name="line.146"></a>
+<span class="sourceLineNo">147</span> HTableDescriptor currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);<a name="line.147"></a>
+<span class="sourceLineNo">148</span> assertEquals(3, currentHtd.getFamiliesKeys().size());<a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span> // Test 1: Modify the table descriptor<a name="line.150"></a>
+<span class="sourceLineNo">151</span> HTableDescriptor htd = new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));<a name="line.151"></a>
+<span class="sourceLineNo">152</span> htd.removeFamily(Bytes.toBytes(cf2));<a name="line.152"></a>
+<span class="sourceLineNo">153</span><a name="line.153"></a>
+<span class="sourceLineNo">154</span> long procId = ProcedureTestingUtility.submitAndWait(<a name="line.154"></a>
+<span class="sourceLineNo">155</span> procExec, new ModifyTableProcedure(procExec.getEnvironment(), htd));<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><a name="line.157"></a>
+<span class="sourceLineNo">158</span> currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);<a name="line.158"></a>
+<span class="sourceLineNo">159</span> assertEquals(2, currentHtd.getFamiliesKeys().size());<a name="line.159"></a>
+<span class="sourceLineNo">160</span> assertFalse(currentHtd.hasFamily(Bytes.toBytes(cf2)));<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span> // Test 2: Modify the table descriptor offline<a name="line.162"></a>
+<span class="sourceLineNo">163</span> UTIL.getAdmin().disableTable(tableName);<a name="line.163"></a>
+<span class="sourceLineNo">164</span> ProcedureTestingUtility.waitNoProcedureRunning(procExec);<a name="line.164"></a>
+<span class="sourceLineNo">165</span><a name="line.165"></a>
+<span class="sourceLineNo">166</span> HTableDescriptor htd2 =<a name="line.166"></a>
+<span class="sourceLineNo">167</span> new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));<a name="line.167"></a>
+<span class="sourceLineNo">168</span> htd2.removeFamily(Bytes.toBytes(cf3));<a name="line.168"></a>
+<span class="sourceLineNo">169</span> // Disable Sanity check<a name="line.169"></a>
+<span class="sourceLineNo">170</span> htd2.setConfiguration("hbase.table.sanity.checks", Boolean.FALSE.toString());<a name="line.170"></a>
+<span class="sourceLineNo">171</span><a name="line.171"></a>
+<span class="sourceLineNo">172</span> long procId2 =<a name="line.172"></a>
+<span class="sourceLineNo">173</span> ProcedureTestingUtility.submitAndWait(procExec,<a name="line.173"></a>
+<span class="sourceLineNo">174</span> new ModifyTableProcedure(procExec.getEnvironment(), htd2));<a name="line.174"></a>
+<span class="sourceLineNo">175</span> ProcedureTestingUtility.assertProcNotFailed(procExec.getResult(procId2));<a name="line.175"></a>
+<span class="sourceLineNo">176</span><a name="line.176"></a>
+<span class="sourceLineNo">177</span> currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);<a name="line.177"></a>
+<span class="sourceLineNo">178</span> assertEquals(1, currentHtd.getFamiliesKeys().size());<a name="line.178"></a>
+<span class="sourceLineNo">179</span> assertFalse(currentHtd.hasFamily(Bytes.toBytes(cf3)));<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span> //Removing the last family will fail<a name="line.181"></a>
+<span class="sourceLineNo">182</span> HTableDescriptor htd3 =<a name="line.182"></a>
+<span class="sourceLineNo">183</span> new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));<a name="line.183"></a>
+<span class="sourceLineNo">184</span> htd3.removeFamily(Bytes.toBytes(cf1));<a name="line.184"></a>
+<span class="sourceLineNo">185</span> long procId3 =<a name="line.185"></a>
+<span class="sourceLineNo">186</span> ProcedureTestingUtility.submitAndWait(procExec,<a name="line.186"></a>
+<span class="sourceLineNo">187</span> new ModifyTableProcedure(procExec.getEnvironment(), htd3));<a name="line.187"></a>
+<span class="sourceLineNo">188</span> final Procedure<?> result = procExec.getResult(procId3);<a name="line.188"></a>
+<span class="sourceLineNo">189</span> assertEquals(true, result.isFailed());<a name="line.189"></a>
+<span class="sourceLineNo">190</span> Throwable cause = ProcedureTestingUtility.getExceptionCause(result);<a name="line.190"></a>
+<span class="sourceLineNo">191</span> assertTrue("expected DoNotRetryIOException, got " + cause,<a name="line.191"></a>
+<span class="sourceLineNo">192</span> cause instanceof DoNotRetryIOException);<a name="line.192"></a>
+<span class="sourceLineNo">193</span> assertEquals(1, currentHtd.getFamiliesKeys().size());<a name="line.193"></a>
+<span class="sourceLineNo">194</span> assertTrue(currentHtd.hasFamily(Bytes.toBytes(cf1)));<a name="line.194"></a>
+<span class="sourceLineNo">195</span> }<a name="line.195"></a>
+<span class="sourceLineNo">196</span><a name="line.196"></a>
+<span class="sourceLineNo">197</span> @Test<a name="line.197"></a>
+<span class="sourceLineNo">198</span> public void testRecoveryAndDoubleExecutionOffline() throws Exception {<a name="line.198"></a>
+<span class="sourceLineNo">199</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.199"></a>
+<span class="sourceLineNo">200</span> final String cf2 = "cf2";<a name="line.200"></a>
+<span class="sourceLineNo">201</span> final String cf3 = "cf3";<a name="line.201"></a>
+<span class="sourceLineNo">202</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.202"></a>
+<span class="sourceLineNo">203</span><a name="line.203"></a>
+<span class="sourceLineNo">204</span> // create the table<a name="line.204"></a>
+<span class="sourceLineNo">205</span> RegionInfo[] regions = MasterProcedureTestingUtility.createTable(<a name="line.205"></a>
+<span class="sourceLineNo">206</span> procExec, tableName, null, "cf1", cf3);<a name="line.206"></a>
+<span class="sourceLineNo">207</span> UTIL.getAdmin().disableTable(tableName);<a name="line.207"></a>
+<span class="sourceLineNo">208</span><a name="line.208"></a>
+<span class="sourceLineNo">209</span> ProcedureTestingUtility.waitNoProcedureRunning(procExec);<a name="line.209"></a>
+<span class="sourceLineNo">210</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);<a name="line.210"></a>
+<span class="sourceLineNo">211</span><a name="line.211"></a>
+<span class="sourceLineNo">212</span> // Modify multiple properties of the table.<a name="line.212"></a>
+<span class="sourceLineNo">213</span> TableDescriptor oldDescriptor = UTIL.getAdmin().getDescriptor(tableName);<a name="line.213"></a>
+<span class="sourceLineNo">214</span> TableDescriptor newDescriptor = TableDescriptorBuilder.newBuilder(oldDescriptor)<a name="line.214"></a>
+<span class="sourceLineNo">215</span> .setCompactionEnabled(!oldDescriptor.isCompactionEnabled())<a name="line.215"></a>
+<span class="sourceLineNo">216</span> .setColumnFamily(ColumnFamilyDescriptorBuilder.of(cf2))<a name="line.216"></a>
+<span class="sourceLineNo">217</span> .removeColumnFamily(Bytes.toBytes(cf3))<a name="line.217"></a>
+<span class="sourceLineNo">218</span> .setRegionReplication(3)<a name="line.218"></a>
+<span class="sourceLineNo">219</span> .build();<a name="line.219"></a>
+<span class="sourceLineNo">220</span><a name="line.220"></a>
+<span class="sourceLineNo">221</span> // Start the Modify procedure && kill the executor<a name="line.221"></a>
+<span class="sourceLineNo">222</span> long procId = procExec.submitProcedure(<a name="line.222"></a>
+<span class="sourceLineNo">223</span> new ModifyTableProcedure(procExec.getEnvironment(), newDescriptor));<a name="line.223"></a>
+<span class="sourceLineNo">224</span><a name="line.224"></a>
+<span class="sourceLineNo">225</span> // Restart the executor and execute the step twice<a name="line.225"></a>
+<span class="sourceLineNo">226</span> MasterProcedureTestingUtility.testRecoveryAndDoubleExecution(procExec, procId);<a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span> // Validate descriptor<a name="line.228"></a>
+<span class="sourceLineNo">229</span> TableDescriptor currentDescriptor = UTIL.getAdmin().getDescriptor(tableName);<a name="line.229"></a>
+<span class="sourceLineNo">230</span> assertEquals(newDescriptor.isCompactionEnabled(), currentDescriptor.isCompactionEnabled());<a name="line.230"></a>
+<span class="sourceLineNo">231</span> assertEquals(2, newDescriptor.getColumnFamilyNames().size());<a name="line.231"></a>
+<span class="sourceLineNo">232</span><a name="line.232"></a>
+<span class="sourceLineNo">233</span> // cf2 should be added cf3 should be removed<a name="line.233"></a>
+<span class="sourceLineNo">234</span> MasterProcedureTestingUtility.validateTableCreation(UTIL.getHBaseCluster().getMaster(),<a name="line.234"></a>
+<span class="sourceLineNo">235</span> tableName, regions, false, "cf1", cf2);<a name="line.235"></a>
+<span class="sourceLineNo">236</span> }<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span> @Test<a name="line.238"></a>
+<span class="sourceLineNo">239</span> public void testRecoveryAndDoubleExecutionOnline() throws Exception {<a name="line.239"></a>
+<span class="sourceLineNo">240</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.240"></a>
+<span class="sourceLineNo">241</span> final String cf2 = "cf2";<a name="line.241"></a>
+<span class="sourceLineNo">242</span> final String cf3 = "cf3";<a name="line.242"></a>
+<span class="sourceLineNo">243</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span> // create the table<a name="line.245"></a>
+<span class="sourceLineNo">246</span> RegionInfo[] regions = MasterProcedureTestingUtility.createTable(<a name="line.246"></a>
+<span class="sourceLineNo">247</span> procExec, tableName, null, "cf1", cf3);<a name="line.247"></a>
+<span class="sourceLineNo">248</span><a name="line.248"></a>
+<span class="sourceLineNo">249</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span> // Modify multiple properties of the table.<a name="line.251"></a>
+<span class="sourceLineNo">252</span> HTableDescriptor htd = new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));<a name="line.252"></a>
+<span class="sourceLineNo">253</span> boolean newCompactionEnableOption = htd.isCompactionEnabled() ? false : true;<a name="line.253"></a>
+<span class="sourceLineNo">254</span> htd.setCompactionEnabled(newCompactionEnableOption);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> htd.addFamily(new HColumnDescriptor(cf2));<a name="line.255"></a>
+<span class="sourceLineNo">256</span> htd.removeFamily(Bytes.toBytes(cf3));<a name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span> // Start the Modify procedure && kill the executor<a name="line.258"></a>
+<span class="sourceLineNo">259</span> long procId = procExec.submitProcedure(<a name="line.259"></a>
+<span class="sourceLineNo">260</span> new ModifyTableProcedure(procExec.getEnvironment(), htd));<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span> // Restart the executor and execute the step twice<a name="line.262"></a>
+<span class="sourceLineNo">263</span> MasterProcedureTestingUtility.testRecoveryAndDoubleExecution(procExec, procId);<a name="line.263"></a>
+<span class="sourceLineNo">264</span><a name="line.264"></a>
+<span class="sourceLineNo">265</span> // Validate descriptor<a name="line.265"></a>
+<span class="sourceLineNo">266</span> HTableDescriptor currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);<a name="line.266"></a>
+<span class="sourceLineNo">267</span> assertEquals(newCompactionEnableOption, currentHtd.isCompactionEnabled());<a name="line.267"></a>
+<span class="sourceLineNo">268</span> assertEquals(2, currentHtd.getFamiliesKeys().size());<a name="line.268"></a>
+<span class="sourceLineNo">269</span> assertTrue(currentHtd.hasFamily(Bytes.toBytes(cf2)));<a name="line.269"></a>
+<span class="sourceLineNo">270</span> assertFalse(currentHtd.hasFamily(Bytes.toBytes(cf3)));<a name="line.270"></a>
+<span class="sourceLineNo">271</span><a name="line.271"></a>
+<span class="sourceLineNo">272</span> // cf2 should be added cf3 should be removed<a name="line.272"></a>
+<span class="sourceLineNo">273</span> MasterProcedureTestingUtility.validateTableCreation(UTIL.getHBaseCluster().getMaster(),<a name="line.273"></a>
+<span class="sourceLineNo">274</span> tableName, regions, "cf1", cf2);<a name="line.274"></a>
+<span class="sourceLineNo">275</span> }<a name="line.275"></a>
+<span class="sourceLineNo">276</span><a name="line.276"></a>
+<span class="sourceLineNo">277</span> @Test<a name="line.277"></a>
+<span class="sourceLineNo">278</span> public void testColumnFamilyAdditionTwiceWithNonce() throws Exception {<a name="line.278"></a>
+<span class="sourceLineNo">279</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.279"></a>
+<span class="sourceLineNo">280</span> final String cf2 = "cf2";<a name="line.280"></a>
+<span class="sourceLineNo">281</span> final String cf3 = "cf3";<a name="line.281"></a>
+<span class="sourceLineNo">282</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.282"></a>
+<span class="sourceLineNo">283</span><a name="line.283"></a>
+<span class="sourceLineNo">284</span> // create the table<a name="line.284"></a>
+<span class="sourceLineNo">285</span> RegionInfo[] regions =<a name="line.285"></a>
+<span class="sourceLineNo">286</span> MasterProcedureTestingUtility.createTable(procExec, tableName, null, "cf1", cf3);<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);<a name="line.288"></a>
+<span class="sourceLineNo">289</span> // Modify multiple properties of the table.<a name="line.289"></a>
+<span class="sourceLineNo">290</span> TableDescriptor td = UTIL.getAdmin().getDescriptor(tableName);<a name="line.290"></a>
+<span class="sourceLineNo">291</span> TableDescriptor newTd =<a name="line.291"></a>
+<span class="sourceLineNo">292</span> TableDescriptorBuilder.newBuilder(td).setCompactionEnabled(!td.isCompactionEnabled())<a name="line.292"></a>
+<span class="sourceLineNo">293</span> .setColumnFamily(ColumnFamilyDescriptorBuilder.of(cf2)).build();<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span> PerClientRandomNonceGenerator nonceGenerator = PerClientRandomNonceGenerator.get();<a name="line.295"></a>
+<span class="sourceLineNo">296</span> long nonceGroup = nonceGenerator.getNonceGroup();<a name="line.296"></a>
+<span class="sourceLineNo">297</span> long newNonce = nonceGenerator.newNonce();<a name="line.297"></a>
+<span class="sourceLineNo">298</span> NonceKey nonceKey = new NonceKey(nonceGroup, newNonce);<a name="line.298"></a>
+<span class="sourceLineNo">299</span> procExec.registerNonce(nonceKey);<a name="line.299"></a>
+<span class="sourceLineNo">300</span><a name="line.300"></a>
+<span class="sourceLineNo">301</span> // Start the Modify procedure && kill the executor<a name="line.301"></a>
+<span class="sourceLineNo">302</span> final long procId = procExec<a name="line.302"></a>
+<span class="sourceLineNo">303</span> .submitProcedure(new ModifyTableProcedure(procExec.getEnvironment(), newTd), nonceKey);<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span> // Restart the executor after MODIFY_TABLE_UPDATE_TABLE_DESCRIPTOR and try to add column family<a name="line.305"></a>
+<span class="sourceLineNo">306</span> // as nonce are there , we should not fail<a name="line.306"></a>
+<span class="sourceLineNo">307</span> MasterProcedureTestingUtility.testRecoveryAndDoubleExecution(procExec, procId, new StepHook() {<a name="line.307"></a>
+<span class="sourceLineNo">308</span> @Override<a name="line.308"></a>
+<span class="sourceLineNo">309</span> public boolean execute(int step) throws IOException {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> if (step == 3) {<a name="line.310"></a>
+<span class="sourceLineNo">311</span> return procId == UTIL.getHBaseCluster().getMaster().addColumn(tableName,<a name="line.311"></a>
+<span class="sourceLineNo">312</span> ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes(cf2)).build(), nonceGroup,<a name="line.312"></a>
+<span class="sourceLineNo">313</span> newNonce);<a name="line.313"></a>
+<span class="sourceLineNo">314</span> }<a name="line.314"></a>
+<span class="sourceLineNo">315</span> return true;<a name="line.315"></a>
+<span class="sourceLineNo">316</span> }<a name="line.316"></a>
+<span class="sourceLineNo">317</span> });<a name="line.317"></a>
+<span class="sourceLineNo">318</span><a name="line.318"></a>
+<span class="sourceLineNo">319</span> //Try with different nonce, now it should fail the checks<a name="line.319"></a>
+<span class="sourceLineNo">320</span> try {<a name="line.320"></a>
+<span class="sourceLineNo">321</span> UTIL.getHBaseCluster().getMaster().addColumn(tableName,<a name="line.321"></a>
+<span class="sourceLineNo">322</span> ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes(cf2)).build(), nonceGroup,<a name="line.322"></a>
+<span class="sourceLineNo">323</span> nonceGenerator.newNonce());<a name="line.323"></a>
+<span class="sourceLineNo">324</span> Assert.fail();<a name="line.324"></a>
+<span class="sourceLineNo">325</span> } catch (InvalidFamilyOperationException e) {<a name="line.325"></a>
+<span class="sourceLineNo">326</span> }<a name="line.326"></a>
+<span class="sourceLineNo">327</span><a name="line.327"></a>
+<span class="sourceLineNo">328</span> // Validate descriptor<a name="line.328"></a>
+<span class="sourceLineNo">329</span> TableDescriptor currentHtd = UTIL.getAdmin().getDescriptor(tableName);<a name="line.329"></a>
+<span class="sourceLineNo">330</span> assertEquals(!td.isCompactionEnabled(), currentHtd.isCompactionEnabled());<a name="line.330"></a>
+<span class="sourceLineNo">331</span> assertEquals(3, currentHtd.getColumnFamilyCount());<a name="line.331"></a>
+<span class="sourceLineNo">332</span> assertTrue(currentHtd.hasColumnFamily(Bytes.toBytes(cf2)));<a name="line.332"></a>
+<span class="sourceLineNo">333</span> assertTrue(currentHtd.hasColumnFamily(Bytes.toBytes(cf3)));<a name="line.333"></a>
+<span class="sourceLineNo">334</span><a name="line.334"></a>
+<span class="sourceLineNo">335</span> // cf2 should be added<a name="line.335"></a>
+<span class="sourceLineNo">336</span> MasterProcedureTestingUtility.validateTableCreation(UTIL.getHBaseCluster().getMaster(),<a name="line.336"></a>
+<span class="sourceLineNo">337</span> tableName, regions, "cf1", cf2, cf3);<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> @Test<a name="line.340"></a>
+<span class="sourceLineNo">341</span> public void testRollbackAndDoubleExecutionOnline() throws Exception {<a name="line.341"></a>
+<span class="sourceLineNo">342</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.342"></a>
+<span class="sourceLineNo">343</span> final String familyName = "cf2";<a name="line.343"></a>
+<span class="sourceLineNo">344</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.344"></a>
+<span class="sourceLineNo">345</span><a name="line.345"></a>
+<span class="sourceLineNo">346</span> // create the table<a name="line.346"></a>
+<span class="sourceLineNo">347</span> RegionInfo[] regions = MasterProcedureTestingUtility.createTable(<a name="line.347"></a>
+<span class="sourceLineNo">348</span> procExec, tableName, null, "cf1");<a name="line.348"></a>
+<span class="sourceLineNo">349</span><a name="line.349"></a>
+<span class="sourceLineNo">350</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);<a name="line.350"></a>
<span class="sourceLineNo">351</span><a name="line.351"></a>
-<span class="sourceLineNo">352</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);<a name="line.352"></a>
-<span class="sourceLineNo">353</span><a name="line.353"></a>
-<span class="sourceLineNo">354</span> HTableDescriptor htd = new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));<a name="line.354"></a>
-<span class="sourceLineNo">355</span> boolean newCompactionEnableOption = htd.isCompactionEnabled() ? false : true;<a name="line.355"></a>
-<span class="sourceLineNo">356</span> htd.setCompactionEnabled(newCompactionEnableOption);<a name="line.356"></a>
-<span class="sourceLineNo">357</span> htd.addFamily(new HColumnDescriptor(familyName));<a name="line.357"></a>
-<span class="sourceLineNo">358</span><a name="line.358"></a>
-<span class="sourceLineNo">359</span> // Start the Modify procedure && kill the executor<a name="line.359"></a>
-<span class="sourceLineNo">360</span> long procId = procExec.submitProcedure(<a name="line.360"></a>
-<span class="sourceLineNo">361</span> new ModifyTableProcedure(procExec.getEnvironment(), htd));<a name="line.361"></a>
-<span class="sourceLineNo">362</span><a name="line.362"></a>
-<span class="sourceLineNo">363</span> int numberOfSteps = 0; // failing at pre operation<a name="line.363"></a>
-<span class="sourceLineNo">364</span> MasterProcedureTestingUtility.testRollbackAndDoubleExecution(procExec, procId, numberOfSteps);<a name="line.364"></a>
-<span class="sourceLineNo">365</span><a name="line.365"></a>
-<span class="sourceLineNo">366</span> // cf2 should not be present<a name="line.366"></a>
-<span class="sourceLineNo">367</span> MasterProcedureTestingUtility.validateTableCreation(UTIL.getHBaseCluster().getMaster(),<a name="line.367"></a>
-<span class="sourceLineNo">368</span> tableName, regions, "cf1");<a name="line.368"></a>
-<span class="sourceLineNo">369</span> }<a name="line.369"></a>
-<span class="sourceLineNo">370</span><a name="line.370"></a>
-<span class="sourceLineNo">371</span> @Test<a name="line.371"></a>
-<span class="sourceLineNo">372</span> public void testRollbackAndDoubleExecutionOffline() throws Exception {<a name="line.372"></a>
-<span class="sourceLineNo">373</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.373"></a>
-<span class="sourceLineNo">374</span> final String familyName = "cf2";<a name="line.374"></a>
-<span class="sourceLineNo">375</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.375"></a>
-<span class="sourceLineNo">376</span><a name="line.376"></a>
-<span class="sourceLineNo">377</span> // create the table<a name="line.377"></a>
-<span class="sourceLineNo">378</span> RegionInfo[] regions = MasterProcedureTestingUtility.createTable(<a name="line.378"></a>
-<span class="sourceLineNo">379</span> procExec, tableName, null, "cf1");<a name="line.379"></a>
-<span class="sourceLineNo">380</span> UTIL.getAdmin().disableTable(tableName);<a name="line.380"></a>
-<span class="sourceLineNo">381</span><a name="line.381"></a>
-<span class="sourceLineNo">382</span> ProcedureTestingUtility.waitNoProcedureRunning(procExec);<a name="line.382"></a>
-<span class="sourceLineNo">383</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);<a name="line.383"></a>
-<span class="sourceLineNo">384</span><a name="line.384"></a>
-<span class="sourceLineNo">385</span> HTableDescriptor htd = new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));<a name="line.385"></a>
-<span class="sourceLineNo">386</span> boolean newCompactionEnableOption = htd.isCompactionEnabled() ? false : true;<a name="line.386"></a>
-<span class="sourceLineNo">387</span> htd.setCompactionEnabled(newCompactionEnableOption);<a name="line.387"></a>
-<span class="sourceLineNo">388</span> htd.addFamily(new HColumnDescriptor(familyName));<a name="line.388"></a>
-<span class="sourceLineNo">389</span> htd.setRegionReplication(3);<a name="line.389"></a>
-<span class="sourceLineNo">390</span><a name="line.390"></a>
-<span class="sourceLineNo">391</span> // Start the Modify procedure && kill the executor<a name="line.391"></a>
-<span class="sourceLineNo">392</span> long procId = procExec.submitProcedure(<a name="line.392"></a>
-<span class="sourceLineNo">393</span> new ModifyTableProcedure(procExec.getEnvironment(), htd));<a name="line.393"></a>
-<span class="sourceLineNo">394</span><a name="line.394"></a>
-<span class="sourceLineNo">395</span> // Restart the executor and rollback the step twice<a name="line.395"></a>
-<span class="sourceLineNo">396</span> int numberOfSteps = 0; // failing at pre operation<a name="line.396"></a>
-<span class="sourceLineNo">397</span> MasterProcedureTestingUtility.testRollbackAndDoubleExecution(procExec, procId, numberOfSteps);<a name="line.397"></a>
-<span class="sourceLineNo">398</span><a name="line.398"></a>
-<span class="sourceLineNo">399</span> // cf2 should not be present<a name="line.399"></a>
-<span class="sourceLineNo">400</span> MasterProcedureTestingUtility.validateTableCreation(UTIL.getHBaseCluster().getMaster(),<a name="line.400"></a>
-<span class="sourceLineNo">401</span> tableName, regions, "cf1");<a name="line.401"></a>
-<span class="sourceLineNo">402</span> }<a name="line.402"></a>
-<span class="sourceLineNo">403</span>}<a name="line.403"></a>
+<span class="sourceLineNo">352</span> TableDescriptor td = UTIL.getAdmin().getDescriptor(tableName);<a name="line.352"></a>
+<span class="sourceLineNo">353</span> TableDescriptor newTd =<a name="line.353"></a>
+<span class="sourceLineNo">354</span> TableDescriptorBuilder.newBuilder(td).setCompactionEnabled(!td.isCompactionEnabled())<a name="line.354"></a>
+<span class="sourceLineNo">355</span> .setColumnFamily(ColumnFamilyDescriptorBuilder.of(familyName)).build();<a name="line.355"></a>
+<span class="sourceLineNo">356</span><a name="line.356"></a>
+<span class="sourceLineNo">357</span> // Start the Modify procedure && kill the executor<a name="line.357"></a>
+<span class="sourceLineNo">358</span> long procId =<a name="line.358"></a>
+<span class="sourceLineNo">359</span> procExec.submitProcedure(new ModifyTableProcedure(procExec.getEnvironment(), newTd));<a name="line.359"></a>
+<span class="sourceLineNo">360</span><a name="line.360"></a>
+<span class="sourceLineNo">361</span> int lastStep = 3; // failing before MODIFY_TABLE_UPDATE_TABLE_DESCRIPTOR<a name="line.361"></a>
+<span class="sourceLineNo">362</span> MasterProcedureTestingUtility.testRollbackAndDoubleExecution(procExec, procId, lastStep);<a name="line.362"></a>
+<span class="sourceLineNo">363</span><a name="line.363"></a>
+<span class="sourceLineNo">364</span> // cf2 should not be present<a name="line.364"></a>
+<span class="sourceLineNo">365</span> MasterProcedureTestingUtility.validateTableCreation(UTIL.getHBaseCluster().getMaster(),<a name="line.365"></a>
+<span class="sourceLineNo">366</span> tableName, regions, "cf1");<a name="line.366"></a>
+<span class="sourceLineNo">367</span> }<a name="line.367"></a>
+<span class="sourceLineNo">368</span><a name="line.368"></a>
+<span class="sourceLineNo">369</span> @Test<a name="line.369"></a>
+<span class="sourceLineNo">370</span> public void testRollbackAndDoubleExecutionOffline() throws Exception {<a name="line.370"></a>
+<span class="sourceLineNo">371</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.371"></a>
+<span class="sourceLineNo">372</span> final String familyName = "cf2";<a name="line.372"></a>
+<span class="sourceLineNo">373</span> final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();<a name="line.373"></a>
+<span class="sourceLineNo">374</span><a name="line.374"></a>
+<span class="sourceLineNo">375</span> // create the table<a name="line.375"></a>
+<span class="sourceLineNo">376</span> RegionInfo[] regions = MasterProcedureTestingUtility.createTable(<a name="line.376"></a>
+<span class="sourceLineNo">377</span> procExec, tableName, null, "cf1");<a name="line.377"></a>
+<span class="sourceLineNo">378</span> UTIL.getAdmin().disableTable(tableName);<a name="line.378"></a>
+<span class="sourceLineNo">379</span><a name="line.379"></a>
+<span class="sourceLineNo">380</span> ProcedureTestingUtility.waitNoProcedureRunning(procExec);<a name="line.380"></a>
+<span class="sourceLineNo">381</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);<a name="line.381"></a>
+<span class="sourceLineNo">382</span><a name="line.382"></a>
+<span class="sourceLineNo">383</span> TableDescriptor td = UTIL.getAdmin().getDescriptor(tableName);<a name="line.383"></a>
+<span class="sourceLineNo">384</span> TableDescriptor newTd =<a name="line.384"></a>
+<span class="sourceLineNo">385</span> TableDescriptorBuilder.newBuilder(td).setCompactionEnabled(!td.isCompactionEnabled())<a name="line.385"></a>
+<span class="sourceLineNo">386</span> .setColumnFamily(ColumnFamilyDescriptorBuilder.of(familyName)).setRegionReplication(3)<a name="line.386"></a>
+<span class="sourceLineNo">387</span> .build();<a name="line.387"></a>
+<span class="sourceLineNo">388</span><a name="line.388"></a>
+<span class="sourceLineNo">389</span> // Start the Modify procedure && kill the executor<a name="line.389"></a>
+<span class="sourceLineNo">390</span> long procId = procExec.submitProcedure(<a name="line.390"></a>
+<span class="sourceLineNo">391</span> new ModifyTableProcedure(procExec.getEnvironment(), newTd));<a name="line.391"></a>
+<span class="sourceLineNo">392</span><a name="line.392"></a>
+<span class="sourceLineNo">393</span> // Restart the executor and rollback the step twice<a name="line.393"></a>
+<span class="sourceLineNo">394</span> int lastStep = 3; // failing before MODIFY_TABLE_UPDATE_TABLE_DESCRIPTOR<a name="line.394"></a>
+<span class="sourceLineNo">395</span> MasterProcedureTestingUtility.testRollbackAndDoubleExecution(procExec, procId, lastStep);<a name="line.395"></a>
+<span class="sourceLineNo">396</span><a name="line.396"></a>
+<span class="sourceLineNo">397</span> // cf2 should not be present<a name="line.397"></a>
+<span class="sourceLineNo">398</span> MasterProcedureTestingUtility.validateTableCreation(UTIL.getHBaseCluster().getMaster(),<a name="line.398"></a>
+<span class="sourceLineNo">399</span> tableName, regions, "cf1");<a name="line.399"></a>
+<span class="sourceLineNo">400</span> }<a name="line.400"></a>
+<span class="sourceLineNo">401</span>}<a name="line.401"></a>