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/02/06 15:13:52 UTC
[02/26] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ac54a6a8/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.html
index 84ebbef..a64cd4e 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.html
@@ -32,304 +32,310 @@
<span class="sourceLineNo">024</span>import java.io.IOException;<a name="line.24"></a>
<span class="sourceLineNo">025</span>import java.util.HashSet;<a name="line.25"></a>
<span class="sourceLineNo">026</span>import java.util.Set;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.conf.Configuration;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.fs.Path;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.HConstants;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.TableName;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.master.MasterFileSystem;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.master.snapshot.SnapshotManager;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.regionserver.NoSuchColumnFamilyException;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.snapshot.CorruptedSnapshotException;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<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.FSUtils;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.junit.After;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.junit.AfterClass;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.junit.Before;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.junit.BeforeClass;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.junit.ClassRule;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.junit.Rule;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.junit.Test;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.junit.experimental.categories.Category;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.junit.rules.TestName;<a name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span>/**<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * Test restore snapshots from the client<a name="line.55"></a>
-<span class="sourceLineNo">056</span> */<a name="line.56"></a>
-<span class="sourceLineNo">057</span>@Category({LargeTests.class, ClientTests.class})<a name="line.57"></a>
-<span class="sourceLineNo">058</span>public class TestRestoreSnapshotFromClient {<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span> @ClassRule<a name="line.60"></a>
-<span class="sourceLineNo">061</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.61"></a>
-<span class="sourceLineNo">062</span> HBaseClassTestRule.forClass(TestRestoreSnapshotFromClient.class);<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span> protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span> protected final byte[] FAMILY = Bytes.toBytes("cf");<a name="line.66"></a>
-<span class="sourceLineNo">067</span> protected final byte[] TEST_FAMILY2 = Bytes.toBytes("cf2");<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span> protected TableName tableName;<a name="line.69"></a>
-<span class="sourceLineNo">070</span> private byte[] emptySnapshot;<a name="line.70"></a>
-<span class="sourceLineNo">071</span> private byte[] snapshotName0;<a name="line.71"></a>
-<span class="sourceLineNo">072</span> private byte[] snapshotName1;<a name="line.72"></a>
-<span class="sourceLineNo">073</span> private byte[] snapshotName2;<a name="line.73"></a>
-<span class="sourceLineNo">074</span> private int snapshot0Rows;<a name="line.74"></a>
-<span class="sourceLineNo">075</span> private int snapshot1Rows;<a name="line.75"></a>
-<span class="sourceLineNo">076</span> private Admin admin;<a name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span> @Rule<a name="line.78"></a>
-<span class="sourceLineNo">079</span> public TestName name = new TestName();<a name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span> @BeforeClass<a name="line.81"></a>
-<span class="sourceLineNo">082</span> public static void setupCluster() throws Exception {<a name="line.82"></a>
-<span class="sourceLineNo">083</span> setupConf(TEST_UTIL.getConfiguration());<a name="line.83"></a>
-<span class="sourceLineNo">084</span> TEST_UTIL.startMiniCluster(3);<a name="line.84"></a>
-<span class="sourceLineNo">085</span> }<a name="line.85"></a>
-<span class="sourceLineNo">086</span><a name="line.86"></a>
-<span class="sourceLineNo">087</span> protected static void setupConf(Configuration conf) {<a name="line.87"></a>
-<span class="sourceLineNo">088</span> TEST_UTIL.getConfiguration().setBoolean(SnapshotManager.HBASE_SNAPSHOT_ENABLED, true);<a name="line.88"></a>
-<span class="sourceLineNo">089</span> TEST_UTIL.getConfiguration().setInt("hbase.hstore.compactionThreshold", 10);<a name="line.89"></a>
-<span class="sourceLineNo">090</span> TEST_UTIL.getConfiguration().setInt("hbase.regionserver.msginterval", 100);<a name="line.90"></a>
-<span class="sourceLineNo">091</span> TEST_UTIL.getConfiguration().setInt("hbase.client.pause", 250);<a name="line.91"></a>
-<span class="sourceLineNo">092</span> TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 6);<a name="line.92"></a>
-<span class="sourceLineNo">093</span> TEST_UTIL.getConfiguration().setBoolean(<a name="line.93"></a>
-<span class="sourceLineNo">094</span> "hbase.master.enabletable.roundrobin", true);<a name="line.94"></a>
-<span class="sourceLineNo">095</span> }<a name="line.95"></a>
-<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span> @AfterClass<a name="line.97"></a>
-<span class="sourceLineNo">098</span> public static void tearDownAfterClass() throws Exception {<a name="line.98"></a>
-<span class="sourceLineNo">099</span> TEST_UTIL.shutdownMiniCluster();<a name="line.99"></a>
-<span class="sourceLineNo">100</span> }<a name="line.100"></a>
-<span class="sourceLineNo">101</span><a name="line.101"></a>
-<span class="sourceLineNo">102</span> /**<a name="line.102"></a>
-<span class="sourceLineNo">103</span> * Initialize the tests with a table filled with some data<a name="line.103"></a>
-<span class="sourceLineNo">104</span> * and two snapshots (snapshotName0, snapshotName1) of different states.<a name="line.104"></a>
-<span class="sourceLineNo">105</span> * The tableName, snapshotNames and the number of rows in the snapshot are initialized.<a name="line.105"></a>
-<span class="sourceLineNo">106</span> */<a name="line.106"></a>
-<span class="sourceLineNo">107</span> @Before<a name="line.107"></a>
-<span class="sourceLineNo">108</span> public void setup() throws Exception {<a name="line.108"></a>
-<span class="sourceLineNo">109</span> this.admin = TEST_UTIL.getAdmin();<a name="line.109"></a>
-<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span> long tid = System.currentTimeMillis();<a name="line.111"></a>
-<span class="sourceLineNo">112</span> tableName = TableName.valueOf(name.getMethodName() + "-" + tid);<a name="line.112"></a>
-<span class="sourceLineNo">113</span> emptySnapshot = Bytes.toBytes("emptySnaptb-" + tid);<a name="line.113"></a>
-<span class="sourceLineNo">114</span> snapshotName0 = Bytes.toBytes("snaptb0-" + tid);<a name="line.114"></a>
-<span class="sourceLineNo">115</span> snapshotName1 = Bytes.toBytes("snaptb1-" + tid);<a name="line.115"></a>
-<span class="sourceLineNo">116</span> snapshotName2 = Bytes.toBytes("snaptb2-" + tid);<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> // create Table and disable it<a name="line.118"></a>
-<span class="sourceLineNo">119</span> createTable();<a name="line.119"></a>
-<span class="sourceLineNo">120</span> admin.disableTable(tableName);<a name="line.120"></a>
-<span class="sourceLineNo">121</span><a name="line.121"></a>
-<span class="sourceLineNo">122</span> // take an empty snapshot<a name="line.122"></a>
-<span class="sourceLineNo">123</span> admin.snapshot(emptySnapshot, tableName);<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span> // enable table and insert data<a name="line.125"></a>
-<span class="sourceLineNo">126</span> admin.enableTable(tableName);<a name="line.126"></a>
-<span class="sourceLineNo">127</span> SnapshotTestingUtils.loadData(TEST_UTIL, tableName, 500, FAMILY);<a name="line.127"></a>
-<span class="sourceLineNo">128</span> try (Table table = TEST_UTIL.getConnection().getTable(tableName)) {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> snapshot0Rows = countRows(table);<a name="line.129"></a>
-<span class="sourceLineNo">130</span> }<a name="line.130"></a>
-<span class="sourceLineNo">131</span> admin.disableTable(tableName);<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span> // take a snapshot<a name="line.133"></a>
-<span class="sourceLineNo">134</span> admin.snapshot(snapshotName0, tableName);<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span> // enable table and insert more data<a name="line.136"></a>
-<span class="sourceLineNo">137</span> admin.enableTable(tableName);<a name="line.137"></a>
-<span class="sourceLineNo">138</span> SnapshotTestingUtils.loadData(TEST_UTIL, tableName, 500, FAMILY);<a name="line.138"></a>
-<span class="sourceLineNo">139</span> try (Table table = TEST_UTIL.getConnection().getTable(tableName)) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span> snapshot1Rows = countRows(table);<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><a name="line.143"></a>
-<span class="sourceLineNo">144</span> protected void createTable() throws Exception {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> SnapshotTestingUtils.createTable(TEST_UTIL, tableName, getNumReplicas(), FAMILY);<a name="line.145"></a>
-<span class="sourceLineNo">146</span> }<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span> @After<a name="line.148"></a>
-<span class="sourceLineNo">149</span> public void tearDown() throws Exception {<a name="line.149"></a>
-<span class="sourceLineNo">150</span> TEST_UTIL.deleteTable(tableName);<a name="line.150"></a>
-<span class="sourceLineNo">151</span> SnapshotTestingUtils.deleteAllSnapshots(TEST_UTIL.getAdmin());<a name="line.151"></a>
-<span class="sourceLineNo">152</span> SnapshotTestingUtils.deleteArchiveDirectory(TEST_UTIL);<a name="line.152"></a>
-<span class="sourceLineNo">153</span> }<a name="line.153"></a>
-<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span> @Test<a name="line.155"></a>
-<span class="sourceLineNo">156</span> public void testRestoreSnapshot() throws IOException {<a name="line.156"></a>
-<span class="sourceLineNo">157</span> verifyRowCount(TEST_UTIL, tableName, snapshot1Rows);<a name="line.157"></a>
-<span class="sourceLineNo">158</span> admin.disableTable(tableName);<a name="line.158"></a>
-<span class="sourceLineNo">159</span> admin.snapshot(snapshotName1, tableName);<a name="line.159"></a>
-<span class="sourceLineNo">160</span> // Restore from snapshot-0<a name="line.160"></a>
-<span class="sourceLineNo">161</span> admin.restoreSnapshot(snapshotName0);<a name="line.161"></a>
-<span class="sourceLineNo">162</span> admin.enableTable(tableName);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> verifyRowCount(TEST_UTIL, tableName, snapshot0Rows);<a name="line.163"></a>
-<span class="sourceLineNo">164</span> SnapshotTestingUtils.verifyReplicasCameOnline(tableName, admin, getNumReplicas());<a name="line.164"></a>
-<span class="sourceLineNo">165</span><a name="line.165"></a>
-<span class="sourceLineNo">166</span> // Restore from emptySnapshot<a name="line.166"></a>
-<span class="sourceLineNo">167</span> admin.disableTable(tableName);<a name="line.167"></a>
-<span class="sourceLineNo">168</span> admin.restoreSnapshot(emptySnapshot);<a name="line.168"></a>
-<span class="sourceLineNo">169</span> admin.enableTable(tableName);<a name="line.169"></a>
-<span class="sourceLineNo">170</span> verifyRowCount(TEST_UTIL, tableName, 0);<a name="line.170"></a>
-<span class="sourceLineNo">171</span> SnapshotTestingUtils.verifyReplicasCameOnline(tableName, admin, getNumReplicas());<a name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span> // Restore from snapshot-1<a name="line.173"></a>
-<span class="sourceLineNo">174</span> admin.disableTable(tableName);<a name="line.174"></a>
-<span class="sourceLineNo">175</span> admin.restoreSnapshot(snapshotName1);<a name="line.175"></a>
-<span class="sourceLineNo">176</span> admin.enableTable(tableName);<a name="line.176"></a>
-<span class="sourceLineNo">177</span> verifyRowCount(TEST_UTIL, tableName, snapshot1Rows);<a name="line.177"></a>
-<span class="sourceLineNo">178</span> SnapshotTestingUtils.verifyReplicasCameOnline(tableName, admin, getNumReplicas());<a name="line.178"></a>
-<span class="sourceLineNo">179</span><a name="line.179"></a>
-<span class="sourceLineNo">180</span> // Restore from snapshot-1<a name="line.180"></a>
-<span class="sourceLineNo">181</span> TEST_UTIL.deleteTable(tableName);<a name="line.181"></a>
-<span class="sourceLineNo">182</span> admin.restoreSnapshot(snapshotName1);<a name="line.182"></a>
-<span class="sourceLineNo">183</span> verifyRowCount(TEST_UTIL, tableName, snapshot1Rows);<a name="line.183"></a>
-<span class="sourceLineNo">184</span> SnapshotTestingUtils.verifyReplicasCameOnline(tableName, admin, getNumReplicas());<a name="line.184"></a>
-<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span> protected int getNumReplicas() {<a name="line.187"></a>
-<span class="sourceLineNo">188</span> return 1;<a name="line.188"></a>
-<span class="sourceLineNo">189</span> }<a name="line.189"></a>
-<span class="sourceLineNo">190</span><a name="line.190"></a>
-<span class="sourceLineNo">191</span> protected HColumnDescriptor getTestRestoreSchemaChangeHCD() {<a name="line.191"></a>
-<span class="sourceLineNo">192</span> return new HColumnDescriptor(TEST_FAMILY2);<a name="line.192"></a>
-<span class="sourceLineNo">193</span> }<a name="line.193"></a>
-<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span> @Test<a name="line.195"></a>
-<span class="sourceLineNo">196</span> public void testRestoreSchemaChange() throws Exception {<a name="line.196"></a>
-<span class="sourceLineNo">197</span> Table table = TEST_UTIL.getConnection().getTable(tableName);<a name="line.197"></a>
-<span class="sourceLineNo">198</span><a name="line.198"></a>
-<span class="sourceLineNo">199</span> // Add one column family and put some data in it<a name="line.199"></a>
-<span class="sourceLineNo">200</span> admin.disableTable(tableName);<a name="line.200"></a>
-<span class="sourceLineNo">201</span> admin.addColumnFamily(tableName, getTestRestoreSchemaChangeHCD());<a name="line.201"></a>
-<span class="sourceLineNo">202</span> admin.enableTable(tableName);<a name="line.202"></a>
-<span class="sourceLineNo">203</span> assertEquals(2, table.getTableDescriptor().getFamilies().size());<a name="line.203"></a>
-<span class="sourceLineNo">204</span> HTableDescriptor htd = admin.getTableDescriptor(tableName);<a name="line.204"></a>
-<span class="sourceLineNo">205</span> assertEquals(2, htd.getFamilies().size());<a name="line.205"></a>
-<span class="sourceLineNo">206</span> SnapshotTestingUtils.loadData(TEST_UTIL, tableName, 500, TEST_FAMILY2);<a name="line.206"></a>
-<span class="sourceLineNo">207</span> long snapshot2Rows = snapshot1Rows + 500L;<a name="line.207"></a>
-<span class="sourceLineNo">208</span> assertEquals(snapshot2Rows, countRows(table));<a name="line.208"></a>
-<span class="sourceLineNo">209</span> assertEquals(500, countRows(table, TEST_FAMILY2));<a name="line.209"></a>
-<span class="sourceLineNo">210</span> Set<String> fsFamilies = getFamiliesFromFS(tableName);<a name="line.210"></a>
-<span class="sourceLineNo">211</span> assertEquals(2, fsFamilies.size());<a name="line.211"></a>
-<span class="sourceLineNo">212</span><a name="line.212"></a>
-<span class="sourceLineNo">213</span> // Take a snapshot<a name="line.213"></a>
-<span class="sourceLineNo">214</span> admin.disableTable(tableName);<a name="line.214"></a>
-<span class="sourceLineNo">215</span> admin.snapshot(snapshotName2, tableName);<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span> // Restore the snapshot (without the cf)<a name="line.217"></a>
-<span class="sourceLineNo">218</span> admin.restoreSnapshot(snapshotName0);<a name="line.218"></a>
-<span class="sourceLineNo">219</span> admin.enableTable(tableName);<a name="line.219"></a>
-<span class="sourceLineNo">220</span> assertEquals(1, table.getTableDescriptor().getFamilies().size());<a name="line.220"></a>
-<span class="sourceLineNo">221</span> try {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> countRows(table, TEST_FAMILY2);<a name="line.222"></a>
-<span class="sourceLineNo">223</span> fail("family '" + Bytes.toString(TEST_FAMILY2) + "' should not exists");<a name="line.223"></a>
-<span class="sourceLineNo">224</span> } catch (NoSuchColumnFamilyException e) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span> // expected<a name="line.225"></a>
-<span class="sourceLineNo">226</span> }<a name="line.226"></a>
-<span class="sourceLineNo">227</span> assertEquals(snapshot0Rows, countRows(table));<a name="line.227"></a>
-<span class="sourceLineNo">228</span> htd = admin.getTableDescriptor(tableName);<a name="line.228"></a>
-<span class="sourceLineNo">229</span> assertEquals(1, htd.getFamilies().size());<a name="line.229"></a>
-<span class="sourceLineNo">230</span> fsFamilies = getFamiliesFromFS(tableName);<a name="line.230"></a>
-<span class="sourceLineNo">231</span> assertEquals(1, fsFamilies.size());<a name="line.231"></a>
-<span class="sourceLineNo">232</span><a name="line.232"></a>
-<span class="sourceLineNo">233</span> // Restore back the snapshot (with the cf)<a name="line.233"></a>
-<span class="sourceLineNo">234</span> admin.disableTable(tableName);<a name="line.234"></a>
-<span class="sourceLineNo">235</span> admin.restoreSnapshot(snapshotName2);<a name="line.235"></a>
-<span class="sourceLineNo">236</span> admin.enableTable(tableName);<a name="line.236"></a>
-<span class="sourceLineNo">237</span> htd = admin.getTableDescriptor(tableName);<a name="line.237"></a>
-<span class="sourceLineNo">238</span> assertEquals(2, htd.getFamilies().size());<a name="line.238"></a>
-<span class="sourceLineNo">239</span> assertEquals(2, table.getTableDescriptor().getFamilies().size());<a name="line.239"></a>
-<span class="sourceLineNo">240</span> assertEquals(500, countRows(table, TEST_FAMILY2));<a name="line.240"></a>
-<span class="sourceLineNo">241</span> assertEquals(snapshot2Rows, countRows(table));<a name="line.241"></a>
-<span class="sourceLineNo">242</span> fsFamilies = getFamiliesFromFS(tableName);<a name="line.242"></a>
-<span class="sourceLineNo">243</span> assertEquals(2, fsFamilies.size());<a name="line.243"></a>
-<span class="sourceLineNo">244</span> table.close();<a name="line.244"></a>
-<span class="sourceLineNo">245</span> }<a name="line.245"></a>
-<span class="sourceLineNo">246</span><a name="line.246"></a>
-<span class="sourceLineNo">247</span> @Test<a name="line.247"></a>
-<span class="sourceLineNo">248</span> public void testCloneSnapshotOfCloned() throws IOException, InterruptedException {<a name="line.248"></a>
-<span class="sourceLineNo">249</span> TableName clonedTableName = TableName.valueOf(name.getMethodName() + "-" + System.currentTimeMillis());<a name="line.249"></a>
-<span class="sourceLineNo">250</span> admin.cloneSnapshot(snapshotName0, clonedTableName);<a name="line.250"></a>
-<span class="sourceLineNo">251</span> verifyRowCount(TEST_UTIL, clonedTableName, snapshot0Rows);<a name="line.251"></a>
-<span class="sourceLineNo">252</span> SnapshotTestingUtils.verifyReplicasCameOnline(clonedTableName, admin, getNumReplicas());<a name="line.252"></a>
-<span class="sourceLineNo">253</span> admin.disableTable(clonedTableName);<a name="line.253"></a>
-<span class="sourceLineNo">254</span> admin.snapshot(snapshotName2, clonedTableName);<a name="line.254"></a>
-<span class="sourceLineNo">255</span> TEST_UTIL.deleteTable(clonedTableName);<a name="line.255"></a>
-<span class="sourceLineNo">256</span> waitCleanerRun();<a name="line.256"></a>
-<span class="sourceLineNo">257</span><a name="line.257"></a>
-<span class="sourceLineNo">258</span> admin.cloneSnapshot(snapshotName2, clonedTableName);<a name="line.258"></a>
-<span class="sourceLineNo">259</span> verifyRowCount(TEST_UTIL, clonedTableName, snapshot0Rows);<a name="line.259"></a>
-<span class="sourceLineNo">260</span> SnapshotTestingUtils.verifyReplicasCameOnline(clonedTableName, admin, getNumReplicas());<a name="line.260"></a>
-<span class="sourceLineNo">261</span> TEST_UTIL.deleteTable(clonedTableName);<a name="line.261"></a>
-<span class="sourceLineNo">262</span> }<a name="line.262"></a>
-<span class="sourceLineNo">263</span><a name="line.263"></a>
-<span class="sourceLineNo">264</span> @Test<a name="line.264"></a>
-<span class="sourceLineNo">265</span> public void testCloneAndRestoreSnapshot() throws IOException, InterruptedException {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> TEST_UTIL.deleteTable(tableName);<a name="line.266"></a>
-<span class="sourceLineNo">267</span> waitCleanerRun();<a name="line.267"></a>
-<span class="sourceLineNo">268</span><a name="line.268"></a>
-<span class="sourceLineNo">269</span> admin.cloneSnapshot(snapshotName0, tableName);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> verifyRowCount(TEST_UTIL, tableName, snapshot0Rows);<a name="line.270"></a>
-<span class="sourceLineNo">271</span> SnapshotTestingUtils.verifyReplicasCameOnline(tableName, admin, getNumReplicas());<a name="line.271"></a>
-<span class="sourceLineNo">272</span> waitCleanerRun();<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span> admin.disableTable(tableName);<a name="line.274"></a>
-<span class="sourceLineNo">275</span> admin.restoreSnapshot(snapshotName0);<a name="line.275"></a>
-<span class="sourceLineNo">276</span> admin.enableTable(tableName);<a name="line.276"></a>
-<span class="sourceLineNo">277</span> verifyRowCount(TEST_UTIL, tableName, snapshot0Rows);<a name="line.277"></a>
-<span class="sourceLineNo">278</span> SnapshotTestingUtils.verifyReplicasCameOnline(tableName, admin, getNumReplicas());<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> @Test<a name="line.281"></a>
-<span class="sourceLineNo">282</span> public void testCorruptedSnapshot() throws IOException, InterruptedException {<a name="line.282"></a>
-<span class="sourceLineNo">283</span> SnapshotTestingUtils.corruptSnapshot(TEST_UTIL, Bytes.toString(snapshotName0));<a name="line.283"></a>
-<span class="sourceLineNo">284</span> TableName cloneName = TableName.valueOf(name.getMethodName() + "-" + System.currentTimeMillis());<a name="line.284"></a>
-<span class="sourceLineNo">285</span> try {<a name="line.285"></a>
-<span class="sourceLineNo">286</span> admin.cloneSnapshot(snapshotName0, cloneName);<a name="line.286"></a>
-<span class="sourceLineNo">287</span> fail("Expected CorruptedSnapshotException, got succeeded cloneSnapshot()");<a name="line.287"></a>
-<span class="sourceLineNo">288</span> } catch (CorruptedSnapshotException e) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span> // Got the expected corruption exception.<a name="line.289"></a>
-<span class="sourceLineNo">290</span> // check for no references of the cloned table.<a name="line.290"></a>
-<span class="sourceLineNo">291</span> assertFalse(admin.tableExists(cloneName));<a name="line.291"></a>
-<span class="sourceLineNo">292</span> } catch (Exception e) {<a name="line.292"></a>
-<span class="sourceLineNo">293</span> fail("Expected CorruptedSnapshotException got: " + e);<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> // ==========================================================================<a name="line.297"></a>
-<span class="sourceLineNo">298</span> // Helpers<a name="line.298"></a>
-<span class="sourceLineNo">299</span> // ==========================================================================<a name="line.299"></a>
-<span class="sourceLineNo">300</span> private void waitCleanerRun() throws InterruptedException {<a name="line.300"></a>
-<span class="sourceLineNo">301</span> TEST_UTIL.getMiniHBaseCluster().getMaster().getHFileCleaner().choreForTesting();<a name="line.301"></a>
-<span class="sourceLineNo">302</span> }<a name="line.302"></a>
-<span class="sourceLineNo">303</span><a name="line.303"></a>
-<span class="sourceLineNo">304</span> private Set<String> getFamiliesFromFS(final TableName tableName) throws IOException {<a name="line.304"></a>
-<span class="sourceLineNo">305</span> MasterFileSystem mfs = TEST_UTIL.getMiniHBaseCluster().getMaster().getMasterFileSystem();<a name="line.305"></a>
-<span class="sourceLineNo">306</span> Set<String> families = new HashSet<>();<a name="line.306"></a>
-<span class="sourceLineNo">307</span> Path tableDir = FSUtils.getTableDir(mfs.getRootDir(), tableName);<a name="line.307"></a>
-<span class="sourceLineNo">308</span> for (Path regionDir: FSUtils.getRegionDirs(mfs.getFileSystem(), tableDir)) {<a name="line.308"></a>
-<span class="sourceLineNo">309</span> for (Path familyDir: FSUtils.getFamilyDirs(mfs.getFileSystem(), regionDir)) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span> families.add(familyDir.getName());<a name="line.310"></a>
-<span class="sourceLineNo">311</span> }<a name="line.311"></a>
-<span class="sourceLineNo">312</span> }<a name="line.312"></a>
-<span class="sourceLineNo">313</span> return families;<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> protected void verifyRowCount(final HBaseTestingUtility util, final TableName tableName,<a name="line.316"></a>
-<span class="sourceLineNo">317</span> long expectedRows) throws IOException {<a name="line.317"></a>
-<span class="sourceLineNo">318</span> SnapshotTestingUtils.verifyRowCount(util, tableName, expectedRows);<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> protected int countRows(final Table table, final byte[]... families) throws IOException {<a name="line.321"></a>
-<span class="sourceLineNo">322</span> return TEST_UTIL.countRows(table, families);<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">027</span><a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.conf.Configuration;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.fs.Path;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.HConstants;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.TableName;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.master.MasterFileSystem;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.master.snapshot.SnapshotManager;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.regionserver.NoSuchColumnFamilyException;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.snapshot.CorruptedSnapshotException;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<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.FSUtils;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.junit.After;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.junit.AfterClass;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.junit.Before;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.junit.BeforeClass;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.junit.ClassRule;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.junit.Rule;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.junit.Test;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.junit.experimental.categories.Category;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.junit.rules.TestName;<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span>/**<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * Test restore snapshots from the client<a name="line.56"></a>
+<span class="sourceLineNo">057</span> */<a name="line.57"></a>
+<span class="sourceLineNo">058</span>@Category({LargeTests.class, ClientTests.class})<a name="line.58"></a>
+<span class="sourceLineNo">059</span>public class TestRestoreSnapshotFromClient {<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span> @ClassRule<a name="line.61"></a>
+<span class="sourceLineNo">062</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.62"></a>
+<span class="sourceLineNo">063</span> HBaseClassTestRule.forClass(TestRestoreSnapshotFromClient.class);<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span> protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span> protected final byte[] FAMILY = Bytes.toBytes("cf");<a name="line.67"></a>
+<span class="sourceLineNo">068</span> protected final byte[] TEST_FAMILY2 = Bytes.toBytes("cf2");<a name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span> protected TableName tableName;<a name="line.70"></a>
+<span class="sourceLineNo">071</span> protected byte[] emptySnapshot;<a name="line.71"></a>
+<span class="sourceLineNo">072</span> protected byte[] snapshotName0;<a name="line.72"></a>
+<span class="sourceLineNo">073</span> protected byte[] snapshotName1;<a name="line.73"></a>
+<span class="sourceLineNo">074</span> protected byte[] snapshotName2;<a name="line.74"></a>
+<span class="sourceLineNo">075</span> protected int snapshot0Rows;<a name="line.75"></a>
+<span class="sourceLineNo">076</span> protected int snapshot1Rows;<a name="line.76"></a>
+<span class="sourceLineNo">077</span> protected Admin admin;<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span> @Rule<a name="line.79"></a>
+<span class="sourceLineNo">080</span> public TestName name = new TestName();<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span> @BeforeClass<a name="line.82"></a>
+<span class="sourceLineNo">083</span> public static void setupCluster() throws Exception {<a name="line.83"></a>
+<span class="sourceLineNo">084</span> setupConf(TEST_UTIL.getConfiguration());<a name="line.84"></a>
+<span class="sourceLineNo">085</span> TEST_UTIL.startMiniCluster(3);<a name="line.85"></a>
+<span class="sourceLineNo">086</span> }<a name="line.86"></a>
+<span class="sourceLineNo">087</span><a name="line.87"></a>
+<span class="sourceLineNo">088</span> protected static void setupConf(Configuration conf) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span> TEST_UTIL.getConfiguration().setBoolean(SnapshotManager.HBASE_SNAPSHOT_ENABLED, true);<a name="line.89"></a>
+<span class="sourceLineNo">090</span> TEST_UTIL.getConfiguration().setInt("hbase.hstore.compactionThreshold", 10);<a name="line.90"></a>
+<span class="sourceLineNo">091</span> TEST_UTIL.getConfiguration().setInt("hbase.regionserver.msginterval", 100);<a name="line.91"></a>
+<span class="sourceLineNo">092</span> TEST_UTIL.getConfiguration().setInt("hbase.client.pause", 250);<a name="line.92"></a>
+<span class="sourceLineNo">093</span> TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 6);<a name="line.93"></a>
+<span class="sourceLineNo">094</span> TEST_UTIL.getConfiguration().setBoolean(<a name="line.94"></a>
+<span class="sourceLineNo">095</span> "hbase.master.enabletable.roundrobin", true);<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> @AfterClass<a name="line.98"></a>
+<span class="sourceLineNo">099</span> public static void tearDownAfterClass() throws Exception {<a name="line.99"></a>
+<span class="sourceLineNo">100</span> TEST_UTIL.shutdownMiniCluster();<a name="line.100"></a>
+<span class="sourceLineNo">101</span> }<a name="line.101"></a>
+<span class="sourceLineNo">102</span><a name="line.102"></a>
+<span class="sourceLineNo">103</span> /**<a name="line.103"></a>
+<span class="sourceLineNo">104</span> * Initialize the tests with a table filled with some data<a name="line.104"></a>
+<span class="sourceLineNo">105</span> * and two snapshots (snapshotName0, snapshotName1) of different states.<a name="line.105"></a>
+<span class="sourceLineNo">106</span> * The tableName, snapshotNames and the number of rows in the snapshot are initialized.<a name="line.106"></a>
+<span class="sourceLineNo">107</span> */<a name="line.107"></a>
+<span class="sourceLineNo">108</span> @Before<a name="line.108"></a>
+<span class="sourceLineNo">109</span> public void setup() throws Exception {<a name="line.109"></a>
+<span class="sourceLineNo">110</span> this.admin = TEST_UTIL.getAdmin();<a name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span> long tid = System.currentTimeMillis();<a name="line.112"></a>
+<span class="sourceLineNo">113</span> tableName = TableName.valueOf(name.getMethodName() + "-" + tid);<a name="line.113"></a>
+<span class="sourceLineNo">114</span> emptySnapshot = Bytes.toBytes("emptySnaptb-" + tid);<a name="line.114"></a>
+<span class="sourceLineNo">115</span> snapshotName0 = Bytes.toBytes("snaptb0-" + tid);<a name="line.115"></a>
+<span class="sourceLineNo">116</span> snapshotName1 = Bytes.toBytes("snaptb1-" + tid);<a name="line.116"></a>
+<span class="sourceLineNo">117</span> snapshotName2 = Bytes.toBytes("snaptb2-" + tid);<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span> // create Table and disable it<a name="line.119"></a>
+<span class="sourceLineNo">120</span> createTable();<a name="line.120"></a>
+<span class="sourceLineNo">121</span> admin.disableTable(tableName);<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span> // take an empty snapshot<a name="line.123"></a>
+<span class="sourceLineNo">124</span> admin.snapshot(emptySnapshot, tableName);<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span> // enable table and insert data<a name="line.126"></a>
+<span class="sourceLineNo">127</span> admin.enableTable(tableName);<a name="line.127"></a>
+<span class="sourceLineNo">128</span> SnapshotTestingUtils.loadData(TEST_UTIL, tableName, 500, FAMILY);<a name="line.128"></a>
+<span class="sourceLineNo">129</span> try (Table table = TEST_UTIL.getConnection().getTable(tableName)) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> snapshot0Rows = countRows(table);<a name="line.130"></a>
+<span class="sourceLineNo">131</span> }<a name="line.131"></a>
+<span class="sourceLineNo">132</span> admin.disableTable(tableName);<a name="line.132"></a>
+<span class="sourceLineNo">133</span><a name="line.133"></a>
+<span class="sourceLineNo">134</span> // take a snapshot<a name="line.134"></a>
+<span class="sourceLineNo">135</span> admin.snapshot(snapshotName0, tableName);<a name="line.135"></a>
+<span class="sourceLineNo">136</span><a name="line.136"></a>
+<span class="sourceLineNo">137</span> // enable table and insert more data<a name="line.137"></a>
+<span class="sourceLineNo">138</span> admin.enableTable(tableName);<a name="line.138"></a>
+<span class="sourceLineNo">139</span> SnapshotTestingUtils.loadData(TEST_UTIL, tableName, 500, FAMILY);<a name="line.139"></a>
+<span class="sourceLineNo">140</span> try (Table table = TEST_UTIL.getConnection().getTable(tableName)) {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> snapshot1Rows = countRows(table);<a name="line.141"></a>
+<span class="sourceLineNo">142</span> }<a name="line.142"></a>
+<span class="sourceLineNo">143</span> }<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span> protected void createTable() throws Exception {<a name="line.145"></a>
+<span class="sourceLineNo">146</span> SnapshotTestingUtils.createTable(TEST_UTIL, tableName, getNumReplicas(), FAMILY);<a name="line.146"></a>
+<span class="sourceLineNo">147</span> }<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span> @After<a name="line.149"></a>
+<span class="sourceLineNo">150</span> public void tearDown() throws Exception {<a name="line.150"></a>
+<span class="sourceLineNo">151</span> TEST_UTIL.deleteTable(tableName);<a name="line.151"></a>
+<span class="sourceLineNo">152</span> SnapshotTestingUtils.deleteAllSnapshots(TEST_UTIL.getAdmin());<a name="line.152"></a>
+<span class="sourceLineNo">153</span> SnapshotTestingUtils.deleteArchiveDirectory(TEST_UTIL);<a name="line.153"></a>
+<span class="sourceLineNo">154</span> }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span> @Test<a name="line.156"></a>
+<span class="sourceLineNo">157</span> public void testRestoreSnapshot() throws IOException {<a name="line.157"></a>
+<span class="sourceLineNo">158</span> verifyRowCount(TEST_UTIL, tableName, snapshot1Rows);<a name="line.158"></a>
+<span class="sourceLineNo">159</span> admin.disableTable(tableName);<a name="line.159"></a>
+<span class="sourceLineNo">160</span> admin.snapshot(snapshotName1, tableName);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> // Restore from snapshot-0<a name="line.161"></a>
+<span class="sourceLineNo">162</span> admin.restoreSnapshot(snapshotName0);<a name="line.162"></a>
+<span class="sourceLineNo">163</span> admin.enableTable(tableName);<a name="line.163"></a>
+<span class="sourceLineNo">164</span> verifyRowCount(TEST_UTIL, tableName, snapshot0Rows);<a name="line.164"></a>
+<span class="sourceLineNo">165</span> SnapshotTestingUtils.verifyReplicasCameOnline(tableName, admin, getNumReplicas());<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span> // Restore from emptySnapshot<a name="line.167"></a>
+<span class="sourceLineNo">168</span> admin.disableTable(tableName);<a name="line.168"></a>
+<span class="sourceLineNo">169</span> admin.restoreSnapshot(emptySnapshot);<a name="line.169"></a>
+<span class="sourceLineNo">170</span> admin.enableTable(tableName);<a name="line.170"></a>
+<span class="sourceLineNo">171</span> verifyRowCount(TEST_UTIL, tableName, 0);<a name="line.171"></a>
+<span class="sourceLineNo">172</span> SnapshotTestingUtils.verifyReplicasCameOnline(tableName, admin, getNumReplicas());<a name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span> // Restore from snapshot-1<a name="line.174"></a>
+<span class="sourceLineNo">175</span> admin.disableTable(tableName);<a name="line.175"></a>
+<span class="sourceLineNo">176</span> admin.restoreSnapshot(snapshotName1);<a name="line.176"></a>
+<span class="sourceLineNo">177</span> admin.enableTable(tableName);<a name="line.177"></a>
+<span class="sourceLineNo">178</span> verifyRowCount(TEST_UTIL, tableName, snapshot1Rows);<a name="line.178"></a>
+<span class="sourceLineNo">179</span> SnapshotTestingUtils.verifyReplicasCameOnline(tableName, admin, getNumReplicas());<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span> // Restore from snapshot-1<a name="line.181"></a>
+<span class="sourceLineNo">182</span> TEST_UTIL.deleteTable(tableName);<a name="line.182"></a>
+<span class="sourceLineNo">183</span> admin.restoreSnapshot(snapshotName1);<a name="line.183"></a>
+<span class="sourceLineNo">184</span> verifyRowCount(TEST_UTIL, tableName, snapshot1Rows);<a name="line.184"></a>
+<span class="sourceLineNo">185</span> SnapshotTestingUtils.verifyReplicasCameOnline(tableName, admin, getNumReplicas());<a name="line.185"></a>
+<span class="sourceLineNo">186</span> }<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span> protected int getNumReplicas() {<a name="line.188"></a>
+<span class="sourceLineNo">189</span> return 1;<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> protected HColumnDescriptor getTestRestoreSchemaChangeHCD() {<a name="line.192"></a>
+<span class="sourceLineNo">193</span> return new HColumnDescriptor(TEST_FAMILY2);<a name="line.193"></a>
+<span class="sourceLineNo">194</span> }<a name="line.194"></a>
+<span class="sourceLineNo">195</span><a name="line.195"></a>
+<span class="sourceLineNo">196</span> @Test<a name="line.196"></a>
+<span class="sourceLineNo">197</span> public void testRestoreSchemaChange() throws Exception {<a name="line.197"></a>
+<span class="sourceLineNo">198</span> Table table = TEST_UTIL.getConnection().getTable(tableName);<a name="line.198"></a>
+<span class="sourceLineNo">199</span><a name="line.199"></a>
+<span class="sourceLineNo">200</span> // Add one column family and put some data in it<a name="line.200"></a>
+<span class="sourceLineNo">201</span> admin.disableTable(tableName);<a name="line.201"></a>
+<span class="sourceLineNo">202</span> admin.addColumnFamily(tableName, getTestRestoreSchemaChangeHCD());<a name="line.202"></a>
+<span class="sourceLineNo">203</span> admin.enableTable(tableName);<a name="line.203"></a>
+<span class="sourceLineNo">204</span> assertEquals(2, table.getTableDescriptor().getFamilies().size());<a name="line.204"></a>
+<span class="sourceLineNo">205</span> HTableDescriptor htd = admin.getTableDescriptor(tableName);<a name="line.205"></a>
+<span class="sourceLineNo">206</span> assertEquals(2, htd.getFamilies().size());<a name="line.206"></a>
+<span class="sourceLineNo">207</span> SnapshotTestingUtils.loadData(TEST_UTIL, tableName, 500, TEST_FAMILY2);<a name="line.207"></a>
+<span class="sourceLineNo">208</span> long snapshot2Rows = snapshot1Rows + 500L;<a name="line.208"></a>
+<span class="sourceLineNo">209</span> assertEquals(snapshot2Rows, countRows(table));<a name="line.209"></a>
+<span class="sourceLineNo">210</span> assertEquals(500, countRows(table, TEST_FAMILY2));<a name="line.210"></a>
+<span class="sourceLineNo">211</span> Set<String> fsFamilies = getFamiliesFromFS(tableName);<a name="line.211"></a>
+<span class="sourceLineNo">212</span> assertEquals(2, fsFamilies.size());<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span> // Take a snapshot<a name="line.214"></a>
+<span class="sourceLineNo">215</span> admin.disableTable(tableName);<a name="line.215"></a>
+<span class="sourceLineNo">216</span> admin.snapshot(snapshotName2, tableName);<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span> // Restore the snapshot (without the cf)<a name="line.218"></a>
+<span class="sourceLineNo">219</span> admin.restoreSnapshot(snapshotName0);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> admin.enableTable(tableName);<a name="line.220"></a>
+<span class="sourceLineNo">221</span> assertEquals(1, table.getTableDescriptor().getFamilies().size());<a name="line.221"></a>
+<span class="sourceLineNo">222</span> try {<a name="line.222"></a>
+<span class="sourceLineNo">223</span> countRows(table, TEST_FAMILY2);<a name="line.223"></a>
+<span class="sourceLineNo">224</span> fail("family '" + Bytes.toString(TEST_FAMILY2) + "' should not exists");<a name="line.224"></a>
+<span class="sourceLineNo">225</span> } catch (NoSuchColumnFamilyException e) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span> // expected<a name="line.226"></a>
+<span class="sourceLineNo">227</span> }<a name="line.227"></a>
+<span class="sourceLineNo">228</span> assertEquals(snapshot0Rows, countRows(table));<a name="line.228"></a>
+<span class="sourceLineNo">229</span> htd = admin.getTableDescriptor(tableName);<a name="line.229"></a>
+<span class="sourceLineNo">230</span> assertEquals(1, htd.getFamilies().size());<a name="line.230"></a>
+<span class="sourceLineNo">231</span> fsFamilies = getFamiliesFromFS(tableName);<a name="line.231"></a>
+<span class="sourceLineNo">232</span> assertEquals(1, fsFamilies.size());<a name="line.232"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">234</span> // Restore back the snapshot (with the cf)<a name="line.234"></a>
+<span class="sourceLineNo">235</span> admin.disableTable(tableName);<a name="line.235"></a>
+<span class="sourceLineNo">236</span> admin.restoreSnapshot(snapshotName2);<a name="line.236"></a>
+<span class="sourceLineNo">237</span> admin.enableTable(tableName);<a name="line.237"></a>
+<span class="sourceLineNo">238</span> htd = admin.getTableDescriptor(tableName);<a name="line.238"></a>
+<span class="sourceLineNo">239</span> assertEquals(2, htd.getFamilies().size());<a name="line.239"></a>
+<span class="sourceLineNo">240</span> assertEquals(2, table.getTableDescriptor().getFamilies().size());<a name="line.240"></a>
+<span class="sourceLineNo">241</span> assertEquals(500, countRows(table, TEST_FAMILY2));<a name="line.241"></a>
+<span class="sourceLineNo">242</span> assertEquals(snapshot2Rows, countRows(table));<a name="line.242"></a>
+<span class="sourceLineNo">243</span> fsFamilies = getFamiliesFromFS(tableName);<a name="line.243"></a>
+<span class="sourceLineNo">244</span> assertEquals(2, fsFamilies.size());<a name="line.244"></a>
+<span class="sourceLineNo">245</span> table.close();<a name="line.245"></a>
+<span class="sourceLineNo">246</span> }<a name="line.246"></a>
+<span class="sourceLineNo">247</span><a name="line.247"></a>
+<span class="sourceLineNo">248</span> @Test<a name="line.248"></a>
+<span class="sourceLineNo">249</span> public void testCloneSnapshotOfCloned() throws IOException, InterruptedException {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> TableName clonedTableName = TableName.valueOf(name.getMethodName() + "-" + System.currentTimeMillis());<a name="line.250"></a>
+<span class="sourceLineNo">251</span> admin.cloneSnapshot(snapshotName0, clonedTableName);<a name="line.251"></a>
+<span class="sourceLineNo">252</span> verifyRowCount(TEST_UTIL, clonedTableName, snapshot0Rows);<a name="line.252"></a>
+<span class="sourceLineNo">253</span> SnapshotTestingUtils.verifyReplicasCameOnline(clonedTableName, admin, getNumReplicas());<a name="line.253"></a>
+<span class="sourceLineNo">254</span> admin.disableTable(clonedTableName);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> admin.snapshot(snapshotName2, clonedTableName);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> TEST_UTIL.deleteTable(clonedTableName);<a name="line.256"></a>
+<span class="sourceLineNo">257</span> waitCleanerRun();<a name="line.257"></a>
+<span class="sourceLineNo">258</span><a name="line.258"></a>
+<span class="sourceLineNo">259</span> admin.cloneSnapshot(snapshotName2, clonedTableName);<a name="line.259"></a>
+<span class="sourceLineNo">260</span> verifyRowCount(TEST_UTIL, clonedTableName, snapshot0Rows);<a name="line.260"></a>
+<span class="sourceLineNo">261</span> SnapshotTestingUtils.verifyReplicasCameOnline(clonedTableName, admin, getNumReplicas());<a name="line.261"></a>
+<span class="sourceLineNo">262</span> TEST_UTIL.deleteTable(clonedTableName);<a name="line.262"></a>
+<span class="sourceLineNo">263</span> }<a name="line.263"></a>
+<span class="sourceLineNo">264</span><a name="line.264"></a>
+<span class="sourceLineNo">265</span> @Test<a name="line.265"></a>
+<span class="sourceLineNo">266</span> public void testCloneAndRestoreSnapshot() throws IOException, InterruptedException {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> TEST_UTIL.deleteTable(tableName);<a name="line.267"></a>
+<span class="sourceLineNo">268</span> waitCleanerRun();<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> admin.cloneSnapshot(snapshotName0, tableName);<a name="line.270"></a>
+<span class="sourceLineNo">271</span> verifyRowCount(TEST_UTIL, tableName, snapshot0Rows);<a name="line.271"></a>
+<span class="sourceLineNo">272</span> SnapshotTestingUtils.verifyReplicasCameOnline(tableName, admin, getNumReplicas());<a name="line.272"></a>
+<span class="sourceLineNo">273</span> waitCleanerRun();<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span> admin.disableTable(tableName);<a name="line.275"></a>
+<span class="sourceLineNo">276</span> admin.restoreSnapshot(snapshotName0);<a name="line.276"></a>
+<span class="sourceLineNo">277</span> admin.enableTable(tableName);<a name="line.277"></a>
+<span class="sourceLineNo">278</span> verifyRowCount(TEST_UTIL, tableName, snapshot0Rows);<a name="line.278"></a>
+<span class="sourceLineNo">279</span> SnapshotTestingUtils.verifyReplicasCameOnline(tableName, admin, getNumReplicas());<a name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span> @Test<a name="line.282"></a>
+<span class="sourceLineNo">283</span> public void testCorruptedSnapshot() throws IOException, InterruptedException {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> SnapshotTestingUtils.corruptSnapshot(TEST_UTIL, Bytes.toString(snapshotName0));<a name="line.284"></a>
+<span class="sourceLineNo">285</span> TableName cloneName = TableName.valueOf(name.getMethodName() + "-" + System.currentTimeMillis());<a name="line.285"></a>
+<span class="sourceLineNo">286</span> try {<a name="line.286"></a>
+<span class="sourceLineNo">287</span> admin.cloneSnapshot(snapshotName0, cloneName);<a name="line.287"></a>
+<span class="sourceLineNo">288</span> fail("Expected CorruptedSnapshotException, got succeeded cloneSnapshot()");<a name="line.288"></a>
+<span class="sourceLineNo">289</span> } catch (CorruptedSnapshotException e) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span> // Got the expected corruption exception.<a name="line.290"></a>
+<span class="sourceLineNo">291</span> // check for no references of the cloned table.<a name="line.291"></a>
+<span class="sourceLineNo">292</span> assertFalse(admin.tableExists(cloneName));<a name="line.292"></a>
+<span class="sourceLineNo">293</span> } catch (Exception e) {<a name="line.293"></a>
+<span class="sourceLineNo">294</span> fail("Expected CorruptedSnapshotException got: " + e);<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><a name="line.297"></a>
+<span class="sourceLineNo">298</span> // ==========================================================================<a name="line.298"></a>
+<span class="sourceLineNo">299</span> // Helpers<a name="line.299"></a>
+<span class="sourceLineNo">300</span> // ==========================================================================<a name="line.300"></a>
+<span class="sourceLineNo">301</span> private void waitCleanerRun() throws InterruptedException {<a name="line.301"></a>
+<span class="sourceLineNo">302</span> TEST_UTIL.getMiniHBaseCluster().getMaster().getHFileCleaner().choreForTesting();<a name="line.302"></a>
+<span class="sourceLineNo">303</span> }<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span> private Set<String> getFamiliesFromFS(final TableName tableName) throws IOException {<a name="line.305"></a>
+<span class="sourceLineNo">306</span> MasterFileSystem mfs = TEST_UTIL.getMiniHBaseCluster().getMaster().getMasterFileSystem();<a name="line.306"></a>
+<span class="sourceLineNo">307</span> Set<String> families = new HashSet<>();<a name="line.307"></a>
+<span class="sourceLineNo">308</span> Path tableDir = FSUtils.getTableDir(mfs.getRootDir(), tableName);<a name="line.308"></a>
+<span class="sourceLineNo">309</span> for (Path regionDir: FSUtils.getRegionDirs(mfs.getFileSystem(), tableDir)) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> for (Path familyDir: FSUtils.getFamilyDirs(mfs.getFileSystem(), regionDir)) {<a name="line.310"></a>
+<span class="sourceLineNo">311</span> families.add(familyDir.getName());<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> return families;<a name="line.314"></a>
+<span class="sourceLineNo">315</span> }<a name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span> protected void verifyRowCount(final HBaseTestingUtility util, final TableName tableName,<a name="line.317"></a>
+<span class="sourceLineNo">318</span> long expectedRows) throws IOException {<a name="line.318"></a>
+<span class="sourceLineNo">319</span> SnapshotTestingUtils.verifyRowCount(util, tableName, expectedRows);<a name="line.319"></a>
+<span class="sourceLineNo">320</span> }<a name="line.320"></a>
+<span class="sourceLineNo">321</span><a name="line.321"></a>
+<span class="sourceLineNo">322</span> protected int countRows(final Table table, final byte[]... families) throws IOException {<a name="line.322"></a>
+<span class="sourceLineNo">323</span> return TEST_UTIL.countRows(table, families);<a name="line.323"></a>
+<span class="sourceLineNo">324</span> }<a name="line.324"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span> protected void splitRegion(final RegionInfo regionInfo) throws IOException {<a name="line.326"></a>
+<span class="sourceLineNo">327</span> byte[][] splitPoints = Bytes.split(regionInfo.getStartKey(), regionInfo.getEndKey(), 1);<a name="line.327"></a>
+<span class="sourceLineNo">328</span> admin.split(regionInfo.getTable(), splitPoints[1]);<a name="line.328"></a>
+<span class="sourceLineNo">329</span> }<a name="line.329"></a>
+<span class="sourceLineNo">330</span>}<a name="line.330"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ac54a6a8/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClientWithRegionReplicas.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClientWithRegionReplicas.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClientWithRegionReplicas.html
index 9ca9021..29f79be 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClientWithRegionReplicas.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClientWithRegionReplicas.html
@@ -25,25 +25,50 @@
<span class="sourceLineNo">017</span> */<a name="line.17"></a>
<span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.client;<a name="line.18"></a>
<span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.junit.ClassRule;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.junit.experimental.categories.Category;<a name="line.24"></a>
-<span class="sourceLineNo">025</span><a name="line.25"></a>
-<span class="sourceLineNo">026</span>@Category({LargeTests.class, ClientTests.class})<a name="line.26"></a>
-<span class="sourceLineNo">027</span>public class TestRestoreSnapshotFromClientWithRegionReplicas extends<a name="line.27"></a>
-<span class="sourceLineNo">028</span> TestRestoreSnapshotFromClient {<a name="line.28"></a>
-<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span> @ClassRule<a name="line.30"></a>
-<span class="sourceLineNo">031</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.31"></a>
-<span class="sourceLineNo">032</span> HBaseClassTestRule.forClass(TestRestoreSnapshotFromClientWithRegionReplicas.class);<a name="line.32"></a>
-<span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span> @Override<a name="line.34"></a>
-<span class="sourceLineNo">035</span> protected int getNumReplicas() {<a name="line.35"></a>
-<span class="sourceLineNo">036</span> return 3;<a name="line.36"></a>
-<span class="sourceLineNo">037</span> }<a name="line.37"></a>
-<span class="sourceLineNo">038</span>}<a name="line.38"></a>
+<span class="sourceLineNo">020</span>import java.io.IOException;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import java.util.List;<a name="line.21"></a>
+<span class="sourceLineNo">022</span><a name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.TableName;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.junit.ClassRule;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.junit.Test;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.junit.experimental.categories.Category;<a name="line.29"></a>
+<span class="sourceLineNo">030</span><a name="line.30"></a>
+<span class="sourceLineNo">031</span><a name="line.31"></a>
+<span class="sourceLineNo">032</span>@Category({LargeTests.class, ClientTests.class})<a name="line.32"></a>
+<span class="sourceLineNo">033</span>public class TestRestoreSnapshotFromClientWithRegionReplicas extends<a name="line.33"></a>
+<span class="sourceLineNo">034</span> TestRestoreSnapshotFromClient {<a name="line.34"></a>
+<span class="sourceLineNo">035</span><a name="line.35"></a>
+<span class="sourceLineNo">036</span> @ClassRule<a name="line.36"></a>
+<span class="sourceLineNo">037</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.37"></a>
+<span class="sourceLineNo">038</span> HBaseClassTestRule.forClass(TestRestoreSnapshotFromClientWithRegionReplicas.class);<a name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span> @Override<a name="line.40"></a>
+<span class="sourceLineNo">041</span> protected int getNumReplicas() {<a name="line.41"></a>
+<span class="sourceLineNo">042</span> return 3;<a name="line.42"></a>
+<span class="sourceLineNo">043</span> }<a name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span> @Test<a name="line.45"></a>
+<span class="sourceLineNo">046</span> public void testOnlineSnapshotAfterSplittingRegions() throws IOException, InterruptedException {<a name="line.46"></a>
+<span class="sourceLineNo">047</span> List<RegionInfo> regionInfos = admin.getRegions(tableName);<a name="line.47"></a>
+<span class="sourceLineNo">048</span> RegionReplicaUtil.removeNonDefaultRegions(regionInfos);<a name="line.48"></a>
+<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">050</span> // Split a region<a name="line.50"></a>
+<span class="sourceLineNo">051</span> splitRegion(regionInfos.get(0));<a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span> // Take a online snapshot<a name="line.53"></a>
+<span class="sourceLineNo">054</span> admin.snapshot(snapshotName1, tableName);<a name="line.54"></a>
+<span class="sourceLineNo">055</span><a name="line.55"></a>
+<span class="sourceLineNo">056</span> // Clone the snapshot to another table<a name="line.56"></a>
+<span class="sourceLineNo">057</span> TableName clonedTableName = TableName.valueOf(name.getMethodName() + "-" +<a name="line.57"></a>
+<span class="sourceLineNo">058</span> System.currentTimeMillis());<a name="line.58"></a>
+<span class="sourceLineNo">059</span> admin.cloneSnapshot(snapshotName1, clonedTableName);<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span> verifyRowCount(TEST_UTIL, clonedTableName, snapshot1Rows);<a name="line.61"></a>
+<span class="sourceLineNo">062</span> }<a name="line.62"></a>
+<span class="sourceLineNo">063</span>}<a name="line.63"></a>