You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2016/02/17 18:36:12 UTC
[08/18] hbase-site git commit: Published site at
9f8273e7175954cf6dd4bf523b531bf9971749bb.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/ee77a3b9/testdevapidocs/src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html
index 2ffc548..3130227 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.html
@@ -42,260 +42,260 @@
<span class="sourceLineNo">034</span>import org.apache.hadoop.conf.Configuration;<a name="line.34"></a>
<span class="sourceLineNo">035</span>import org.apache.hadoop.fs.FileSystem;<a name="line.35"></a>
<span class="sourceLineNo">036</span>import org.apache.hadoop.fs.Path;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.HConstants;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.HRegionInfo;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.TableName;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.TableNotFoundException;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.client.Table;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.master.HMaster;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.master.snapshot.SnapshotManager;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.testclassification.RegionServerTests;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.junit.After;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.junit.AfterClass;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.junit.Before;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.junit.BeforeClass;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.junit.Test;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.junit.Ignore;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.junit.experimental.categories.Category;<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span>/**<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * Test creating/using/deleting snapshots from the client<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * <p><a name="line.61"></a>
-<span class="sourceLineNo">062</span> * This is an end-to-end test for the snapshot utility<a name="line.62"></a>
-<span class="sourceLineNo">063</span> *<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * TODO This is essentially a clone of TestSnapshotFromClient. This is worth refactoring this<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * because there will be a few more flavors of snapshots that need to run these tests.<a name="line.65"></a>
-<span class="sourceLineNo">066</span> */<a name="line.66"></a>
-<span class="sourceLineNo">067</span>@Category({RegionServerTests.class, LargeTests.class})<a name="line.67"></a>
-<span class="sourceLineNo">068</span>public class TestFlushSnapshotFromClient {<a name="line.68"></a>
-<span class="sourceLineNo">069</span> private static final Log LOG = LogFactory.getLog(TestFlushSnapshotFromClient.class);<a name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span> protected static final HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.71"></a>
-<span class="sourceLineNo">072</span> protected static final int NUM_RS = 2;<a name="line.72"></a>
-<span class="sourceLineNo">073</span> protected static final byte[] TEST_FAM = Bytes.toBytes("fam");<a name="line.73"></a>
-<span class="sourceLineNo">074</span> protected static final TableName TABLE_NAME = TableName.valueOf("test");<a name="line.74"></a>
-<span class="sourceLineNo">075</span> protected final int DEFAULT_NUM_ROWS = 100;<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span> @BeforeClass<a name="line.77"></a>
-<span class="sourceLineNo">078</span> public static void setupCluster() throws Exception {<a name="line.78"></a>
-<span class="sourceLineNo">079</span> setupConf(UTIL.getConfiguration());<a name="line.79"></a>
-<span class="sourceLineNo">080</span> UTIL.startMiniCluster(NUM_RS);<a name="line.80"></a>
-<span class="sourceLineNo">081</span> }<a name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span> protected static void setupConf(Configuration conf) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> // disable the ui<a name="line.84"></a>
-<span class="sourceLineNo">085</span> conf.setInt("hbase.regionsever.info.port", -1);<a name="line.85"></a>
-<span class="sourceLineNo">086</span> // change the flush size to a small amount, regulating number of store files<a name="line.86"></a>
-<span class="sourceLineNo">087</span> conf.setInt("hbase.hregion.memstore.flush.size", 25000);<a name="line.87"></a>
-<span class="sourceLineNo">088</span> // so make sure we get a compaction when doing a load, but keep around some<a name="line.88"></a>
-<span class="sourceLineNo">089</span> // files in the store<a name="line.89"></a>
-<span class="sourceLineNo">090</span> conf.setInt("hbase.hstore.compaction.min", 10);<a name="line.90"></a>
-<span class="sourceLineNo">091</span> conf.setInt("hbase.hstore.compactionThreshold", 10);<a name="line.91"></a>
-<span class="sourceLineNo">092</span> // block writes if we get to 12 store files<a name="line.92"></a>
-<span class="sourceLineNo">093</span> conf.setInt("hbase.hstore.blockingStoreFiles", 12);<a name="line.93"></a>
-<span class="sourceLineNo">094</span> // Enable snapshot<a name="line.94"></a>
-<span class="sourceLineNo">095</span> conf.setBoolean(SnapshotManager.HBASE_SNAPSHOT_ENABLED, true);<a name="line.95"></a>
-<span class="sourceLineNo">096</span> conf.set(HConstants.HBASE_REGION_SPLIT_POLICY_KEY,<a name="line.96"></a>
-<span class="sourceLineNo">097</span> ConstantSizeRegionSplitPolicy.class.getName());<a name="line.97"></a>
-<span class="sourceLineNo">098</span> }<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span> @Before<a name="line.100"></a>
-<span class="sourceLineNo">101</span> public void setup() throws Exception {<a name="line.101"></a>
-<span class="sourceLineNo">102</span> createTable();<a name="line.102"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.CategoryBasedTimeout;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.HConstants;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.HRegionInfo;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.TableName;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.TableNotFoundException;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.client.Table;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.master.HMaster;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.master.snapshot.SnapshotManager;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.testclassification.RegionServerTests;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.junit.After;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.junit.AfterClass;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.junit.Before;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.junit.BeforeClass;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.junit.Rule;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.junit.Test;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.junit.experimental.categories.Category;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.junit.rules.TestRule;<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span>/**<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * Test creating/using/deleting snapshots from the client<a name="line.62"></a>
+<span class="sourceLineNo">063</span> * <p><a name="line.63"></a>
+<span class="sourceLineNo">064</span> * This is an end-to-end test for the snapshot utility<a name="line.64"></a>
+<span class="sourceLineNo">065</span> *<a name="line.65"></a>
+<span class="sourceLineNo">066</span> * TODO This is essentially a clone of TestSnapshotFromClient. This is worth refactoring this<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * because there will be a few more flavors of snapshots that need to run these tests.<a name="line.67"></a>
+<span class="sourceLineNo">068</span> */<a name="line.68"></a>
+<span class="sourceLineNo">069</span>@Category({RegionServerTests.class, LargeTests.class})<a name="line.69"></a>
+<span class="sourceLineNo">070</span>public class TestFlushSnapshotFromClient {<a name="line.70"></a>
+<span class="sourceLineNo">071</span> private static final Log LOG = LogFactory.getLog(TestFlushSnapshotFromClient.class);<a name="line.71"></a>
+<span class="sourceLineNo">072</span> @Rule public final TestRule timeout = CategoryBasedTimeout.builder().withTimeout(this.getClass()).<a name="line.72"></a>
+<span class="sourceLineNo">073</span> withLookingForStuckThread(true).build();<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span> protected static final HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.75"></a>
+<span class="sourceLineNo">076</span> protected static final int NUM_RS = 2;<a name="line.76"></a>
+<span class="sourceLineNo">077</span> protected static final byte[] TEST_FAM = Bytes.toBytes("fam");<a name="line.77"></a>
+<span class="sourceLineNo">078</span> protected static final TableName TABLE_NAME = TableName.valueOf("test");<a name="line.78"></a>
+<span class="sourceLineNo">079</span> protected final int DEFAULT_NUM_ROWS = 100;<a name="line.79"></a>
+<span class="sourceLineNo">080</span> protected Admin admin = null;<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(UTIL.getConfiguration());<a name="line.84"></a>
+<span class="sourceLineNo">085</span> UTIL.startMiniCluster(NUM_RS);<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> // disable the ui<a name="line.89"></a>
+<span class="sourceLineNo">090</span> conf.setInt("hbase.regionsever.info.port", -1);<a name="line.90"></a>
+<span class="sourceLineNo">091</span> // change the flush size to a small amount, regulating number of store files<a name="line.91"></a>
+<span class="sourceLineNo">092</span> conf.setInt("hbase.hregion.memstore.flush.size", 25000);<a name="line.92"></a>
+<span class="sourceLineNo">093</span> // so make sure we get a compaction when doing a load, but keep around some<a name="line.93"></a>
+<span class="sourceLineNo">094</span> // files in the store<a name="line.94"></a>
+<span class="sourceLineNo">095</span> conf.setInt("hbase.hstore.compaction.min", 10);<a name="line.95"></a>
+<span class="sourceLineNo">096</span> conf.setInt("hbase.hstore.compactionThreshold", 10);<a name="line.96"></a>
+<span class="sourceLineNo">097</span> // block writes if we get to 12 store files<a name="line.97"></a>
+<span class="sourceLineNo">098</span> conf.setInt("hbase.hstore.blockingStoreFiles", 12);<a name="line.98"></a>
+<span class="sourceLineNo">099</span> // Enable snapshot<a name="line.99"></a>
+<span class="sourceLineNo">100</span> conf.setBoolean(SnapshotManager.HBASE_SNAPSHOT_ENABLED, true);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> conf.set(HConstants.HBASE_REGION_SPLIT_POLICY_KEY,<a name="line.101"></a>
+<span class="sourceLineNo">102</span> ConstantSizeRegionSplitPolicy.class.getName());<a name="line.102"></a>
<span class="sourceLineNo">103</span> }<a name="line.103"></a>
<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span> protected void createTable() throws Exception {<a name="line.105"></a>
-<span class="sourceLineNo">106</span> SnapshotTestingUtils.createTable(UTIL, TABLE_NAME, TEST_FAM);<a name="line.106"></a>
-<span class="sourceLineNo">107</span> }<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span> @After<a name="line.109"></a>
-<span class="sourceLineNo">110</span> public void tearDown() throws Exception {<a name="line.110"></a>
-<span class="sourceLineNo">111</span> UTIL.deleteTable(TABLE_NAME);<a name="line.111"></a>
-<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span> SnapshotTestingUtils.deleteAllSnapshots(UTIL.getHBaseAdmin());<a name="line.113"></a>
-<span class="sourceLineNo">114</span> SnapshotTestingUtils.deleteArchiveDirectory(UTIL);<a name="line.114"></a>
-<span class="sourceLineNo">115</span> }<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span> @AfterClass<a name="line.117"></a>
-<span class="sourceLineNo">118</span> public static void cleanupTest() throws Exception {<a name="line.118"></a>
-<span class="sourceLineNo">119</span> try {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> UTIL.shutdownMiniCluster();<a name="line.120"></a>
-<span class="sourceLineNo">121</span> } catch (Exception e) {<a name="line.121"></a>
-<span class="sourceLineNo">122</span> LOG.warn("failure shutting down cluster", e);<a name="line.122"></a>
-<span class="sourceLineNo">123</span> }<a name="line.123"></a>
-<span class="sourceLineNo">124</span> }<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span> /**<a name="line.126"></a>
-<span class="sourceLineNo">127</span> * Test simple flush snapshotting a table that is online<a name="line.127"></a>
-<span class="sourceLineNo">128</span> * @throws Exception<a name="line.128"></a>
-<span class="sourceLineNo">129</span> */<a name="line.129"></a>
-<span class="sourceLineNo">130</span> @Test (timeout=300000)<a name="line.130"></a>
-<span class="sourceLineNo">131</span> public void testFlushTableSnapshot() throws Exception {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> Admin admin = UTIL.getHBaseAdmin();<a name="line.132"></a>
-<span class="sourceLineNo">133</span> // make sure we don't fail on listing snapshots<a name="line.133"></a>
-<span class="sourceLineNo">134</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span> // put some stuff in the table<a name="line.136"></a>
-<span class="sourceLineNo">137</span> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, DEFAULT_NUM_ROWS, TEST_FAM);<a name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span> LOG.debug("FS state before snapshot:");<a name="line.139"></a>
-<span class="sourceLineNo">140</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span> // take a snapshot of the enabled table<a name="line.142"></a>
-<span class="sourceLineNo">143</span> String snapshotString = "offlineTableSnapshot";<a name="line.143"></a>
-<span class="sourceLineNo">144</span> byte[] snapshot = Bytes.toBytes(snapshotString);<a name="line.144"></a>
-<span class="sourceLineNo">145</span> admin.snapshot(snapshotString, TABLE_NAME, SnapshotDescription.Type.FLUSH);<a name="line.145"></a>
-<span class="sourceLineNo">146</span> LOG.debug("Snapshot completed.");<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span> // make sure we have the snapshot<a name="line.148"></a>
-<span class="sourceLineNo">149</span> List<SnapshotDescription> snapshots = SnapshotTestingUtils.assertOneSnapshotThatMatches(admin,<a name="line.149"></a>
-<span class="sourceLineNo">150</span> snapshot, TABLE_NAME);<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span> // make sure its a valid snapshot<a name="line.152"></a>
-<span class="sourceLineNo">153</span> LOG.debug("FS state after snapshot:");<a name="line.153"></a>
-<span class="sourceLineNo">154</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.154"></a>
-<span class="sourceLineNo">155</span><a name="line.155"></a>
-<span class="sourceLineNo">156</span> SnapshotTestingUtils.confirmSnapshotValid(UTIL, snapshots.get(0), TABLE_NAME, TEST_FAM);<a name="line.156"></a>
-<span class="sourceLineNo">157</span> }<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span> /**<a name="line.159"></a>
-<span class="sourceLineNo">160</span> * Test snapshotting a table that is online without flushing<a name="line.160"></a>
-<span class="sourceLineNo">161</span> * @throws Exception<a name="line.161"></a>
-<span class="sourceLineNo">162</span> */<a name="line.162"></a>
-<span class="sourceLineNo">163</span> @Test(timeout=30000)<a name="line.163"></a>
-<span class="sourceLineNo">164</span> public void testSkipFlushTableSnapshot() throws Exception {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> Admin admin = UTIL.getHBaseAdmin();<a name="line.165"></a>
-<span class="sourceLineNo">166</span> // make sure we don't fail on listing snapshots<a name="line.166"></a>
-<span class="sourceLineNo">167</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.167"></a>
-<span class="sourceLineNo">168</span><a name="line.168"></a>
-<span class="sourceLineNo">169</span> // put some stuff in the table<a name="line.169"></a>
-<span class="sourceLineNo">170</span> Table table = UTIL.getConnection().getTable(TABLE_NAME);<a name="line.170"></a>
-<span class="sourceLineNo">171</span> UTIL.loadTable(table, TEST_FAM);<a name="line.171"></a>
-<span class="sourceLineNo">172</span> UTIL.flush(TABLE_NAME);<a name="line.172"></a>
-<span class="sourceLineNo">173</span><a name="line.173"></a>
-<span class="sourceLineNo">174</span> LOG.debug("FS state before snapshot:");<a name="line.174"></a>
-<span class="sourceLineNo">175</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.175"></a>
-<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span> // take a snapshot of the enabled table<a name="line.177"></a>
-<span class="sourceLineNo">178</span> String snapshotString = "skipFlushTableSnapshot";<a name="line.178"></a>
-<span class="sourceLineNo">179</span> byte[] snapshot = Bytes.toBytes(snapshotString);<a name="line.179"></a>
-<span class="sourceLineNo">180</span> admin.snapshot(snapshotString, TABLE_NAME, SnapshotDescription.Type.SKIPFLUSH);<a name="line.180"></a>
-<span class="sourceLineNo">181</span> LOG.debug("Snapshot completed.");<a name="line.181"></a>
-<span class="sourceLineNo">182</span><a name="line.182"></a>
-<span class="sourceLineNo">183</span> // make sure we have the snapshot<a name="line.183"></a>
-<span class="sourceLineNo">184</span> List<SnapshotDescription> snapshots = SnapshotTestingUtils.assertOneSnapshotThatMatches(admin,<a name="line.184"></a>
-<span class="sourceLineNo">185</span> snapshot, TABLE_NAME);<a name="line.185"></a>
+<span class="sourceLineNo">105</span> @Before<a name="line.105"></a>
+<span class="sourceLineNo">106</span> public void setup() throws Exception {<a name="line.106"></a>
+<span class="sourceLineNo">107</span> createTable();<a name="line.107"></a>
+<span class="sourceLineNo">108</span> this.admin = UTIL.getConnection().getAdmin();<a name="line.108"></a>
+<span class="sourceLineNo">109</span> }<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span> protected void createTable() throws Exception {<a name="line.111"></a>
+<span class="sourceLineNo">112</span> SnapshotTestingUtils.createTable(UTIL, TABLE_NAME, TEST_FAM);<a name="line.112"></a>
+<span class="sourceLineNo">113</span> }<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span> @After<a name="line.115"></a>
+<span class="sourceLineNo">116</span> public void tearDown() throws Exception {<a name="line.116"></a>
+<span class="sourceLineNo">117</span> UTIL.deleteTable(TABLE_NAME);<a name="line.117"></a>
+<span class="sourceLineNo">118</span> SnapshotTestingUtils.deleteAllSnapshots(this.admin);<a name="line.118"></a>
+<span class="sourceLineNo">119</span> this.admin.close();<a name="line.119"></a>
+<span class="sourceLineNo">120</span> SnapshotTestingUtils.deleteArchiveDirectory(UTIL);<a name="line.120"></a>
+<span class="sourceLineNo">121</span> }<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span> @AfterClass<a name="line.123"></a>
+<span class="sourceLineNo">124</span> public static void cleanupTest() throws Exception {<a name="line.124"></a>
+<span class="sourceLineNo">125</span> try {<a name="line.125"></a>
+<span class="sourceLineNo">126</span> UTIL.shutdownMiniCluster();<a name="line.126"></a>
+<span class="sourceLineNo">127</span> } catch (Exception e) {<a name="line.127"></a>
+<span class="sourceLineNo">128</span> LOG.warn("failure shutting down cluster", e);<a name="line.128"></a>
+<span class="sourceLineNo">129</span> }<a name="line.129"></a>
+<span class="sourceLineNo">130</span> }<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span> /**<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * Test simple flush snapshotting a table that is online<a name="line.133"></a>
+<span class="sourceLineNo">134</span> * @throws Exception<a name="line.134"></a>
+<span class="sourceLineNo">135</span> */<a name="line.135"></a>
+<span class="sourceLineNo">136</span> @Test<a name="line.136"></a>
+<span class="sourceLineNo">137</span> public void testFlushTableSnapshot() throws Exception {<a name="line.137"></a>
+<span class="sourceLineNo">138</span> // make sure we don't fail on listing snapshots<a name="line.138"></a>
+<span class="sourceLineNo">139</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span> // put some stuff in the table<a name="line.141"></a>
+<span class="sourceLineNo">142</span> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, DEFAULT_NUM_ROWS, TEST_FAM);<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span> LOG.debug("FS state before snapshot:");<a name="line.144"></a>
+<span class="sourceLineNo">145</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span> // take a snapshot of the enabled table<a name="line.147"></a>
+<span class="sourceLineNo">148</span> String snapshotString = "offlineTableSnapshot";<a name="line.148"></a>
+<span class="sourceLineNo">149</span> byte[] snapshot = Bytes.toBytes(snapshotString);<a name="line.149"></a>
+<span class="sourceLineNo">150</span> admin.snapshot(snapshotString, TABLE_NAME, SnapshotDescription.Type.FLUSH);<a name="line.150"></a>
+<span class="sourceLineNo">151</span> LOG.debug("Snapshot completed.");<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span> // make sure we have the snapshot<a name="line.153"></a>
+<span class="sourceLineNo">154</span> List<SnapshotDescription> snapshots = SnapshotTestingUtils.assertOneSnapshotThatMatches(admin,<a name="line.154"></a>
+<span class="sourceLineNo">155</span> snapshot, TABLE_NAME);<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span> // make sure its a valid snapshot<a name="line.157"></a>
+<span class="sourceLineNo">158</span> LOG.debug("FS state after snapshot:");<a name="line.158"></a>
+<span class="sourceLineNo">159</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span> SnapshotTestingUtils.confirmSnapshotValid(UTIL, snapshots.get(0), TABLE_NAME, TEST_FAM);<a name="line.161"></a>
+<span class="sourceLineNo">162</span> }<a name="line.162"></a>
+<span class="sourceLineNo">163</span><a name="line.163"></a>
+<span class="sourceLineNo">164</span> /**<a name="line.164"></a>
+<span class="sourceLineNo">165</span> * Test snapshotting a table that is online without flushing<a name="line.165"></a>
+<span class="sourceLineNo">166</span> * @throws Exception<a name="line.166"></a>
+<span class="sourceLineNo">167</span> */<a name="line.167"></a>
+<span class="sourceLineNo">168</span> @Test<a name="line.168"></a>
+<span class="sourceLineNo">169</span> public void testSkipFlushTableSnapshot() throws Exception {<a name="line.169"></a>
+<span class="sourceLineNo">170</span> // make sure we don't fail on listing snapshots<a name="line.170"></a>
+<span class="sourceLineNo">171</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span> // put some stuff in the table<a name="line.173"></a>
+<span class="sourceLineNo">174</span> Table table = UTIL.getConnection().getTable(TABLE_NAME);<a name="line.174"></a>
+<span class="sourceLineNo">175</span> UTIL.loadTable(table, TEST_FAM);<a name="line.175"></a>
+<span class="sourceLineNo">176</span> UTIL.flush(TABLE_NAME);<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span> LOG.debug("FS state before snapshot:");<a name="line.178"></a>
+<span class="sourceLineNo">179</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span> // take a snapshot of the enabled table<a name="line.181"></a>
+<span class="sourceLineNo">182</span> String snapshotString = "skipFlushTableSnapshot";<a name="line.182"></a>
+<span class="sourceLineNo">183</span> byte[] snapshot = Bytes.toBytes(snapshotString);<a name="line.183"></a>
+<span class="sourceLineNo">184</span> admin.snapshot(snapshotString, TABLE_NAME, SnapshotDescription.Type.SKIPFLUSH);<a name="line.184"></a>
+<span class="sourceLineNo">185</span> LOG.debug("Snapshot completed.");<a name="line.185"></a>
<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span> // make sure its a valid snapshot<a name="line.187"></a>
-<span class="sourceLineNo">188</span> LOG.debug("FS state after snapshot:");<a name="line.188"></a>
-<span class="sourceLineNo">189</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.189"></a>
+<span class="sourceLineNo">187</span> // make sure we have the snapshot<a name="line.187"></a>
+<span class="sourceLineNo">188</span> List<SnapshotDescription> snapshots = SnapshotTestingUtils.assertOneSnapshotThatMatches(admin,<a name="line.188"></a>
+<span class="sourceLineNo">189</span> snapshot, TABLE_NAME);<a name="line.189"></a>
<span class="sourceLineNo">190</span><a name="line.190"></a>
-<span class="sourceLineNo">191</span> SnapshotTestingUtils.confirmSnapshotValid(UTIL, snapshots.get(0), TABLE_NAME, TEST_FAM);<a name="line.191"></a>
-<span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span> admin.deleteSnapshot(snapshot);<a name="line.193"></a>
-<span class="sourceLineNo">194</span> snapshots = admin.listSnapshots();<a name="line.194"></a>
-<span class="sourceLineNo">195</span> SnapshotTestingUtils.assertNoSnapshots(admin);<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><a name="line.198"></a>
-<span class="sourceLineNo">199</span> /**<a name="line.199"></a>
-<span class="sourceLineNo">200</span> * Test simple flush snapshotting a table that is online<a name="line.200"></a>
-<span class="sourceLineNo">201</span> * @throws Exception<a name="line.201"></a>
-<span class="sourceLineNo">202</span> */<a name="line.202"></a>
-<span class="sourceLineNo">203</span> @Test (timeout=300000)<a name="line.203"></a>
-<span class="sourceLineNo">204</span> public void testFlushTableSnapshotWithProcedure() throws Exception {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> Admin admin = UTIL.getHBaseAdmin();<a name="line.205"></a>
-<span class="sourceLineNo">206</span> // make sure we don't fail on listing snapshots<a name="line.206"></a>
-<span class="sourceLineNo">207</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.207"></a>
-<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span> // put some stuff in the table<a name="line.209"></a>
-<span class="sourceLineNo">210</span> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, DEFAULT_NUM_ROWS, TEST_FAM);<a name="line.210"></a>
+<span class="sourceLineNo">191</span> // make sure its a valid snapshot<a name="line.191"></a>
+<span class="sourceLineNo">192</span> LOG.debug("FS state after snapshot:");<a name="line.192"></a>
+<span class="sourceLineNo">193</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.193"></a>
+<span class="sourceLineNo">194</span><a name="line.194"></a>
+<span class="sourceLineNo">195</span> SnapshotTestingUtils.confirmSnapshotValid(UTIL, snapshots.get(0), TABLE_NAME, TEST_FAM);<a name="line.195"></a>
+<span class="sourceLineNo">196</span><a name="line.196"></a>
+<span class="sourceLineNo">197</span> admin.deleteSnapshot(snapshot);<a name="line.197"></a>
+<span class="sourceLineNo">198</span> snapshots = admin.listSnapshots();<a name="line.198"></a>
+<span class="sourceLineNo">199</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.199"></a>
+<span class="sourceLineNo">200</span> }<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span> /**<a name="line.203"></a>
+<span class="sourceLineNo">204</span> * Test simple flush snapshotting a table that is online<a name="line.204"></a>
+<span class="sourceLineNo">205</span> * @throws Exception<a name="line.205"></a>
+<span class="sourceLineNo">206</span> */<a name="line.206"></a>
+<span class="sourceLineNo">207</span> @Test<a name="line.207"></a>
+<span class="sourceLineNo">208</span> public void testFlushTableSnapshotWithProcedure() throws Exception {<a name="line.208"></a>
+<span class="sourceLineNo">209</span> // make sure we don't fail on listing snapshots<a name="line.209"></a>
+<span class="sourceLineNo">210</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.210"></a>
<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span> LOG.debug("FS state before snapshot:");<a name="line.212"></a>
-<span class="sourceLineNo">213</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.213"></a>
+<span class="sourceLineNo">212</span> // put some stuff in the table<a name="line.212"></a>
+<span class="sourceLineNo">213</span> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, DEFAULT_NUM_ROWS, TEST_FAM);<a name="line.213"></a>
<span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span> // take a snapshot of the enabled table<a name="line.215"></a>
-<span class="sourceLineNo">216</span> String snapshotString = "offlineTableSnapshot";<a name="line.216"></a>
-<span class="sourceLineNo">217</span> byte[] snapshot = Bytes.toBytes(snapshotString);<a name="line.217"></a>
-<span class="sourceLineNo">218</span> Map<String, String> props = new HashMap<String, String>();<a name="line.218"></a>
-<span class="sourceLineNo">219</span> props.put("table", TABLE_NAME.getNameAsString());<a name="line.219"></a>
-<span class="sourceLineNo">220</span> admin.execProcedure(SnapshotManager.ONLINE_SNAPSHOT_CONTROLLER_DESCRIPTION,<a name="line.220"></a>
-<span class="sourceLineNo">221</span> snapshotString, props);<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span> LOG.debug("Snapshot completed.");<a name="line.224"></a>
+<span class="sourceLineNo">215</span> LOG.debug("FS state before snapshot:");<a name="line.215"></a>
+<span class="sourceLineNo">216</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span> // take a snapshot of the enabled table<a name="line.218"></a>
+<span class="sourceLineNo">219</span> String snapshotString = "offlineTableSnapshot";<a name="line.219"></a>
+<span class="sourceLineNo">220</span> byte[] snapshot = Bytes.toBytes(snapshotString);<a name="line.220"></a>
+<span class="sourceLineNo">221</span> Map<String, String> props = new HashMap<String, String>();<a name="line.221"></a>
+<span class="sourceLineNo">222</span> props.put("table", TABLE_NAME.getNameAsString());<a name="line.222"></a>
+<span class="sourceLineNo">223</span> admin.execProcedure(SnapshotManager.ONLINE_SNAPSHOT_CONTROLLER_DESCRIPTION,<a name="line.223"></a>
+<span class="sourceLineNo">224</span> snapshotString, props);<a name="line.224"></a>
<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span> // make sure we have the snapshot<a name="line.226"></a>
-<span class="sourceLineNo">227</span> List<SnapshotDescription> snapshots = SnapshotTestingUtils.assertOneSnapshotThatMatches(admin,<a name="line.227"></a>
-<span class="sourceLineNo">228</span> snapshot, TABLE_NAME);<a name="line.228"></a>
-<span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span> // make sure its a valid snapshot<a name="line.230"></a>
-<span class="sourceLineNo">231</span> LOG.debug("FS state after snapshot:");<a name="line.231"></a>
-<span class="sourceLineNo">232</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.232"></a>
-<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span> SnapshotTestingUtils.confirmSnapshotValid(UTIL, snapshots.get(0), TABLE_NAME, TEST_FAM);<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
+<span class="sourceLineNo">226</span><a name="line.226"></a>
+<span class="sourceLineNo">227</span> LOG.debug("Snapshot completed.");<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span> // make sure we have the snapshot<a name="line.229"></a>
+<span class="sourceLineNo">230</span> List<SnapshotDescription> snapshots = SnapshotTestingUtils.assertOneSnapshotThatMatches(admin,<a name="line.230"></a>
+<span class="sourceLineNo">231</span> snapshot, TABLE_NAME);<a name="line.231"></a>
+<span class="sourceLineNo">232</span><a name="line.232"></a>
+<span class="sourceLineNo">233</span> // make sure its a valid snapshot<a name="line.233"></a>
+<span class="sourceLineNo">234</span> LOG.debug("FS state after snapshot:");<a name="line.234"></a>
+<span class="sourceLineNo">235</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.235"></a>
<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span> @Test (timeout=300000)<a name="line.237"></a>
-<span class="sourceLineNo">238</span> public void testSnapshotFailsOnNonExistantTable() throws Exception {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> Admin admin = UTIL.getHBaseAdmin();<a name="line.239"></a>
-<span class="sourceLineNo">240</span> // make sure we don't fail on listing snapshots<a name="line.240"></a>
-<span class="sourceLineNo">241</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.241"></a>
-<span class="sourceLineNo">242</span> TableName tableName = TableName.valueOf("_not_a_table");<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span> // make sure the table doesn't exist<a name="line.244"></a>
-<span class="sourceLineNo">245</span> boolean fail = false;<a name="line.245"></a>
-<span class="sourceLineNo">246</span> do {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> try {<a name="line.247"></a>
-<span class="sourceLineNo">248</span> admin.getTableDescriptor(tableName);<a name="line.248"></a>
-<span class="sourceLineNo">249</span> fail = true;<a name="line.249"></a>
-<span class="sourceLineNo">250</span> LOG.error("Table:" + tableName + " already exists, checking a new name");<a name="line.250"></a>
-<span class="sourceLineNo">251</span> tableName = TableName.valueOf(tableName+"!");<a name="line.251"></a>
-<span class="sourceLineNo">252</span> } catch (TableNotFoundException e) {<a name="line.252"></a>
-<span class="sourceLineNo">253</span> fail = false;<a name="line.253"></a>
-<span class="sourceLineNo">254</span> }<a name="line.254"></a>
-<span class="sourceLineNo">255</span> } while (fail);<a name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span> // snapshot the non-existant table<a name="line.257"></a>
-<span class="sourceLineNo">258</span> try {<a name="line.258"></a>
-<span class="sourceLineNo">259</span> admin.snapshot("fail", tableName, SnapshotDescription.Type.FLUSH);<a name="line.259"></a>
-<span class="sourceLineNo">260</span> fail("Snapshot succeeded even though there is not table.");<a name="line.260"></a>
-<span class="sourceLineNo">261</span> } catch (SnapshotCreationException e) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span> LOG.info("Correctly failed to snapshot a non-existant table:" + e.getMessage());<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><a name="line.265"></a>
-<span class="sourceLineNo">266</span> @Test(timeout = 300000)<a name="line.266"></a>
-<span class="sourceLineNo">267</span> public void testAsyncFlushSnapshot() throws Exception {<a name="line.267"></a>
-<span class="sourceLineNo">268</span> Admin admin = UTIL.getHBaseAdmin();<a name="line.268"></a>
-<span class="sourceLineNo">269</span> SnapshotDescription snapshot = SnapshotDescription.newBuilder().setName("asyncSnapshot")<a name="line.269"></a>
-<span class="sourceLineNo">270</span> .setTable(TABLE_NAME.getNameAsString())<a name="line.270"></a>
-<span class="sourceLineNo">271</span> .setType(SnapshotDescription.Type.FLUSH)<a name="line.271"></a>
-<span class="sourceLineNo">272</span> .build();<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span> // take the snapshot async<a name="line.274"></a>
-<span class="sourceLineNo">275</span> admin.takeSnapshotAsync(snapshot);<a name="line.275"></a>
-<span class="sourceLineNo">276</span><a name="line.276"></a>
-<span class="sourceLineNo">277</span> // constantly loop, looking for the snapshot to complete<a name="line.277"></a>
-<span class="sourceLineNo">278</span> HMaster master = UTIL.getMiniHBaseCluster().getMaster();<a name="line.278"></a>
-<span class="sourceLineNo">279</span> SnapshotTestingUtils.waitForSnapshotToComplete(master, snapshot, 200);<a name="line.279"></a>
-<span class="sourceLineNo">280</span> LOG.info(" === Async Snapshot Completed ===");<a name="line.280"></a>
-<span class="sourceLineNo">281</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.281"></a>
-<span class="sourceLineNo">282</span><a name="line.282"></a>
-<span class="sourceLineNo">283</span> // make sure we get the snapshot<a name="line.283"></a>
-<span class="sourceLineNo">284</span> SnapshotTestingUtils.assertOneSnapshotThatMatches(admin, snapshot);<a name="line.284"></a>
-<span class="sourceLineNo">285</span> }<a name="line.285"></a>
-<span class="sourceLineNo">286</span><a name="line.286"></a>
-<span class="sourceLineNo">287</span> @Test (timeout=300000)<a name="line.287"></a>
-<span class="sourceLineNo">288</span> public void testSnapshotStateAfterMerge() throws Exception {<a name="line.288"></a>
-<span class="sourceLineNo">289</span> int numRows = DEFAULT_NUM_ROWS;<a name="line.289"></a>
-<span class="sourceLineNo">290</span> Admin admin = UTIL.getHBaseAdmin();<a name="line.290"></a>
+<span class="sourceLineNo">237</span> SnapshotTestingUtils.confirmSnapshotValid(UTIL, snapshots.get(0), TABLE_NAME, TEST_FAM);<a name="line.237"></a>
+<span class="sourceLineNo">238</span> }<a name="line.238"></a>
+<span class="sourceLineNo">239</span><a name="line.239"></a>
+<span class="sourceLineNo">240</span> @Test<a name="line.240"></a>
+<span class="sourceLineNo">241</span> public void testSnapshotFailsOnNonExistantTable() throws Exception {<a name="line.241"></a>
+<span class="sourceLineNo">242</span> // make sure we don't fail on listing snapshots<a name="line.242"></a>
+<span class="sourceLineNo">243</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.243"></a>
+<span class="sourceLineNo">244</span> TableName tableName = TableName.valueOf("_not_a_table");<a name="line.244"></a>
+<span class="sourceLineNo">245</span><a name="line.245"></a>
+<span class="sourceLineNo">246</span> // make sure the table doesn't exist<a name="line.246"></a>
+<span class="sourceLineNo">247</span> boolean fail = false;<a name="line.247"></a>
+<span class="sourceLineNo">248</span> do {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> try {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> admin.getTableDescriptor(tableName);<a name="line.250"></a>
+<span class="sourceLineNo">251</span> fail = true;<a name="line.251"></a>
+<span class="sourceLineNo">252</span> LOG.error("Table:" + tableName + " already exists, checking a new name");<a name="line.252"></a>
+<span class="sourceLineNo">253</span> tableName = TableName.valueOf(tableName+"!");<a name="line.253"></a>
+<span class="sourceLineNo">254</span> } catch (TableNotFoundException e) {<a name="line.254"></a>
+<span class="sourceLineNo">255</span> fail = false;<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span> } while (fail);<a name="line.257"></a>
+<span class="sourceLineNo">258</span><a name="line.258"></a>
+<span class="sourceLineNo">259</span> // snapshot the non-existant table<a name="line.259"></a>
+<span class="sourceLineNo">260</span> try {<a name="line.260"></a>
+<span class="sourceLineNo">261</span> admin.snapshot("fail", tableName, SnapshotDescription.Type.FLUSH);<a name="line.261"></a>
+<span class="sourceLineNo">262</span> fail("Snapshot succeeded even though there is not table.");<a name="line.262"></a>
+<span class="sourceLineNo">263</span> } catch (SnapshotCreationException e) {<a name="line.263"></a>
+<span class="sourceLineNo">264</span> LOG.info("Correctly failed to snapshot a non-existant table:" + e.getMessage());<a name="line.264"></a>
+<span class="sourceLineNo">265</span> }<a name="line.265"></a>
+<span class="sourceLineNo">266</span> }<a name="line.266"></a>
+<span class="sourceLineNo">267</span><a name="line.267"></a>
+<span class="sourceLineNo">268</span> @Test<a name="line.268"></a>
+<span class="sourceLineNo">269</span> public void testAsyncFlushSnapshot() throws Exception {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> SnapshotDescription snapshot = SnapshotDescription.newBuilder().setName("asyncSnapshot")<a name="line.270"></a>
+<span class="sourceLineNo">271</span> .setTable(TABLE_NAME.getNameAsString())<a name="line.271"></a>
+<span class="sourceLineNo">272</span> .setType(SnapshotDescription.Type.FLUSH)<a name="line.272"></a>
+<span class="sourceLineNo">273</span> .build();<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span> // take the snapshot async<a name="line.275"></a>
+<span class="sourceLineNo">276</span> admin.takeSnapshotAsync(snapshot);<a name="line.276"></a>
+<span class="sourceLineNo">277</span><a name="line.277"></a>
+<span class="sourceLineNo">278</span> // constantly loop, looking for the snapshot to complete<a name="line.278"></a>
+<span class="sourceLineNo">279</span> HMaster master = UTIL.getMiniHBaseCluster().getMaster();<a name="line.279"></a>
+<span class="sourceLineNo">280</span> SnapshotTestingUtils.waitForSnapshotToComplete(master, snapshot, 200);<a name="line.280"></a>
+<span class="sourceLineNo">281</span> LOG.info(" === Async Snapshot Completed ===");<a name="line.281"></a>
+<span class="sourceLineNo">282</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.282"></a>
+<span class="sourceLineNo">283</span><a name="line.283"></a>
+<span class="sourceLineNo">284</span> // make sure we get the snapshot<a name="line.284"></a>
+<span class="sourceLineNo">285</span> SnapshotTestingUtils.assertOneSnapshotThatMatches(admin, snapshot);<a name="line.285"></a>
+<span class="sourceLineNo">286</span> }<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span> @Test<a name="line.288"></a>
+<span class="sourceLineNo">289</span> public void testSnapshotStateAfterMerge() throws Exception {<a name="line.289"></a>
+<span class="sourceLineNo">290</span> int numRows = DEFAULT_NUM_ROWS;<a name="line.290"></a>
<span class="sourceLineNo">291</span> // make sure we don't fail on listing snapshots<a name="line.291"></a>
<span class="sourceLineNo">292</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.292"></a>
<span class="sourceLineNo">293</span> // load the table so we have some data<a name="line.293"></a>
@@ -343,199 +343,194 @@
<span class="sourceLineNo">335</span> UTIL.deleteTable(cloneBeforeMergeName);<a name="line.335"></a>
<span class="sourceLineNo">336</span> }<a name="line.336"></a>
<span class="sourceLineNo">337</span><a name="line.337"></a>
-<span class="sourceLineNo">338</span> @Test (timeout=300000)<a name="line.338"></a>
+<span class="sourceLineNo">338</span> @Test<a name="line.338"></a>
<span class="sourceLineNo">339</span> public void testTakeSnapshotAfterMerge() throws Exception {<a name="line.339"></a>
<span class="sourceLineNo">340</span> int numRows = DEFAULT_NUM_ROWS;<a name="line.340"></a>
-<span class="sourceLineNo">341</span> Admin admin = UTIL.getHBaseAdmin();<a name="line.341"></a>
-<span class="sourceLineNo">342</span> // make sure we don't fail on listing snapshots<a name="line.342"></a>
-<span class="sourceLineNo">343</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.343"></a>
-<span class="sourceLineNo">344</span> // load the table so we have some data<a name="line.344"></a>
-<span class="sourceLineNo">345</span> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, numRows, TEST_FAM);<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span> // Merge two regions<a name="line.347"></a>
-<span class="sourceLineNo">348</span> List<HRegionInfo> regions = admin.getTableRegions(TABLE_NAME);<a name="line.348"></a>
-<span class="sourceLineNo">349</span> Collections.sort(regions, new Comparator<HRegionInfo>() {<a name="line.349"></a>
-<span class="sourceLineNo">350</span> public int compare(HRegionInfo r1, HRegionInfo r2) {<a name="line.350"></a>
-<span class="sourceLineNo">351</span> return Bytes.compareTo(r1.getStartKey(), r2.getStartKey());<a name="line.351"></a>
-<span class="sourceLineNo">352</span> }<a name="line.352"></a>
-<span class="sourceLineNo">353</span> });<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span> int numRegions = admin.getTableRegions(TABLE_NAME).size();<a name="line.355"></a>
-<span class="sourceLineNo">356</span> int numRegionsAfterMerge = numRegions - 2;<a name="line.356"></a>
-<span class="sourceLineNo">357</span> admin.mergeRegions(regions.get(1).getEncodedNameAsBytes(),<a name="line.357"></a>
-<span class="sourceLineNo">358</span> regions.get(2).getEncodedNameAsBytes(), true);<a name="line.358"></a>
-<span class="sourceLineNo">359</span> admin.mergeRegions(regions.get(5).getEncodedNameAsBytes(),<a name="line.359"></a>
-<span class="sourceLineNo">360</span> regions.get(6).getEncodedNameAsBytes(), true);<a name="line.360"></a>
-<span class="sourceLineNo">361</span><a name="line.361"></a>
-<span class="sourceLineNo">362</span> waitRegionsAfterMerge(numRegionsAfterMerge);<a name="line.362"></a>
-<span class="sourceLineNo">363</span> assertEquals(numRegionsAfterMerge, admin.getTableRegions(TABLE_NAME).size());<a name="line.363"></a>
-<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span> // Take a snapshot<a name="line.365"></a>
-<span class="sourceLineNo">366</span> String snapshotName = "snapshotAfterMerge";<a name="line.366"></a>
-<span class="sourceLineNo">367</span> SnapshotTestingUtils.snapshot(admin, snapshotName, TABLE_NAME.getNameAsString(),<a name="line.367"></a>
-<span class="sourceLineNo">368</span> SnapshotDescription.Type.FLUSH, 3);<a name="line.368"></a>
-<span class="sourceLineNo">369</span><a name="line.369"></a>
-<span class="sourceLineNo">370</span> // Clone the table<a name="line.370"></a>
-<span class="sourceLineNo">371</span> TableName cloneName = TableName.valueOf("cloneMerge");<a name="line.371"></a>
-<span class="sourceLineNo">372</span> admin.cloneSnapshot(snapshotName, cloneName);<a name="line.372"></a>
-<span class="sourceLineNo">373</span> SnapshotTestingUtils.waitForTableToBeOnline(UTIL, cloneName);<a name="line.373"></a>
-<span class="sourceLineNo">374</span><a name="line.374"></a>
-<span class="sourceLineNo">375</span> verifyRowCount(UTIL, TABLE_NAME, numRows);<a name="line.375"></a>
-<span class="sourceLineNo">376</span> verifyRowCount(UTIL, cloneName, numRows);<a name="line.376"></a>
-<span class="sourceLineNo">377</span><a name="line.377"></a>
-<span class="sourceLineNo">378</span> // test that we can delete the snapshot<a name="line.378"></a>
-<span class="sourceLineNo">379</span> UTIL.deleteTable(cloneName);<a name="line.379"></a>
-<span class="sourceLineNo">380</span> }<a name="line.380"></a>
-<span class="sourceLineNo">381</span><a name="line.381"></a>
-<span class="sourceLineNo">382</span> /**<a name="line.382"></a>
-<span class="sourceLineNo">383</span> * Basic end-to-end test of simple-flush-based snapshots<a name="line.383"></a>
-<span class="sourceLineNo">384</span> */<a name="line.384"></a>
-<span class="sourceLineNo">385</span> @Test (timeout=300000)<a name="line.385"></a>
-<span class="sourceLineNo">386</span> public void testFlushCreateListDestroy() throws Exception {<a name="line.386"></a>
-<span class="sourceLineNo">387</span> LOG.debug("------- Starting Snapshot test -------------");<a name="line.387"></a>
-<span class="sourceLineNo">388</span> Admin admin = UTIL.getHBaseAdmin();<a name="line.388"></a>
-<span class="sourceLineNo">389</span> // make sure we don't fail on listing snapshots<a name="line.389"></a>
-<span class="sourceLineNo">390</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.390"></a>
-<span class="sourceLineNo">391</span> // load the table so we have some data<a name="line.391"></a>
-<span class="sourceLineNo">392</span> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, DEFAULT_NUM_ROWS, TEST_FAM);<a name="line.392"></a>
-<span class="sourceLineNo">393</span><a name="line.393"></a>
-<span class="sourceLineNo">394</span> String snapshotName = "flushSnapshotCreateListDestroy";<a name="line.394"></a>
-<span class="sourceLineNo">395</span> FileSystem fs = UTIL.getHBaseCluster().getMaster().getMasterFileSystem().getFileSystem();<a name="line.395"></a>
-<span class="sourceLineNo">396</span> Path rootDir = UTIL.getHBaseCluster().getMaster().getMasterFileSystem().getRootDir();<a name="line.396"></a>
-<span class="sourceLineNo">397</span> SnapshotTestingUtils.createSnapshotAndValidate(admin, TABLE_NAME, Bytes.toString(TEST_FAM),<a name="line.397"></a>
-<span class="sourceLineNo">398</span> snapshotName, rootDir, fs, true);<a name="line.398"></a>
-<span class="sourceLineNo">399</span> }<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>
-<span class="sourceLineNo">402</span> * Demonstrate that we reject snapshot requests if there is a snapshot already running on the<a name="line.402"></a>
-<span class="sourceLineNo">403</span> * same table currently running and that concurrent snapshots on different tables can both<a name="line.403"></a>
-<span class="sourceLineNo">404</span> * succeed concurretly.<a name="line.404"></a>
-<span class="sourceLineNo">405</span> */<a name="line.405"></a>
-<span class="sourceLineNo">406</span> @Test(timeout=300000)<a name="line.406"></a>
-<span class="sourceLineNo">407</span> public void testConcurrentSnapshottingAttempts() throws IOException, InterruptedException {<a name="line.407"></a>
-<span class="sourceLineNo">408</span> final TableName TABLE2_NAME = TableName.valueOf(TABLE_NAME + "2");<a name="line.408"></a>
-<span class="sourceLineNo">409</span><a name="line.409"></a>
-<span class="sourceLineNo">410</span> int ssNum = 20;<a name="line.410"></a>
-<span class="sourceLineNo">411</span> Admin admin = UTIL.getHBaseAdmin();<a name="line.411"></a>
-<span class="sourceLineNo">412</span> // make sure we don't fail on listing snapshots<a name="line.412"></a>
-<span class="sourceLineNo">413</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.413"></a>
-<span class="sourceLineNo">414</span> // create second testing table<a name="line.414"></a>
-<span class="sourceLineNo">415</span> SnapshotTestingUtils.createTable(UTIL, TABLE2_NAME, TEST_FAM);<a name="line.415"></a>
-<span class="sourceLineNo">416</span> // load the table so we have some data<a name="line.416"></a>
-<span class="sourceLineNo">417</span> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, DEFAULT_NUM_ROWS, TEST_FAM);<a name="line.417"></a>
-<span class="sourceLineNo">418</span> SnapshotTestingUtils.loadData(UTIL, TABLE2_NAME, DEFAULT_NUM_ROWS, TEST_FAM);<a name="line.418"></a>
-<span class="sourceLineNo">419</span><a name="line.419"></a>
-<span class="sourceLineNo">420</span> final CountDownLatch toBeSubmitted = new CountDownLatch(ssNum);<a name="line.420"></a>
-<span class="sourceLineNo">421</span> // We'll have one of these per thread<a name="line.421"></a>
-<span class="sourceLineNo">422</span> class SSRunnable implements Runnable {<a name="line.422"></a>
-<span class="sourceLineNo">423</span> SnapshotDescription ss;<a name="line.423"></a>
-<span class="sourceLineNo">424</span> SSRunnable(SnapshotDescription ss) {<a name="line.424"></a>
-<span class="sourceLineNo">425</span> this.ss = ss;<a name="line.425"></a>
-<span class="sourceLineNo">426</span> }<a name="line.426"></a>
-<span class="sourceLineNo">427</span><a name="line.427"></a>
-<span class="sourceLineNo">428</span> @Override<a name="line.428"></a>
-<span class="sourceLineNo">429</span> public void run() {<a name="line.429"></a>
-<span class="sourceLineNo">430</span> try {<a name="line.430"></a>
-<span class="sourceLineNo">431</span> Admin admin = UTIL.getHBaseAdmin();<a name="line.431"></a>
-<span class="sourceLineNo">432</span> LOG.info("Submitting snapshot request: " + ClientSnapshotDescriptionUtils.toString(ss));<a name="line.432"></a>
-<span class="sourceLineNo">433</span> admin.takeSnapshotAsync(ss);<a name="line.433"></a>
-<span class="sourceLineNo">434</span> } catch (Exception e) {<a name="line.434"></a>
-<span class="sourceLineNo">435</span> LOG.info("Exception during snapshot request: " + ClientSnapshotDescriptionUtils.toString(<a name="line.435"></a>
-<span class="sourceLineNo">436</span> ss)<a name="line.436"></a>
-<span class="sourceLineNo">437</span> + ". This is ok, we expect some", e);<a name="line.437"></a>
-<span class="sourceLineNo">438</span> }<a name="line.438"></a>
-<span class="sourceLineNo">439</span> LOG.info("Submitted snapshot request: " + ClientSnapshotDescriptionUtils.toString(ss));<a name="line.439"></a>
-<span class="sourceLineNo">440</span> toBeSubmitted.countDown();<a name="line.440"></a>
-<span class="sourceLineNo">441</span> }<a name="line.441"></a>
-<span class="sourceLineNo">442</span> };<a name="line.442"></a>
-<span class="sourceLineNo">443</span><a name="line.443"></a>
-<span class="sourceLineNo">444</span> // build descriptions<a name="line.444"></a>
-<span class="sourceLineNo">445</span> SnapshotDescription[] descs = new SnapshotDescription[ssNum];<a name="line.445"></a>
-<span class="sourceLineNo">446</span> for (int i = 0; i < ssNum; i++) {<a name="line.446"></a>
-<span class="sourceLineNo">447</span> SnapshotDescription.Builder builder = SnapshotDescription.newBuilder();<a name="line.447"></a>
-<span class="sourceLineNo">448</span> builder.setTable(((i % 2) == 0 ? TABLE_NAME : TABLE2_NAME).getNameAsString());<a name="line.448"></a>
-<span class="sourceLineNo">449</span> builder.setName("ss"+i);<a name="line.449"></a>
-<span class="sourceLineNo">450</span> builder.setType(SnapshotDescription.Type.FLUSH);<a name="line.450"></a>
-<span class="sourceLineNo">451</span> descs[i] = builder.build();<a name="line.451"></a>
-<span class="sourceLineNo">452</span> }<a name="line.452"></a>
-<span class="sourceLineNo">453</span><a name="line.453"></a>
-<span class="sourceLineNo">454</span> // kick each off its own thread<a name="line.454"></a>
-<span class="sourceLineNo">455</span> for (int i=0 ; i < ssNum; i++) {<a name="line.455"></a>
-<span class="sourceLineNo">456</span> new Thread(new SSRunnable(descs[i])).start();<a name="line.456"></a>
-<span class="sourceLineNo">457</span> }<a name="line.457"></a>
-<span class="sourceLineNo">458</span><a name="line.458"></a>
-<span class="sourceLineNo">459</span> // wait until all have been submitted<a name="line.459"></a>
-<span class="sourceLineNo">460</span> toBeSubmitted.await();<a name="line.460"></a>
-<span class="sourceLineNo">461</span><a name="line.461"></a>
-<span class="sourceLineNo">462</span> // loop until all are done.<a name="line.462"></a>
-<span class="sourceLineNo">463</span> while (true) {<a name="line.463"></a>
-<span class="sourceLineNo">464</span> int doneCount = 0;<a name="line.464"></a>
-<span class="sourceLineNo">465</span> for (SnapshotDescription ss : descs) {<a name="line.465"></a>
-<span class="sourceLineNo">466</span> try {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> if (admin.isSnapshotFinished(ss)) {<a name="line.467"></a>
-<span class="sourceLineNo">468</span> doneCount++;<a name="line.468"></a>
-<span class="sourceLineNo">469</span> }<a name="line.469"></a>
-<span class="sourceLineNo">470</span> } catch (Exception e) {<a name="line.470"></a>
-<span class="sourceLineNo">471</span> LOG.warn("Got an exception when checking for snapshot " + ss.getName(), e);<a name="line.471"></a>
-<span class="sourceLineNo">472</span> doneCount++;<a name="line.472"></a>
-<span class="sourceLineNo">473</span> }<a name="line.473"></a>
-<span class="sourceLineNo">474</span> }<a name="line.474"></a>
-<span class="sourceLineNo">475</span> if (doneCount == descs.length) {<a name="line.475"></a>
-<span class="sourceLineNo">476</span> break;<a name="line.476"></a>
-<span class="sourceLineNo">477</span> }<a name="line.477"></a>
-<span class="sourceLineNo">478</span> Thread.sleep(100);<a name="line.478"></a>
-<span class="sourceLineNo">479</span> }<a name="line.479"></a>
-<span class="sourceLineNo">480</span><a name="line.480"></a>
-<span class="sourceLineNo">481</span> // dump for debugging<a name="line.481"></a>
-<span class="sourceLineNo">482</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.482"></a>
-<span class="sourceLineNo">483</span><a name="line.483"></a>
-<span class="sourceLineNo">484</span> List<SnapshotDescription> taken = admin.listSnapshots();<a name="line.484"></a>
-<span class="sourceLineNo">485</span> int takenSize = taken.size();<a name="line.485"></a>
-<span class="sourceLineNo">486</span> LOG.info("Taken " + takenSize + " snapshots: " + taken);<a name="line.486"></a>
-<span class="sourceLineNo">487</span> assertTrue("We expect at least 1 request to be rejected because of we concurrently" +<a name="line.487"></a>
-<span class="sourceLineNo">488</span> " issued many requests", takenSize < ssNum && takenSize > 0);<a name="line.488"></a>
-<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span> // Verify that there's at least one snapshot per table<a name="line.490"></a>
-<span class="sourceLineNo">491</span> int t1SnapshotsCount = 0;<a name="line.491"></a>
-<span class="sourceLineNo">492</span> int t2SnapshotsCount = 0;<a name="line.492"></a>
-<span class="sourceLineNo">493</span> for (SnapshotDescription ss : taken) {<a name="line.493"></a>
-<span class="sourceLineNo">494</span> if (TableName.valueOf(ss.getTable()).equals(TABLE_NAME)) {<a name="line.494"></a>
-<span class="sourceLineNo">495</span> t1SnapshotsCount++;<a name="line.495"></a>
-<span class="sourceLineNo">496</span> } else if (TableName.valueOf(ss.getTable()).equals(TABLE2_NAME)) {<a name="line.496"></a>
-<span class="sourceLineNo">497</span> t2SnapshotsCount++;<a name="line.497"></a>
-<span class="sourceLineNo">498</span> }<a name="line.498"></a>
-<span class="sourceLineNo">499</span> }<a name="line.499"></a>
-<span class="sourceLineNo">500</span> assertTrue("We expect at least 1 snapshot of table1 ", t1SnapshotsCount > 0);<a name="line.500"></a>
-<span class="sourceLineNo">501</span> assertTrue("We expect at least 1 snapshot of table2 ", t2SnapshotsCount > 0);<a name="line.501"></a>
-<span class="sourceLineNo">502</span><a name="line.502"></a>
-<span class="sourceLineNo">503</span> UTIL.deleteTable(TABLE2_NAME);<a name="line.503"></a>
-<span class="sourceLineNo">504</span> }<a name="line.504"></a>
-<span class="sourceLineNo">505</span><a name="line.505"></a>
-<span class="sourceLineNo">506</span> private void waitRegionsAfterMerge(final long numRegionsAfterMerge)<a name="line.506"></a>
-<span class="sourceLineNo">507</span> throws IOException, InterruptedException {<a name="line.507"></a>
-<span class="sourceLineNo">508</span> Admin admin = UTIL.getHBaseAdmin();<a name="line.508"></a>
-<span class="sourceLineNo">509</span> // Verify that there's one region less<a name="line.509"></a>
-<span class="sourceLineNo">510</span> long startTime = System.currentTimeMillis();<a name="line.510"></a>
-<span class="sourceLineNo">511</span> while (admin.getTableRegions(TABLE_NAME).size() != numRegionsAfterMerge) {<a name="line.511"></a>
-<span class="sourceLineNo">512</span> // This may be flaky... if after 15sec the merge is not complete give up<a name="line.512"></a>
-<span class="sourceLineNo">513</span> // it will fail in the assertEquals(numRegionsAfterMerge).<a name="line.513"></a>
-<span class="sourceLineNo">514</span> if ((System.currentTimeMillis() - startTime) > 15000)<a name="line.514"></a>
-<span class="sourceLineNo">515</span> break;<a name="line.515"></a>
-<span class="sourceLineNo">516</span> Thread.sleep(100);<a name="line.516"></a>
-<span class="sourceLineNo">517</span> }<a name="line.517"></a>
-<span class="sourceLineNo">518</span> SnapshotTestingUtils.waitForTableToBeOnline(UTIL, TABLE_NAME);<a name="line.518"></a>
-<span class="sourceLineNo">519</span> }<a name="line.519"></a>
-<span class="sourceLineNo">520</span><a name="line.520"></a>
+<span class="sourceLineNo">341</span> // make sure we don't fail on listing snapshots<a name="line.341"></a>
+<span class="sourceLineNo">342</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.342"></a>
+<span class="sourceLineNo">343</span> // load the table so we have some data<a name="line.343"></a>
+<span class="sourceLineNo">344</span> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, numRows, TEST_FAM);<a name="line.344"></a>
+<span class="sourceLineNo">345</span><a name="line.345"></a>
+<span class="sourceLineNo">346</span> // Merge two regions<a name="line.346"></a>
+<span class="sourceLineNo">347</span> List<HRegionInfo> regions = admin.getTableRegions(TABLE_NAME);<a name="line.347"></a>
+<span class="sourceLineNo">348</span> Collections.sort(regions, new Comparator<HRegionInfo>() {<a name="line.348"></a>
+<span class="sourceLineNo">349</span> public int compare(HRegionInfo r1, HRegionInfo r2) {<a name="line.349"></a>
+<span class="sourceLineNo">350</span> return Bytes.compareTo(r1.getStartKey(), r2.getStartKey());<a name="line.350"></a>
+<span class="sourceLineNo">351</span> }<a name="line.351"></a>
+<span class="sourceLineNo">352</span> });<a name="line.352"></a>
+<span class="sourceLineNo">353</span><a name="line.353"></a>
+<span class="sourceLineNo">354</span> int numRegions = admin.getTableRegions(TABLE_NAME).size();<a name="line.354"></a>
+<span class="sourceLineNo">355</span> int numRegionsAfterMerge = numRegions - 2;<a name="line.355"></a>
+<span class="sourceLineNo">356</span> admin.mergeRegions(regions.get(1).getEncodedNameAsBytes(),<a name="line.356"></a>
+<span class="sourceLineNo">357</span> regions.get(2).getEncodedNameAsBytes(), true);<a name="line.357"></a>
+<span class="sourceLineNo">358</span> admin.mergeRegions(regions.get(5).getEncodedNameAsBytes(),<a name="line.358"></a>
+<span class="sourceLineNo">359</span> regions.get(6).getEncodedNameAsBytes(), true);<a name="line.359"></a>
+<span class="sourceLineNo">360</span><a name="line.360"></a>
+<span class="sourceLineNo">361</span> waitRegionsAfterMerge(numRegionsAfterMerge);<a name="line.361"></a>
+<span class="sourceLineNo">362</span> assertEquals(numRegionsAfterMerge, admin.getTableRegions(TABLE_NAME).size());<a name="line.362"></a>
+<span class="sourceLineNo">363</span><a name="line.363"></a>
+<span class="sourceLineNo">364</span> // Take a snapshot<a name="line.364"></a>
+<span class="sourceLineNo">365</span> String snapshotName = "snapshotAfterMerge";<a name="line.365"></a>
+<span class="sourceLineNo">366</span> SnapshotTestingUtils.snapshot(admin, snapshotName, TABLE_NAME.getNameAsString(),<a name="line.366"></a>
+<span class="sourceLineNo">367</span> SnapshotDescription.Type.FLUSH, 3);<a name="line.367"></a>
+<span class="sourceLineNo">368</span><a name="line.368"></a>
+<span class="sourceLineNo">369</span> // Clone the table<a name="line.369"></a>
+<span class="sourceLineNo">370</span> TableName cloneName = TableName.valueOf("cloneMerge");<a name="line.370"></a>
+<span class="sourceLineNo">371</span> admin.cloneSnapshot(snapshotName, cloneName);<a name="line.371"></a>
+<span class="sourceLineNo">372</span> SnapshotTestingUtils.waitForTableToBeOnline(UTIL, cloneName);<a name="line.372"></a>
+<span class="sourceLineNo">373</span><a name="line.373"></a>
+<span class="sourceLineNo">374</span> verifyRowCount(UTIL, TABLE_NAME, numRows);<a name="line.374"></a>
+<span class="sourceLineNo">375</span> verifyRowCount(UTIL, cloneName, numRows);<a name="line.375"></a>
+<span class="sourceLineNo">376</span><a name="line.376"></a>
+<span class="sourceLineNo">377</span> // test that we can delete the snapshot<a name="line.377"></a>
+<span class="sourceLineNo">378</span> UTIL.deleteTable(cloneName);<a name="line.378"></a>
+<span class="sourceLineNo">379</span> }<a name="line.379"></a>
+<span class="sourceLineNo">380</span><a name="line.380"></a>
+<span class="sourceLineNo">381</span> /**<a name="line.381"></a>
+<span class="sourceLineNo">382</span> * Basic end-to-end test of simple-flush-based snapshots<a name="line.382"></a>
+<span class="sourceLineNo">383</span> */<a name="line.383"></a>
+<span class="sourceLineNo">384</span> @Test<a name="line.384"></a>
+<span class="sourceLineNo">385</span> public void testFlushCreateListDestroy() throws Exception {<a name="line.385"></a>
+<span class="sourceLineNo">386</span> LOG.debug("------- Starting Snapshot test -------------");<a name="line.386"></a>
+<span class="sourceLineNo">387</span> // make sure we don't fail on listing snapshots<a name="line.387"></a>
+<span class="sourceLineNo">388</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.388"></a>
+<span class="sourceLineNo">389</span> // load the table so we have some data<a name="line.389"></a>
+<span class="sourceLineNo">390</span> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, DEFAULT_NUM_ROWS, TEST_FAM);<a name="line.390"></a>
+<span class="sourceLineNo">391</span><a name="line.391"></a>
+<span class="sourceLineNo">392</span> String snapshotName = "flushSnapshotCreateListDestroy";<a name="line.392"></a>
+<span class="sourceLineNo">393</span> FileSystem fs = UTIL.getHBaseCluster().getMaster().getMasterFileSystem().getFileSystem();<a name="line.393"></a>
+<span class="sourceLineNo">394</span> Path rootDir = UTIL.getHBaseCluster().getMaster().getMasterFileSystem().getRootDir();<a name="line.394"></a>
+<span class="sourceLineNo">395</span> SnapshotTestingUtils.createSnapshotAndValidate(admin, TABLE_NAME, Bytes.toString(TEST_FAM),<a name="line.395"></a>
+<span class="sourceLineNo">396</span> snapshotName, rootDir, fs, true);<a name="line.396"></a>
+<span class="sourceLineNo">397</span> }<a name="line.397"></a>
+<span class="sourceLineNo">398</span><a name="line.398"></a>
+<span class="sourceLineNo">399</span> /**<a name="line.399"></a>
+<span class="sourceLineNo">400</span> * Demonstrate that we reject snapshot requests if there is a snapshot already running on the<a name="line.400"></a>
+<span class="sourceLineNo">401</span> * same table currently running and that concurrent snapshots on different tables can both<a name="line.401"></a>
+<span class="sourceLineNo">402</span> * succeed concurretly.<a name="line.402"></a>
+<span class="sourceLineNo">403</span> */<a name="line.403"></a>
+<span class="sourceLineNo">404</span> @Test<a name="line.404"></a>
+<span class="sourceLineNo">405</span> public void testConcurrentSnapshottingAttempts() throws IOException, InterruptedException {<a name="line.405"></a>
+<span class="sourceLineNo">406</span> final TableName TABLE2_NAME = TableName.valueOf(TABLE_NAME + "2");<a name="line.406"></a>
+<span class="sourceLineNo">407</span><a name="line.407"></a>
+<span class="sourceLineNo">408</span> int ssNum = 20;<a name="line.408"></a>
+<span class="sourceLineNo">409</span> // make sure we don't fail on listing snapshots<a name="line.409"></a>
+<span class="sourceLineNo">410</span> SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.410"></a>
+<span class="sourceLineNo">411</span> // create second testing table<a name="line.411"></a>
+<span class="sourceLineNo">412</span> SnapshotTestingUtils.createTable(UTIL, TABLE2_NAME, TEST_FAM);<a name="line.412"></a>
+<span class="sourceLineNo">413</span> // load the table so we have some data<a name="line.413"></a>
+<span class="sourceLineNo">414</span> SnapshotTestingUtils.loadData(UTIL, TABLE_NAME, DEFAULT_NUM_ROWS, TEST_FAM);<a name="line.414"></a>
+<span class="sourceLineNo">415</span> SnapshotTestingUtils.loadData(UTIL, TABLE2_NAME, DEFAULT_NUM_ROWS, TEST_FAM);<a name="line.415"></a>
+<span class="sourceLineNo">416</span><a name="line.416"></a>
+<span class="sourceLineNo">417</span> final CountDownLatch toBeSubmitted = new CountDownLatch(ssNum);<a name="line.417"></a>
+<span class="sourceLineNo">418</span> // We'll have one of these per thread<a name="line.418"></a>
+<span class="sourceLineNo">419</span> class SSRunnable implements Runnable {<a name="line.419"></a>
+<span class="sourceLineNo">420</span> SnapshotDescription ss;<a name="line.420"></a>
+<span class="sourceLineNo">421</span> SSRunnable(SnapshotDescription ss) {<a name="line.421"></a>
+<span class="sourceLineNo">422</span> this.ss = ss;<a name="line.422"></a>
+<span class="sourceLineNo">423</span> }<a name="line.423"></a>
+<span class="sourceLineNo">424</span><a name="line.424"></a>
+<span class="sourceLineNo">425</span> @Override<a name="line.425"></a>
+<span class="sourceLineNo">426</span> public void run() {<a name="line.426"></a>
+<span class="sourceLineNo">427</span> try {<a name="line.427"></a>
+<span class="sourceLineNo">428</span> LOG.info("Submitting snapshot request: " + ClientSnapshotDescriptionUtils.toString(ss));<a name="line.428"></a>
+<span class="sourceLineNo">429</span> admin.takeSnapshotAsync(ss);<a name="line.429"></a>
+<span class="sourceLineNo">430</span> } catch (Exception e) {<a name="line.430"></a>
+<span class="sourceLineNo">431</span> LOG.info("Exception during snapshot request: " + ClientSnapshotDescriptionUtils.toString(<a name="line.431"></a>
+<span class="sourceLineNo">432</span> ss)<a name="line.432"></a>
+<span class="sourceLineNo">433</span> + ". This is ok, we expect some", e);<a name="line.433"></a>
+<span class="sourceLineNo">434</span> }<a name="line.434"></a>
+<span class="sourceLineNo">435</span> LOG.info("Submitted snapshot request: " + ClientSnapshotDescriptionUtils.toString(ss));<a name="line.435"></a>
+<span class="sourceLineNo">436</span> toBeSubmitted.countDown();<a name="line.436"></a>
+<span class="sourceLineNo">437</span> }<a name="line.437"></a>
+<span class="sourceLineNo">438</span> };<a name="line.438"></a>
+<span class="sourceLineNo">439</span><a name="line.439"></a>
+<span class="sourceLineNo">440</span> // build descriptions<a name="line.440"></a>
+<span class="sourceLineNo">441</span> SnapshotDescription[] descs = new SnapshotDescription[ssNum];<a name="line.441"></a>
+<span class="sourceLineNo">442</span> for (int i = 0; i < ssNum; i++) {<a name="line.442"></a>
+<span class="sourceLineNo">443</span> SnapshotDescription.Builder builder = SnapshotDescription.newBuilder();<a name="line.443"></a>
+<span class="sourceLineNo">444</span> builder.setTable(((i % 2) == 0 ? TABLE_NAME : TABLE2_NAME).getNameAsString());<a name="line.444"></a>
+<span class="sourceLineNo">445</span> builder.setName("ss"+i);<a name="line.445"></a>
+<span class="sourceLineNo">446</span> builder.setType(SnapshotDescription.Type.FLUSH);<a name="line.446"></a>
+<span class="sourceLineNo">447</span> descs[i] = builder.build();<a name="line.447"></a>
+<span class="sourceLineNo">448</span> }<a name="line.448"></a>
+<span class="sourceLineNo">449</span><a name="line.449"></a>
+<span class="sourceLineNo">450</span> // kick each off its own thread<a name="line.450"></a>
+<span class="sourceLineNo">451</span> for (int i=0 ; i < ssNum; i++) {<a name="line.451"></a>
+<span class="sourceLineNo">452</span> new Thread(new SSRunnable(descs[i])).start();<a name="line.452"></a>
+<span class="sourceLineNo">453</span> }<a name="line.453"></a>
+<span class="sourceLineNo">454</span><a name="line.454"></a>
+<span class="sourceLineNo">455</span> // wait until all have been submitted<a name="line.455"></a>
+<span class="sourceLineNo">456</span> toBeSubmitted.await();<a name="line.456"></a>
+<span class="sourceLineNo">457</span><a name="line.457"></a>
+<span class="sourceLineNo">458</span> // loop until all are done.<a name="line.458"></a>
+<span class="sourceLineNo">459</span> while (true) {<a name="line.459"></a>
+<span class="sourceLineNo">460</span> int doneCount = 0;<a name="line.460"></a>
+<span class="sourceLineNo">461</span> for (SnapshotDescription ss : descs) {<a name="line.461"></a>
+<span class="sourceLineNo">462</span> try {<a name="line.462"></a>
+<span class="sourceLineNo">463</span> if (admin.isSnapshotFinished(ss)) {<a name="line.463"></a>
+<span class="sourceLineNo">464</span> doneCount++;<a name="line.464"></a>
+<span class="sourceLineNo">465</span> }<a name="line.465"></a>
+<span class="sourceLineNo">466</span> } catch (Exception e) {<a name="line.466"></a>
+<span class="sourceLineNo">467</span> LOG.warn("Got an exception when checking for snapshot " + ss.getName(), e);<a name="line.467"></a>
+<span class="sourceLineNo">468</span> doneCount++;<a name="line.468"></a>
+<span class="sourceLineNo">469</span> }<a name="line.469"></a>
+<span class="sourceLineNo">470</span> }<a name="line.470"></a>
+<span class="sourceLineNo">471</span> if (doneCount == descs.length) {<a name="line.471"></a>
+<span class="sourceLineNo">472</span> break;<a name="line.472"></a>
+<span class="sourceLineNo">473</span> }<a name="line.473"></a>
+<span class="sourceLineNo">474</span> Thread.sleep(100);<a name="line.474"></a>
+<span class="sourceLineNo">475</span> }<a name="line.475"></a>
+<span class="sourceLineNo">476</span><a name="line.476"></a>
+<span class="sourceLineNo">477</span> // dump for debugging<a name="line.477"></a>
+<span class="sourceLineNo">478</span> UTIL.getHBaseCluster().getMaster().getMasterFileSystem().logFileSystemState(LOG);<a name="line.478"></a>
+<span class="sourceLineNo">479</span><a name="line.479"></a>
+<span class="sourceLineNo">480</span> List<SnapshotDescription> taken = admin.listSnapshots();<a name="line.480"></a>
+<span class="sourceLineNo">481</span> int takenSize = taken.size();<a name="line.481"></a>
+<span class="sourceLineNo">482</span> LOG.info("Taken " + takenSize + " snapshots: " + taken);<a name="line.482"></a>
+<span class="sourceLineNo">483</span> assertTrue("We expect at least 1 request to be rejected because of we concurrently" +<a name="line.483"></a>
+<span class="sourceLineNo">484</span> " issued many requests", takenSize < ssNum && takenSize > 0);<a name="line.484"></a>
+<span class="sourceLineNo">485</span><a name="line.485"></a>
+<span class="sourceLineNo">486</span> // Verify that there's at least one snapshot per table<a name="line.486"></a>
+<span class="sourceLineNo">487</span> int t1SnapshotsCount = 0;<a name="line.487"></a>
+<span class="sourceLineNo">488</span> int t2SnapshotsCount = 0;<a name="line.488"></a>
+<span class="sourceLineNo">489</span> for (SnapshotDescription ss : taken) {<a name="line.489"></a>
+<span class="sourceLineNo">490</span> if (TableName.valueOf(ss.getTable()).equals(TABLE_NAME)) {<a name="line.490"></a>
+<span class="sourceLineNo">491</span> t1SnapshotsCount++;<a name="line.491"></a>
+<span class="sourceLineNo">492</span> } else if (TableName.valueOf(ss.getTable()).equals(TABLE2_NAME)) {<a name="line.492"></a>
+<span class="sourceLineNo">493</span> t2SnapshotsCount++;<a name="line.493"></a>
+<span class="sourceLineNo">494</span> }<a name="line.494"></a>
+<span class="sourceLineNo">495</span> }<a name="line.495"></a>
+<span class="sourceLineNo">496</span> assertTrue("We expect at least 1 snapshot of table1 ", t1SnapshotsCount > 0);<a name="line.496"></a>
+<span class="sourceLineNo">497</span> assertTrue("We expect at least 1 snapshot of table2 ", t2SnapshotsCount > 0);<a name="line.497"></a>
+<span class="sourceLineNo">498</span><a name="line.498"></a>
+<span class="sourceLineNo">499</span> UTIL.deleteTable(TABLE2_NAME);<a name="line.499"></a>
+<span class="sourceLineNo">500</span> }<a name="line.500"></a>
+<span class="sourceLineNo">501</span><a name="line.501"></a>
+<span class="sourceLineNo">502</span> private void waitRegionsAfterMerge(final long numRegionsAfterMerge)<a name="line.502"></a>
+<span class="sourceLineNo">503</span> throws IOException, InterruptedException {<a name="line.503"></a>
+<span class="sourceLineNo">504</span> // Verify that there's one region less<a name="line.504"></a>
+<span class="sourceLineNo">505</span> long startTime = System.currentTimeMillis();<a name="line.505"></a>
+<span class="sourceLineNo">506</span> while (admin.getTableRegions(TABLE_NAME).size() != numRegionsAfterMerge) {<a name="line.506"></a>
+<span class="sourceLineNo">507</span> // This may be flaky... if after 15sec the merge is not complete give up<a name="line.507"></a>
+<span class="sourceLineNo">508</span> // it will fail in the assertEquals(numRegionsAfterMerge).<a name="line.508"></a>
+<span class="sourceLineNo">509</span> if ((System.currentTimeMillis() - startTime) > 15000)<a name="line.509"></a>
+<span class="sourceLineNo">510</span> break;<a name="line.510"></a>
+<span class="sourceLineNo">511</span> Thread.sleep(100);<a name="line.511"></a>
+<span class="sourceLineNo">512</span> }<a name="line.512"></a>
+<span class="sourceLineNo">513</span> SnapshotTestingUtils.waitForTableToBeOnline(UTIL, TABLE_NAME);<a name="line.513"></a>
+<span class="sourceLineNo">514</span> }<a name="line.514"></a>
+<span class="sourceLineNo">515</span><a name="line.515"></a>
+<span class="sourceLineNo">516</span><a name="line.516"></a>
+<span class="sourceLineNo">517</span> protected void verifyRowCount(final HBaseTestingUtility util, final TableName tableName,<a name="line.517"></a>
+<span class="sourceLineNo">518</span> long expectedRows) throws IOException {<a name="line.518"></a>
+<span class="sourceLineNo">519</span> SnapshotTestingUtils.verifyRowCount(util, tableName, expectedRows);<a name="line.519"></a>
+<span class="sourceLineNo">520</span> }<a name="line.520"></a>
<span class="sourceLineNo">521</span><a name="line.521"></a>
-<span class="sourceLineNo">522</span> protected void verifyRowCount(final HBaseTestingUtility util, final TableName tableName,<a name="line.522"></a>
-<span class="sourceLineNo">523</span> long expectedRows) throws IOException {<a name="line.523"></a>
-<span class="sourceLineNo">524</span> SnapshotTestingUtils.verifyRowCount(util, tableName, expectedRows);<a name="line.524"></a>
-<span class="sourceLineNo">525</span> }<a name="line.525"></a>
-<span class="sourceLineNo">526</span><a name="line.526"></a>
-<span class="sourceLineNo">527</span> protected int countRows(final Table table, final byte[]... families) throws IOException {<a name="line.527"></a>
-<span class="sourceLineNo">528</span> return UTIL.countRows(table, families);<a name="line.528"></a>
-<span class="sourceLineNo">529</span> }<a name="line.529"></a>
-<span class="sourceLineNo">530</span>}<a name="line.530"></a>
+<span class="sourceLineNo">522</span> protected int countRows(final Table table, final byte[]... families) throws IOException {<a name="line.522"></a>
+<span class="sourceLineNo">523</span> return UTIL.countRows(table, families);<a name="line.523"></a>
+<span class="sourceLineNo">524</span> }<a name="line.524"></a>
+<span class="sourceLineNo">525</span>}<a name="line.525"></a>