[02/13] hbase-site git commit: Published site at f32d2618430f70e1b0db92785294b2c7892cc02b.

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c727a708/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.html
index ae144fb..42b6912 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.html
@@ -26,408 +26,433 @@
 <span class="sourceLineNo">018</span>package 
org.apache.hadoop.hbase.master.cleaner;<a name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
 <span class="sourceLineNo">020</span>import static 
org.junit.Assert.assertEquals;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import static 
org.junit.Assert.assertTrue;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import static org.junit.Assert.fail;<a 
name="line.22"></a>
-<span class="sourceLineNo">023</span><a name="line.23"></a>
-<span class="sourceLineNo">024</span>import java.io.IOException;<a 
name="line.24"></a>
-<span class="sourceLineNo">025</span>import java.util.Collection;<a 
name="line.25"></a>
-<span class="sourceLineNo">026</span>import java.util.List;<a 
name="line.26"></a>
-<span class="sourceLineNo">027</span>import java.util.Set;<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.FileSystem;<a 
name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.fs.Path;<a 
name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.HBaseTestingUtility;<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.TableName;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.client.Admin;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;<a 
name="line.36"></a>
-<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.client.TableDescriptor;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.client.TableDescriptorBuilder;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.master.HMaster;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.master.snapshot.DisabledTableSnapshotHandler;<a 
name="line.40"></a>
-<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.master.snapshot.SnapshotHFileCleaner;<a 
name="line.41"></a>
-<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.master.snapshot.SnapshotManager;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.regionserver.CompactedHFilesDischarger;<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy;<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.regionserver.HRegion;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.regionserver.HRegionServer;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.snapshot.SnapshotDescriptionUtils;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.snapshot.SnapshotReferenceUtil;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import 
org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import 
org.apache.hadoop.hbase.snapshot.UnknownSnapshotException;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import 
org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import 
org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import 
org.apache.hadoop.hbase.util.FSUtils;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import 
org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;<a 
name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.junit.After;<a 
name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.junit.AfterClass;<a 
name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.junit.Before;<a 
name="line.59"></a>
-<span class="sourceLineNo">060</span>import org.junit.BeforeClass;<a 
name="line.60"></a>
-<span class="sourceLineNo">061</span>import org.junit.ClassRule;<a 
name="line.61"></a>
-<span class="sourceLineNo">062</span>import org.junit.Test;<a 
name="line.62"></a>
-<span class="sourceLineNo">063</span>import 
org.junit.experimental.categories.Category;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>import org.mockito.Mockito;<a 
name="line.64"></a>
-<span class="sourceLineNo">065</span>import org.slf4j.Logger;<a 
name="line.65"></a>
-<span class="sourceLineNo">066</span>import org.slf4j.LoggerFactory;<a 
name="line.66"></a>
-<span class="sourceLineNo">067</span><a name="line.67"></a>
-<span class="sourceLineNo">068</span>import 
org.apache.hbase.thirdparty.com.google.common.collect.Lists;<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotRequest;<a
 name="line.70"></a>
-<span class="sourceLineNo">071</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest;<a
 name="line.71"></a>
-<span class="sourceLineNo">072</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse;<a
 name="line.72"></a>
-<span class="sourceLineNo">073</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsSnapshotDoneRequest;<a
 name="line.73"></a>
-<span class="sourceLineNo">074</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsSnapshotDoneResponse;<a
 name="line.74"></a>
-<span class="sourceLineNo">075</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotDescription;<a
 name="line.75"></a>
+<span class="sourceLineNo">021</span>import static 
org.junit.Assert.assertFalse;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import static 
org.junit.Assert.assertTrue;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import static org.junit.Assert.fail;<a 
name="line.23"></a>
+<span class="sourceLineNo">024</span><a name="line.24"></a>
+<span class="sourceLineNo">025</span>import java.io.IOException;<a 
name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.util.Collection;<a 
name="line.26"></a>
+<span class="sourceLineNo">027</span>import java.util.List;<a 
name="line.27"></a>
+<span class="sourceLineNo">028</span>import java.util.Set;<a 
name="line.28"></a>
+<span class="sourceLineNo">029</span>import java.util.regex.Pattern;<a 
name="line.29"></a>
+<span class="sourceLineNo">030</span><a name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.fs.FileSystem;<a 
name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.fs.Path;<a 
name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.Waiter;<a 
name="line.38"></a>
+<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.client.Admin;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.client.Put;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.client.SnapshotType;<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.client.TableDescriptor;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.client.TableDescriptorBuilder;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.master.HMaster;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.master.snapshot.DisabledTableSnapshotHandler;<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.master.snapshot.SnapshotHFileCleaner;<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>import 
org.apache.hadoop.hbase.master.snapshot.SnapshotManager;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import 
org.apache.hadoop.hbase.regionserver.CompactedHFilesDischarger;<a 
name="line.50"></a>
+<span class="sourceLineNo">051</span>import 
org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy;<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>import 
org.apache.hadoop.hbase.regionserver.HRegion;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import 
org.apache.hadoop.hbase.regionserver.HRegionServer;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import 
org.apache.hadoop.hbase.snapshot.SnapshotDescriptionUtils;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import 
org.apache.hadoop.hbase.snapshot.SnapshotReferenceUtil;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import 
org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import 
org.apache.hadoop.hbase.snapshot.UnknownSnapshotException;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import 
org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import 
org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>import 
org.apache.hadoop.hbase.util.FSUtils;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>import 
org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;<a 
name="line.63"></a>
+<span class="sourceLineNo">064</span>import org.junit.After;<a 
name="line.64"></a>
+<span class="sourceLineNo">065</span>import org.junit.AfterClass;<a 
name="line.65"></a>
+<span class="sourceLineNo">066</span>import org.junit.Before;<a 
name="line.66"></a>
+<span class="sourceLineNo">067</span>import org.junit.BeforeClass;<a 
name="line.67"></a>
+<span class="sourceLineNo">068</span>import org.junit.ClassRule;<a 
name="line.68"></a>
+<span class="sourceLineNo">069</span>import org.junit.Test;<a 
name="line.69"></a>
+<span class="sourceLineNo">070</span>import 
org.junit.experimental.categories.Category;<a name="line.70"></a>
+<span class="sourceLineNo">071</span>import org.mockito.Mockito;<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>import org.slf4j.Logger;<a 
name="line.72"></a>
+<span class="sourceLineNo">073</span>import org.slf4j.LoggerFactory;<a 
name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>import 
org.apache.hbase.thirdparty.com.google.common.collect.Lists;<a 
name="line.75"></a>
 <span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span>/**<a name="line.77"></a>
-<span class="sourceLineNo">078</span> * Test the master-related aspects of a 
snapshot<a name="line.78"></a>
-<span class="sourceLineNo">079</span> */<a name="line.79"></a>
-<span class="sourceLineNo">080</span>@Category({MasterTests.class, 
MediumTests.class})<a name="line.80"></a>
-<span class="sourceLineNo">081</span>public class TestSnapshotFromMaster {<a 
name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span>  @ClassRule<a name="line.83"></a>
-<span class="sourceLineNo">084</span>  public static final HBaseClassTestRule 
CLASS_RULE =<a name="line.84"></a>
-<span class="sourceLineNo">085</span>      
HBaseClassTestRule.forClass(TestSnapshotFromMaster.class);<a name="line.85"></a>
-<span class="sourceLineNo">086</span><a name="line.86"></a>
-<span class="sourceLineNo">087</span>  private static final Logger LOG = 
LoggerFactory.getLogger(TestSnapshotFromMaster.class);<a name="line.87"></a>
-<span class="sourceLineNo">088</span>  private static final 
HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.88"></a>
-<span class="sourceLineNo">089</span>  private static final int NUM_RS = 2;<a 
name="line.89"></a>
-<span class="sourceLineNo">090</span>  private static Path rootDir;<a 
name="line.90"></a>
-<span class="sourceLineNo">091</span>  private static FileSystem fs;<a 
name="line.91"></a>
-<span class="sourceLineNo">092</span>  private static HMaster master;<a 
name="line.92"></a>
+<span class="sourceLineNo">077</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.DeleteSnapshotRequest;<a
 name="line.77"></a>
+<span class="sourceLineNo">078</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest;<a
 name="line.78"></a>
+<span class="sourceLineNo">079</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsResponse;<a
 name="line.79"></a>
+<span class="sourceLineNo">080</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsSnapshotDoneRequest;<a
 name="line.80"></a>
+<span class="sourceLineNo">081</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsSnapshotDoneResponse;<a
 name="line.81"></a>
+<span class="sourceLineNo">082</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotDescription;<a
 name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span>/**<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * Test the master-related aspects of a 
snapshot<a name="line.85"></a>
+<span class="sourceLineNo">086</span> */<a name="line.86"></a>
+<span class="sourceLineNo">087</span>@Category({MasterTests.class, 
MediumTests.class})<a name="line.87"></a>
+<span class="sourceLineNo">088</span>public class TestSnapshotFromMaster {<a 
name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span>  @ClassRule<a name="line.90"></a>
+<span class="sourceLineNo">091</span>  public static final HBaseClassTestRule 
CLASS_RULE =<a name="line.91"></a>
+<span class="sourceLineNo">092</span>      
HBaseClassTestRule.forClass(TestSnapshotFromMaster.class);<a name="line.92"></a>
 <span class="sourceLineNo">093</span><a name="line.93"></a>
-<span class="sourceLineNo">094</span>  // for hfile archiving test.<a 
name="line.94"></a>
-<span class="sourceLineNo">095</span>  private static Path archiveDir;<a 
name="line.95"></a>
-<span class="sourceLineNo">096</span>  private static final byte[] TEST_FAM = 
Bytes.toBytes("fam");<a name="line.96"></a>
-<span class="sourceLineNo">097</span>  private static final TableName 
TABLE_NAME =<a name="line.97"></a>
-<span class="sourceLineNo">098</span>      TableName.valueOf("test");<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>  // refresh the cache every 1/2 second<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>  private static final long 
cacheRefreshPeriod = 500;<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  private static final int 
blockingStoreFiles = 12;<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>   * Setup the config for the cluster<a 
name="line.104"></a>
-<span class="sourceLineNo">105</span>   */<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  @BeforeClass<a name="line.106"></a>
-<span class="sourceLineNo">107</span>  public static void setupCluster() 
throws Exception {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    setupConf(UTIL.getConfiguration());<a 
name="line.108"></a>
-<span class="sourceLineNo">109</span>    UTIL.startMiniCluster(NUM_RS);<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>    fs = 
UTIL.getDFSCluster().getFileSystem();<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    master = 
UTIL.getMiniHBaseCluster().getMaster();<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    rootDir = 
master.getMasterFileSystem().getRootDir();<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    archiveDir = new Path(rootDir, 
HConstants.HFILE_ARCHIVE_DIRECTORY);<a name="line.113"></a>
-<span class="sourceLineNo">114</span>  }<a name="line.114"></a>
-<span class="sourceLineNo">115</span><a name="line.115"></a>
-<span class="sourceLineNo">116</span>  private static void 
setupConf(Configuration conf) {<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    // disable the ui<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>    
conf.setInt("hbase.regionsever.info.port", -1);<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    // change the flush size to a small 
amount, regulating number of store files<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    
conf.setInt("hbase.hregion.memstore.flush.size", 25000);<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    // so make sure we get a compaction 
when doing a load, but keep around some<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    // files in the store<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>    
conf.setInt("hbase.hstore.compaction.min", 2);<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    
conf.setInt("hbase.hstore.compactionThreshold", 5);<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    // block writes if we get to 12 store 
files<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    
conf.setInt("hbase.hstore.blockingStoreFiles", blockingStoreFiles);<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>    // Ensure no extra cleaners on by 
default (e.g. TimeToLiveHFileCleaner)<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    
conf.set(HFileCleaner.MASTER_HFILE_CLEANER_PLUGINS, "");<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    
conf.set(HConstants.HBASE_MASTER_LOGCLEANER_PLUGINS, "");<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    // Enable snapshot<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span>    
conf.setBoolean(SnapshotManager.HBASE_SNAPSHOT_ENABLED, true);<a 
name="line.131"></a>
-<span class="sourceLineNo">132</span>    
conf.setLong(SnapshotHFileCleaner.HFILE_CACHE_REFRESH_PERIOD_CONF_KEY, 
cacheRefreshPeriod);<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    
conf.set(HConstants.HBASE_REGION_SPLIT_POLICY_KEY,<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      
ConstantSizeRegionSplitPolicy.class.getName());<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    
conf.setInt("hbase.hfile.compactions.cleaner.interval", 20 * 1000);<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span>  }<a name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span>  @Before<a name="line.139"></a>
-<span class="sourceLineNo">140</span>  public void setup() throws Exception 
{<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    UTIL.createTable(TABLE_NAME, 
TEST_FAM);<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    
master.getSnapshotManager().setSnapshotHandlerForTesting(TABLE_NAME, null);<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>  @After<a name="line.145"></a>
-<span class="sourceLineNo">146</span>  public void tearDown() throws Exception 
{<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    UTIL.deleteTable(TABLE_NAME);<a 
name="line.147"></a>
-<span class="sourceLineNo">148</span>    
SnapshotTestingUtils.deleteAllSnapshots(UTIL.getAdmin());<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    
SnapshotTestingUtils.deleteArchiveDirectory(UTIL);<a name="line.149"></a>
+<span class="sourceLineNo">094</span>  private static final Logger LOG = 
LoggerFactory.getLogger(TestSnapshotFromMaster.class);<a name="line.94"></a>
+<span class="sourceLineNo">095</span>  private static final 
HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.95"></a>
+<span class="sourceLineNo">096</span>  private static final int NUM_RS = 2;<a 
name="line.96"></a>
+<span class="sourceLineNo">097</span>  private static Path rootDir;<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>  private static FileSystem fs;<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>  private static HMaster master;<a 
name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span>  // for hfile archiving test.<a 
name="line.101"></a>
+<span class="sourceLineNo">102</span>  private static Path archiveDir;<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>  private static final byte[] TEST_FAM = 
Bytes.toBytes("fam");<a name="line.103"></a>
+<span class="sourceLineNo">104</span>  private static final TableName 
TABLE_NAME =<a name="line.104"></a>
+<span class="sourceLineNo">105</span>      TableName.valueOf("test");<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>  // refresh the cache every 1/2 second<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span>  private static final long 
cacheRefreshPeriod = 500;<a name="line.107"></a>
+<span class="sourceLineNo">108</span>  private static final int 
blockingStoreFiles = 12;<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>   * Setup the config for the cluster<a 
name="line.111"></a>
+<span class="sourceLineNo">112</span>   */<a name="line.112"></a>
+<span class="sourceLineNo">113</span>  @BeforeClass<a name="line.113"></a>
+<span class="sourceLineNo">114</span>  public static void setupCluster() 
throws Exception {<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    setupConf(UTIL.getConfiguration());<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span>    UTIL.startMiniCluster(NUM_RS);<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>    fs = 
UTIL.getDFSCluster().getFileSystem();<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    master = 
UTIL.getMiniHBaseCluster().getMaster();<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    rootDir = 
master.getMasterFileSystem().getRootDir();<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    archiveDir = new Path(rootDir, 
HConstants.HFILE_ARCHIVE_DIRECTORY);<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>  private static void 
setupConf(Configuration conf) {<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    // disable the ui<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>    
conf.setInt("hbase.regionsever.info.port", -1);<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    // change the flush size to a small 
amount, regulating number of store files<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    
conf.setInt("hbase.hregion.memstore.flush.size", 25000);<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    // so make sure we get a compaction 
when doing a load, but keep around some<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    // files in the store<a 
name="line.129"></a>
+<span class="sourceLineNo">130</span>    
conf.setInt("hbase.hstore.compaction.min", 2);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    
conf.setInt("hbase.hstore.compactionThreshold", 5);<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    // block writes if we get to 12 store 
files<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    
conf.setInt("hbase.hstore.blockingStoreFiles", blockingStoreFiles);<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>    // Ensure no extra cleaners on by 
default (e.g. TimeToLiveHFileCleaner)<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    
conf.set(HFileCleaner.MASTER_HFILE_CLEANER_PLUGINS, "");<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    
conf.set(HConstants.HBASE_MASTER_LOGCLEANER_PLUGINS, "");<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    // Enable snapshot<a 
name="line.137"></a>
+<span class="sourceLineNo">138</span>    
conf.setBoolean(SnapshotManager.HBASE_SNAPSHOT_ENABLED, true);<a 
name="line.138"></a>
+<span class="sourceLineNo">139</span>    
conf.setLong(SnapshotManager.HBASE_SNAPSHOT_SENTINELS_CLEANUP_TIMEOUT_MILLIS, 3 
* 1000L);<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    
conf.setLong(SnapshotHFileCleaner.HFILE_CACHE_REFRESH_PERIOD_CONF_KEY, 
cacheRefreshPeriod);<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    
conf.set(HConstants.HBASE_REGION_SPLIT_POLICY_KEY,<a name="line.141"></a>
+<span class="sourceLineNo">142</span>      
ConstantSizeRegionSplitPolicy.class.getName());<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    
conf.setInt("hbase.hfile.compactions.cleaner.interval", 20 * 1000);<a 
name="line.143"></a>
+<span class="sourceLineNo">144</span>  }<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span>  @Before<a name="line.146"></a>
+<span class="sourceLineNo">147</span>  public void setup() throws Exception 
{<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    UTIL.createTable(TABLE_NAME, 
TEST_FAM);<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    
master.getSnapshotManager().setSnapshotHandlerForTesting(TABLE_NAME, null);<a 
name="line.149"></a>
 <span class="sourceLineNo">150</span>  }<a name="line.150"></a>
 <span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span>  @AfterClass<a name="line.152"></a>
-<span class="sourceLineNo">153</span>  public static void cleanupTest() throws 
Exception {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    try {<a name="line.154"></a>
-<span class="sourceLineNo">155</span>      UTIL.shutdownMiniCluster();<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>    } catch (Exception e) {<a 
name="line.156"></a>
-<span class="sourceLineNo">157</span>      // NOOP;<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><a name="line.160"></a>
-<span class="sourceLineNo">161</span>  /**<a name="line.161"></a>
-<span class="sourceLineNo">162</span>   * Test that the contract from the 
master for checking on a snapshot are valid.<a name="line.162"></a>
-<span class="sourceLineNo">163</span>   * &lt;p&gt;<a name="line.163"></a>
-<span class="sourceLineNo">164</span>   * &lt;ol&gt;<a name="line.164"></a>
-<span class="sourceLineNo">165</span>   * &lt;li&gt;If a snapshot fails with 
an error, we expect to get the source error.&lt;/li&gt;<a name="line.165"></a>
-<span class="sourceLineNo">166</span>   * &lt;li&gt;If there is no snapshot 
name supplied, we should get an error.&lt;/li&gt;<a name="line.166"></a>
-<span class="sourceLineNo">167</span>   * &lt;li&gt;If asking about a snapshot 
has hasn't occurred, you should get an error.&lt;/li&gt;<a name="line.167"></a>
-<span class="sourceLineNo">168</span>   * &lt;/ol&gt;<a name="line.168"></a>
-<span class="sourceLineNo">169</span>   */<a name="line.169"></a>
-<span class="sourceLineNo">170</span>  @Test<a name="line.170"></a>
-<span class="sourceLineNo">171</span>  public void testIsDoneContract() throws 
Exception {<a name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span>    IsSnapshotDoneRequest.Builder builder 
= IsSnapshotDoneRequest.newBuilder();<a name="line.173"></a>
-<span class="sourceLineNo">174</span><a name="line.174"></a>
-<span class="sourceLineNo">175</span>    String snapshotName = 
"asyncExpectedFailureTest";<a name="line.175"></a>
-<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span>    // check that we get an exception 
when looking up snapshot where one hasn't happened<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    
SnapshotTestingUtils.expectSnapshotDoneException(master, builder.build(),<a 
name="line.178"></a>
-<span class="sourceLineNo">179</span>      UnknownSnapshotException.class);<a 
name="line.179"></a>
-<span class="sourceLineNo">180</span><a name="line.180"></a>
-<span class="sourceLineNo">181</span>    // and that we get the same issue, 
even if we specify a name<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    SnapshotDescription desc = 
SnapshotDescription.newBuilder()<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      
.setName(snapshotName).setTable(TABLE_NAME.getNameAsString()).build();<a 
name="line.183"></a>
-<span class="sourceLineNo">184</span>    builder.setSnapshot(desc);<a 
name="line.184"></a>
+<span class="sourceLineNo">152</span>  @After<a name="line.152"></a>
+<span class="sourceLineNo">153</span>  public void tearDown() throws Exception 
{<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    UTIL.deleteTable(TABLE_NAME);<a 
name="line.154"></a>
+<span class="sourceLineNo">155</span>    
SnapshotTestingUtils.deleteAllSnapshots(UTIL.getAdmin());<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    
SnapshotTestingUtils.deleteArchiveDirectory(UTIL);<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>  @AfterClass<a name="line.159"></a>
+<span class="sourceLineNo">160</span>  public static void cleanupTest() throws 
Exception {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    try {<a name="line.161"></a>
+<span class="sourceLineNo">162</span>      UTIL.shutdownMiniCluster();<a 
name="line.162"></a>
+<span class="sourceLineNo">163</span>    } catch (Exception e) {<a 
name="line.163"></a>
+<span class="sourceLineNo">164</span>      // NOOP;<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    }<a name="line.165"></a>
+<span class="sourceLineNo">166</span>  }<a name="line.166"></a>
+<span class="sourceLineNo">167</span><a name="line.167"></a>
+<span class="sourceLineNo">168</span>  /**<a name="line.168"></a>
+<span class="sourceLineNo">169</span>   * Test that the contract from the 
master for checking on a snapshot are valid.<a name="line.169"></a>
+<span class="sourceLineNo">170</span>   * &lt;p&gt;<a name="line.170"></a>
+<span class="sourceLineNo">171</span>   * &lt;ol&gt;<a name="line.171"></a>
+<span class="sourceLineNo">172</span>   * &lt;li&gt;If a snapshot fails with 
an error, we expect to get the source error.&lt;/li&gt;<a name="line.172"></a>
+<span class="sourceLineNo">173</span>   * &lt;li&gt;If there is no snapshot 
name supplied, we should get an error.&lt;/li&gt;<a name="line.173"></a>
+<span class="sourceLineNo">174</span>   * &lt;li&gt;If asking about a snapshot 
has hasn't occurred, you should get an error.&lt;/li&gt;<a name="line.174"></a>
+<span class="sourceLineNo">175</span>   * &lt;/ol&gt;<a name="line.175"></a>
+<span class="sourceLineNo">176</span>   */<a name="line.176"></a>
+<span class="sourceLineNo">177</span>  @Test<a name="line.177"></a>
+<span class="sourceLineNo">178</span>  public void testIsDoneContract() throws 
Exception {<a name="line.178"></a>
+<span class="sourceLineNo">179</span><a name="line.179"></a>
+<span class="sourceLineNo">180</span>    IsSnapshotDoneRequest.Builder builder 
= IsSnapshotDoneRequest.newBuilder();<a name="line.180"></a>
+<span class="sourceLineNo">181</span><a name="line.181"></a>
+<span class="sourceLineNo">182</span>    String snapshotName = 
"asyncExpectedFailureTest";<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span>    // check that we get an exception 
when looking up snapshot where one hasn't happened<a name="line.184"></a>
 <span class="sourceLineNo">185</span>    
SnapshotTestingUtils.expectSnapshotDoneException(master, builder.build(),<a 
name="line.185"></a>
 <span class="sourceLineNo">186</span>      UnknownSnapshotException.class);<a 
name="line.186"></a>
 <span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span>    // set a mock handler to simulate a 
snapshot<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    DisabledTableSnapshotHandler 
mockHandler = Mockito.mock(DisabledTableSnapshotHandler.class);<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>    
Mockito.when(mockHandler.getException()).thenReturn(null);<a 
name="line.190"></a>
-<span class="sourceLineNo">191</span>    
Mockito.when(mockHandler.getSnapshot()).thenReturn(desc);<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    
Mockito.when(mockHandler.isFinished()).thenReturn(Boolean.TRUE);<a 
name="line.192"></a>
-<span class="sourceLineNo">193</span>    
Mockito.when(mockHandler.getCompletionTimestamp())<a name="line.193"></a>
-<span class="sourceLineNo">194</span>      
.thenReturn(EnvironmentEdgeManager.currentTime());<a name="line.194"></a>
-<span class="sourceLineNo">195</span><a name="line.195"></a>
-<span class="sourceLineNo">196</span>    master.getSnapshotManager()<a 
name="line.196"></a>
-<span class="sourceLineNo">197</span>        
.setSnapshotHandlerForTesting(TABLE_NAME, mockHandler);<a name="line.197"></a>
-<span class="sourceLineNo">198</span><a name="line.198"></a>
-<span class="sourceLineNo">199</span>    // if we do a lookup without a 
snapshot name, we should fail - you should always know your name<a 
name="line.199"></a>
-<span class="sourceLineNo">200</span>    builder = 
IsSnapshotDoneRequest.newBuilder();<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    
SnapshotTestingUtils.expectSnapshotDoneException(master, builder.build(),<a 
name="line.201"></a>
-<span class="sourceLineNo">202</span>      UnknownSnapshotException.class);<a 
name="line.202"></a>
-<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span>    // then do the lookup for the 
snapshot that it is done<a name="line.204"></a>
-<span class="sourceLineNo">205</span>    builder.setSnapshot(desc);<a 
name="line.205"></a>
-<span class="sourceLineNo">206</span>    IsSnapshotDoneResponse response =<a 
name="line.206"></a>
-<span class="sourceLineNo">207</span>      
master.getMasterRpcServices().isSnapshotDone(null, builder.build());<a 
name="line.207"></a>
-<span class="sourceLineNo">208</span>    assertTrue("Snapshot didn't complete 
when it should have.", response.getDone());<a name="line.208"></a>
-<span class="sourceLineNo">209</span><a name="line.209"></a>
-<span class="sourceLineNo">210</span>    // now try the case where we are 
looking for a snapshot we didn't take<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    
builder.setSnapshot(SnapshotDescription.newBuilder().setName("Not A 
Snapshot").build());<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    
SnapshotTestingUtils.expectSnapshotDoneException(master, builder.build(),<a 
name="line.212"></a>
-<span class="sourceLineNo">213</span>      UnknownSnapshotException.class);<a 
name="line.213"></a>
-<span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span>    // then create a snapshot to the fs 
and make sure that we can find it when checking done<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    snapshotName = "completed";<a 
name="line.216"></a>
-<span class="sourceLineNo">217</span>    desc = 
createSnapshot(snapshotName);<a name="line.217"></a>
-<span class="sourceLineNo">218</span><a name="line.218"></a>
-<span class="sourceLineNo">219</span>    builder.setSnapshot(desc);<a 
name="line.219"></a>
-<span class="sourceLineNo">220</span>    response = 
master.getMasterRpcServices().isSnapshotDone(null, builder.build());<a 
name="line.220"></a>
-<span class="sourceLineNo">221</span>    assertTrue("Completed, on-disk 
snapshot not found", response.getDone());<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>  @Test<a name="line.224"></a>
-<span class="sourceLineNo">225</span>  public void testGetCompletedSnapshots() 
throws Exception {<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    // first check when there are no 
snapshots<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    GetCompletedSnapshotsRequest request 
= GetCompletedSnapshotsRequest.newBuilder().build();<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    GetCompletedSnapshotsResponse 
response =<a name="line.228"></a>
-<span class="sourceLineNo">229</span>      
master.getMasterRpcServices().getCompletedSnapshots(null, request);<a 
name="line.229"></a>
-<span class="sourceLineNo">230</span>    assertEquals("Found unexpected number 
of snapshots", 0, response.getSnapshotsCount());<a name="line.230"></a>
-<span class="sourceLineNo">231</span><a name="line.231"></a>
-<span class="sourceLineNo">232</span>    // write one snapshot to the fs<a 
name="line.232"></a>
-<span class="sourceLineNo">233</span>    String snapshotName = "completed";<a 
name="line.233"></a>
-<span class="sourceLineNo">234</span>    SnapshotDescription snapshot = 
createSnapshot(snapshotName);<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span>    // check that we get one snapshot<a 
name="line.236"></a>
-<span class="sourceLineNo">237</span>    response = 
master.getMasterRpcServices().getCompletedSnapshots(null, request);<a 
name="line.237"></a>
-<span class="sourceLineNo">238</span>    assertEquals("Found unexpected number 
of snapshots", 1, response.getSnapshotsCount());<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    List&lt;SnapshotDescription&gt; 
snapshots = response.getSnapshotsList();<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    List&lt;SnapshotDescription&gt; 
expected = Lists.newArrayList(snapshot);<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    assertEquals("Returned snapshots 
don't match created snapshots", expected, snapshots);<a name="line.241"></a>
+<span class="sourceLineNo">188</span>    // and that we get the same issue, 
even if we specify a name<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    SnapshotDescription desc = 
SnapshotDescription.newBuilder()<a name="line.189"></a>
+<span class="sourceLineNo">190</span>      
.setName(snapshotName).setTable(TABLE_NAME.getNameAsString()).build();<a 
name="line.190"></a>
+<span class="sourceLineNo">191</span>    builder.setSnapshot(desc);<a 
name="line.191"></a>
+<span class="sourceLineNo">192</span>    
SnapshotTestingUtils.expectSnapshotDoneException(master, builder.build(),<a 
name="line.192"></a>
+<span class="sourceLineNo">193</span>      UnknownSnapshotException.class);<a 
name="line.193"></a>
+<span class="sourceLineNo">194</span><a name="line.194"></a>
+<span class="sourceLineNo">195</span>    // set a mock handler to simulate a 
snapshot<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    DisabledTableSnapshotHandler 
mockHandler = Mockito.mock(DisabledTableSnapshotHandler.class);<a 
name="line.196"></a>
+<span class="sourceLineNo">197</span>    
Mockito.when(mockHandler.getException()).thenReturn(null);<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span>    
Mockito.when(mockHandler.getSnapshot()).thenReturn(desc);<a name="line.198"></a>
+<span class="sourceLineNo">199</span>    
Mockito.when(mockHandler.isFinished()).thenReturn(Boolean.TRUE);<a 
name="line.199"></a>
+<span class="sourceLineNo">200</span>    
Mockito.when(mockHandler.getCompletionTimestamp())<a name="line.200"></a>
+<span class="sourceLineNo">201</span>      
.thenReturn(EnvironmentEdgeManager.currentTime());<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span>    master.getSnapshotManager()<a 
name="line.203"></a>
+<span class="sourceLineNo">204</span>        
.setSnapshotHandlerForTesting(TABLE_NAME, mockHandler);<a name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
+<span class="sourceLineNo">206</span>    // if we do a lookup without a 
snapshot name, we should fail - you should always know your name<a 
name="line.206"></a>
+<span class="sourceLineNo">207</span>    builder = 
IsSnapshotDoneRequest.newBuilder();<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    
SnapshotTestingUtils.expectSnapshotDoneException(master, builder.build(),<a 
name="line.208"></a>
+<span class="sourceLineNo">209</span>      UnknownSnapshotException.class);<a 
name="line.209"></a>
+<span class="sourceLineNo">210</span><a name="line.210"></a>
+<span class="sourceLineNo">211</span>    // then do the lookup for the 
snapshot that it is done<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    builder.setSnapshot(desc);<a 
name="line.212"></a>
+<span class="sourceLineNo">213</span>    IsSnapshotDoneResponse response =<a 
name="line.213"></a>
+<span class="sourceLineNo">214</span>      
master.getMasterRpcServices().isSnapshotDone(null, builder.build());<a 
name="line.214"></a>
+<span class="sourceLineNo">215</span>    assertTrue("Snapshot didn't complete 
when it should have.", response.getDone());<a name="line.215"></a>
+<span class="sourceLineNo">216</span><a name="line.216"></a>
+<span class="sourceLineNo">217</span>    // now try the case where we are 
looking for a snapshot we didn't take<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    
builder.setSnapshot(SnapshotDescription.newBuilder().setName("Not A 
Snapshot").build());<a name="line.218"></a>
+<span class="sourceLineNo">219</span>    
SnapshotTestingUtils.expectSnapshotDoneException(master, builder.build(),<a 
name="line.219"></a>
+<span class="sourceLineNo">220</span>      UnknownSnapshotException.class);<a 
name="line.220"></a>
+<span class="sourceLineNo">221</span><a name="line.221"></a>
+<span class="sourceLineNo">222</span>    // then create a snapshot to the fs 
and make sure that we can find it when checking done<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    snapshotName = "completed";<a 
name="line.223"></a>
+<span class="sourceLineNo">224</span>    desc = 
createSnapshot(snapshotName);<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span>    builder.setSnapshot(desc);<a 
name="line.226"></a>
+<span class="sourceLineNo">227</span>    response = 
master.getMasterRpcServices().isSnapshotDone(null, builder.build());<a 
name="line.227"></a>
+<span class="sourceLineNo">228</span>    assertTrue("Completed, on-disk 
snapshot not found", response.getDone());<a name="line.228"></a>
+<span class="sourceLineNo">229</span>  }<a name="line.229"></a>
+<span class="sourceLineNo">230</span><a name="line.230"></a>
+<span class="sourceLineNo">231</span>  @Test<a name="line.231"></a>
+<span class="sourceLineNo">232</span>  public void testGetCompletedSnapshots() 
throws Exception {<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    // first check when there are no 
snapshots<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    GetCompletedSnapshotsRequest request 
= GetCompletedSnapshotsRequest.newBuilder().build();<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    GetCompletedSnapshotsResponse 
response =<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      
master.getMasterRpcServices().getCompletedSnapshots(null, request);<a 
name="line.236"></a>
+<span class="sourceLineNo">237</span>    assertEquals("Found unexpected number 
of snapshots", 0, response.getSnapshotsCount());<a name="line.237"></a>
+<span class="sourceLineNo">238</span><a name="line.238"></a>
+<span class="sourceLineNo">239</span>    // write one snapshot to the fs<a 
name="line.239"></a>
+<span class="sourceLineNo">240</span>    String snapshotName = "completed";<a 
name="line.240"></a>
+<span class="sourceLineNo">241</span>    SnapshotDescription snapshot = 
createSnapshot(snapshotName);<a name="line.241"></a>
 <span class="sourceLineNo">242</span><a name="line.242"></a>
-<span class="sourceLineNo">243</span>    // write a second snapshot<a 
name="line.243"></a>
-<span class="sourceLineNo">244</span>    snapshotName = "completed_two";<a 
name="line.244"></a>
-<span class="sourceLineNo">245</span>    snapshot = 
createSnapshot(snapshotName);<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    expected.add(snapshot);<a 
name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span>    // check that we get one snapshot<a 
name="line.248"></a>
-<span class="sourceLineNo">249</span>    response = 
master.getMasterRpcServices().getCompletedSnapshots(null, request);<a 
name="line.249"></a>
-<span class="sourceLineNo">250</span>    assertEquals("Found unexpected number 
of snapshots", 2, response.getSnapshotsCount());<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    snapshots = 
response.getSnapshotsList();<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    assertEquals("Returned snapshots 
don't match created snapshots", expected, snapshots);<a name="line.252"></a>
-<span class="sourceLineNo">253</span>  }<a name="line.253"></a>
+<span class="sourceLineNo">243</span>    // check that we get one snapshot<a 
name="line.243"></a>
+<span class="sourceLineNo">244</span>    response = 
master.getMasterRpcServices().getCompletedSnapshots(null, request);<a 
name="line.244"></a>
+<span class="sourceLineNo">245</span>    assertEquals("Found unexpected number 
of snapshots", 1, response.getSnapshotsCount());<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    List&lt;SnapshotDescription&gt; 
snapshots = response.getSnapshotsList();<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    List&lt;SnapshotDescription&gt; 
expected = Lists.newArrayList(snapshot);<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    assertEquals("Returned snapshots 
don't match created snapshots", expected, snapshots);<a name="line.248"></a>
+<span class="sourceLineNo">249</span><a name="line.249"></a>
+<span class="sourceLineNo">250</span>    // write a second snapshot<a 
name="line.250"></a>
+<span class="sourceLineNo">251</span>    snapshotName = "completed_two";<a 
name="line.251"></a>
+<span class="sourceLineNo">252</span>    snapshot = 
createSnapshot(snapshotName);<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    expected.add(snapshot);<a 
name="line.253"></a>
 <span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span>  @Test<a name="line.255"></a>
-<span class="sourceLineNo">256</span>  public void testDeleteSnapshot() throws 
Exception {<a name="line.256"></a>
-<span class="sourceLineNo">257</span><a name="line.257"></a>
-<span class="sourceLineNo">258</span>    String snapshotName = "completed";<a 
name="line.258"></a>
-<span class="sourceLineNo">259</span>    SnapshotDescription snapshot = 
SnapshotDescription.newBuilder().setName(snapshotName).build();<a 
name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span>    DeleteSnapshotRequest request = 
DeleteSnapshotRequest.newBuilder().setSnapshot(snapshot)<a name="line.261"></a>
-<span class="sourceLineNo">262</span>        .build();<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    try {<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      
master.getMasterRpcServices().deleteSnapshot(null, request);<a 
name="line.264"></a>
-<span class="sourceLineNo">265</span>      fail("Master didn't throw exception 
when attempting to delete snapshot that doesn't exist");<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    } catch 
(org.apache.hbase.thirdparty.com.google.protobuf.ServiceException e) {<a 
name="line.266"></a>
-<span class="sourceLineNo">267</span>      // Expected<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    }<a name="line.268"></a>
-<span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span>    // write one snapshot to the fs<a 
name="line.270"></a>
-<span class="sourceLineNo">271</span>    createSnapshot(snapshotName);<a 
name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span>    // then delete the existing 
snapshot,which shouldn't cause an exception to be thrown<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    
master.getMasterRpcServices().deleteSnapshot(null, request);<a 
name="line.274"></a>
-<span class="sourceLineNo">275</span>  }<a name="line.275"></a>
+<span class="sourceLineNo">255</span>    // check that we get one snapshot<a 
name="line.255"></a>
+<span class="sourceLineNo">256</span>    response = 
master.getMasterRpcServices().getCompletedSnapshots(null, request);<a 
name="line.256"></a>
+<span class="sourceLineNo">257</span>    assertEquals("Found unexpected number 
of snapshots", 2, response.getSnapshotsCount());<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    snapshots = 
response.getSnapshotsList();<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    assertEquals("Returned snapshots 
don't match created snapshots", expected, snapshots);<a name="line.259"></a>
+<span class="sourceLineNo">260</span>  }<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span>  @Test<a name="line.262"></a>
+<span class="sourceLineNo">263</span>  public void testDeleteSnapshot() throws 
Exception {<a name="line.263"></a>
+<span class="sourceLineNo">264</span><a name="line.264"></a>
+<span class="sourceLineNo">265</span>    String snapshotName = "completed";<a 
name="line.265"></a>
+<span class="sourceLineNo">266</span>    SnapshotDescription snapshot = 
SnapshotDescription.newBuilder().setName(snapshotName).build();<a 
name="line.266"></a>
+<span class="sourceLineNo">267</span><a name="line.267"></a>
+<span class="sourceLineNo">268</span>    DeleteSnapshotRequest request = 
DeleteSnapshotRequest.newBuilder().setSnapshot(snapshot)<a name="line.268"></a>
+<span class="sourceLineNo">269</span>        .build();<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    try {<a name="line.270"></a>
+<span class="sourceLineNo">271</span>      
master.getMasterRpcServices().deleteSnapshot(null, request);<a 
name="line.271"></a>
+<span class="sourceLineNo">272</span>      fail("Master didn't throw exception 
when attempting to delete snapshot that doesn't exist");<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    } catch 
(org.apache.hbase.thirdparty.com.google.protobuf.ServiceException e) {<a 
name="line.273"></a>
+<span class="sourceLineNo">274</span>      // Expected<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    }<a name="line.275"></a>
 <span class="sourceLineNo">276</span><a name="line.276"></a>
-<span class="sourceLineNo">277</span>  /**<a name="line.277"></a>
-<span class="sourceLineNo">278</span>   * Test that the snapshot hfile archive 
cleaner works correctly. HFiles that are in snapshots<a name="line.278"></a>
-<span class="sourceLineNo">279</span>   * should be retained, while those that 
are not in a snapshot should be deleted.<a name="line.279"></a>
-<span class="sourceLineNo">280</span>   * @throws Exception on failure<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 
testSnapshotHFileArchiving() throws Exception {<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    Admin admin = UTIL.getAdmin();<a 
name="line.284"></a>
-<span class="sourceLineNo">285</span>    // make sure we don't fail on listing 
snapshots<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    
SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span>    // recreate test table with disabled 
compactions; otherwise compaction may happen before<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    // snapshot, the call after snapshot 
will be a no-op and checks will fail<a name="line.289"></a>
-<span class="sourceLineNo">290</span>    UTIL.deleteTable(TABLE_NAME);<a 
name="line.290"></a>
-<span class="sourceLineNo">291</span>    TableDescriptor td = 
TableDescriptorBuilder.newBuilder(TABLE_NAME)<a name="line.291"></a>
-<span class="sourceLineNo">292</span>            
.setColumnFamily(ColumnFamilyDescriptorBuilder.of(TEST_FAM))<a 
name="line.292"></a>
-<span class="sourceLineNo">293</span>            
.setCompactionEnabled(false)<a name="line.293"></a>
-<span class="sourceLineNo">294</span>            .build();<a 
name="line.294"></a>
-<span class="sourceLineNo">295</span>    UTIL.getAdmin().createTable(td);<a 
name="line.295"></a>
-<span class="sourceLineNo">296</span><a name="line.296"></a>
-<span class="sourceLineNo">297</span>    // load the table<a 
name="line.297"></a>
-<span class="sourceLineNo">298</span>    for (int i = 0; i &lt; 
blockingStoreFiles / 2; i ++) {<a name="line.298"></a>
-<span class="sourceLineNo">299</span>      
UTIL.loadTable(UTIL.getConnection().getTable(TABLE_NAME), TEST_FAM);<a 
name="line.299"></a>
-<span class="sourceLineNo">300</span>      UTIL.flush(TABLE_NAME);<a 
name="line.300"></a>
-<span class="sourceLineNo">301</span>    }<a name="line.301"></a>
-<span class="sourceLineNo">302</span><a name="line.302"></a>
-<span class="sourceLineNo">303</span>    // disable the table so we can take a 
snapshot<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    admin.disableTable(TABLE_NAME);<a 
name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span>    // take a snapshot of the table<a 
name="line.306"></a>
-<span class="sourceLineNo">307</span>    String snapshotName = "snapshot";<a 
name="line.307"></a>
-<span class="sourceLineNo">308</span>    byte[] snapshotNameBytes = 
Bytes.toBytes(snapshotName);<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    admin.snapshot(snapshotNameBytes, 
TABLE_NAME);<a name="line.309"></a>
-<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span>    LOG.info("After snapshot File-System 
state");<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    FSUtils.logFileSystemState(fs, 
rootDir, LOG);<a name="line.312"></a>
-<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span>    // ensure we only have one snapshot<a 
name="line.314"></a>
-<span class="sourceLineNo">315</span>    
SnapshotTestingUtils.assertOneSnapshotThatMatches(admin, snapshotNameBytes, 
TABLE_NAME);<a name="line.315"></a>
-<span class="sourceLineNo">316</span><a name="line.316"></a>
-<span class="sourceLineNo">317</span>    td = 
TableDescriptorBuilder.newBuilder(td)<a name="line.317"></a>
-<span class="sourceLineNo">318</span>            .setCompactionEnabled(true)<a 
name="line.318"></a>
-<span class="sourceLineNo">319</span>            .build();<a 
name="line.319"></a>
-<span class="sourceLineNo">320</span>    // enable compactions now<a 
name="line.320"></a>
-<span class="sourceLineNo">321</span>    admin.modifyTable(td);<a 
name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span>    // renable the table so we can 
compact the regions<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    admin.enableTable(TABLE_NAME);<a 
name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span>    // compact the files so we get some 
archived files for the table we just snapshotted<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    List&lt;HRegion&gt; regions = 
UTIL.getHBaseCluster().getRegions(TABLE_NAME);<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    for (HRegion region : regions) {<a 
name="line.328"></a>
-<span class="sourceLineNo">329</span>      
region.waitForFlushesAndCompactions(); // enable can trigger a compaction, wait 
for it.<a name="line.329"></a>
-<span class="sourceLineNo">330</span>      region.compactStores(); // min is 2 
so will compact and archive<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    }<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    List&lt;RegionServerThread&gt; 
regionServerThreads = UTIL.getMiniHBaseCluster()<a name="line.332"></a>
-<span class="sourceLineNo">333</span>        .getRegionServerThreads();<a 
name="line.333"></a>
-<span class="sourceLineNo">334</span>    HRegionServer hrs = null;<a 
name="line.334"></a>
-<span class="sourceLineNo">335</span>    for (RegionServerThread rs : 
regionServerThreads) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span>      if 
(!rs.getRegionServer().getRegions(TABLE_NAME).isEmpty()) {<a 
name="line.336"></a>
-<span class="sourceLineNo">337</span>        hrs = rs.getRegionServer();<a 
name="line.337"></a>
-<span class="sourceLineNo">338</span>        break;<a name="line.338"></a>
-<span class="sourceLineNo">339</span>      }<a name="line.339"></a>
-<span class="sourceLineNo">340</span>    }<a name="line.340"></a>
-<span class="sourceLineNo">341</span>    CompactedHFilesDischarger cleaner = 
new CompactedHFilesDischarger(100, null, hrs, false);<a name="line.341"></a>
-<span class="sourceLineNo">342</span>    cleaner.chore();<a 
name="line.342"></a>
-<span class="sourceLineNo">343</span>    LOG.info("After compaction 
File-System state");<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    FSUtils.logFileSystemState(fs, 
rootDir, LOG);<a name="line.344"></a>
-<span class="sourceLineNo">345</span><a name="line.345"></a>
-<span class="sourceLineNo">346</span>    // make sure the cleaner has run<a 
name="line.346"></a>
-<span class="sourceLineNo">347</span>    LOG.debug("Running hfile 
cleaners");<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    ensureHFileCleanersRun();<a 
name="line.348"></a>
-<span class="sourceLineNo">349</span>    LOG.info("After cleaners File-System 
state: " + rootDir);<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    FSUtils.logFileSystemState(fs, 
rootDir, LOG);<a name="line.350"></a>
-<span class="sourceLineNo">351</span><a name="line.351"></a>
-<span class="sourceLineNo">352</span>    // get the snapshot files for the 
table<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    Path snapshotTable = 
SnapshotDescriptionUtils.getCompletedSnapshotDir(snapshotName, rootDir);<a 
name="line.353"></a>
-<span class="sourceLineNo">354</span>    Set&lt;String&gt; snapshotHFiles = 
SnapshotReferenceUtil.getHFileNames(<a name="line.354"></a>
-<span class="sourceLineNo">355</span>        UTIL.getConfiguration(), fs, 
snapshotTable);<a name="line.355"></a>
-<span class="sourceLineNo">356</span>    // check that the files in the 
archive contain the ones that we need for the snapshot<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    LOG.debug("Have snapshot hfiles:");<a 
name="line.357"></a>
-<span class="sourceLineNo">358</span>    for (String fileName : 
snapshotHFiles) {<a name="line.358"></a>
-<span class="sourceLineNo">359</span>      LOG.debug(fileName);<a 
name="line.359"></a>
-<span class="sourceLineNo">360</span>    }<a name="line.360"></a>
-<span class="sourceLineNo">361</span>    // get the archived files for the 
table<a name="line.361"></a>
-<span class="sourceLineNo">362</span>    Collection&lt;String&gt; archives = 
getHFiles(archiveDir, fs, TABLE_NAME);<a name="line.362"></a>
-<span class="sourceLineNo">363</span><a name="line.363"></a>
-<span class="sourceLineNo">364</span>    // get the hfiles for the table<a 
name="line.364"></a>
-<span class="sourceLineNo">365</span>    Collection&lt;String&gt; hfiles = 
getHFiles(rootDir, fs, TABLE_NAME);<a name="line.365"></a>
-<span class="sourceLineNo">366</span><a name="line.366"></a>
-<span class="sourceLineNo">367</span>    // and make sure that there is a 
proper subset<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    for (String fileName : 
snapshotHFiles) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>      boolean exist = 
archives.contains(fileName) || hfiles.contains(fileName);<a name="line.369"></a>
-<span class="sourceLineNo">370</span>      assertTrue("Archived hfiles " + 
archives<a name="line.370"></a>
-<span class="sourceLineNo">371</span>        + " and table hfiles " + hfiles + 
" is missing snapshot file:" + fileName, exist);<a name="line.371"></a>
-<span class="sourceLineNo">372</span>    }<a name="line.372"></a>
+<span class="sourceLineNo">277</span>    // write one snapshot to the fs<a 
name="line.277"></a>
+<span class="sourceLineNo">278</span>    createSnapshot(snapshotName);<a 
name="line.278"></a>
+<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">280</span>    // then delete the existing 
snapshot,which shouldn't cause an exception to be thrown<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    
master.getMasterRpcServices().deleteSnapshot(null, request);<a 
name="line.281"></a>
+<span class="sourceLineNo">282</span>  }<a name="line.282"></a>
+<span class="sourceLineNo">283</span><a name="line.283"></a>
+<span class="sourceLineNo">284</span>  /**<a name="line.284"></a>
+<span class="sourceLineNo">285</span>   * Test that the snapshot hfile archive 
cleaner works correctly. HFiles that are in snapshots<a name="line.285"></a>
+<span class="sourceLineNo">286</span>   * should be retained, while those that 
are not in a snapshot should be deleted.<a name="line.286"></a>
+<span class="sourceLineNo">287</span>   * @throws Exception on failure<a 
name="line.287"></a>
+<span class="sourceLineNo">288</span>   */<a name="line.288"></a>
+<span class="sourceLineNo">289</span>  @Test<a name="line.289"></a>
+<span class="sourceLineNo">290</span>  public void 
testSnapshotHFileArchiving() throws Exception {<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    Admin admin = UTIL.getAdmin();<a 
name="line.291"></a>
+<span class="sourceLineNo">292</span>    // make sure we don't fail on listing 
snapshots<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    
SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.293"></a>
+<span class="sourceLineNo">294</span><a name="line.294"></a>
+<span class="sourceLineNo">295</span>    // recreate test table with disabled 
compactions; otherwise compaction may happen before<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    // snapshot, the call after snapshot 
will be a no-op and checks will fail<a name="line.296"></a>
+<span class="sourceLineNo">297</span>    UTIL.deleteTable(TABLE_NAME);<a 
name="line.297"></a>
+<span class="sourceLineNo">298</span>    TableDescriptor td = 
TableDescriptorBuilder.newBuilder(TABLE_NAME)<a name="line.298"></a>
+<span class="sourceLineNo">299</span>            
.setColumnFamily(ColumnFamilyDescriptorBuilder.of(TEST_FAM))<a 
name="line.299"></a>
+<span class="sourceLineNo">300</span>            
.setCompactionEnabled(false)<a name="line.300"></a>
+<span class="sourceLineNo">301</span>            .build();<a 
name="line.301"></a>
+<span class="sourceLineNo">302</span>    UTIL.getAdmin().createTable(td);<a 
name="line.302"></a>
+<span class="sourceLineNo">303</span><a name="line.303"></a>
+<span class="sourceLineNo">304</span>    // load the table<a 
name="line.304"></a>
+<span class="sourceLineNo">305</span>    for (int i = 0; i &lt; 
blockingStoreFiles / 2; i ++) {<a name="line.305"></a>
+<span class="sourceLineNo">306</span>      
UTIL.loadTable(UTIL.getConnection().getTable(TABLE_NAME), TEST_FAM);<a 
name="line.306"></a>
+<span class="sourceLineNo">307</span>      UTIL.flush(TABLE_NAME);<a 
name="line.307"></a>
+<span class="sourceLineNo">308</span>    }<a name="line.308"></a>
+<span class="sourceLineNo">309</span><a name="line.309"></a>
+<span class="sourceLineNo">310</span>    // disable the table so we can take a 
snapshot<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    admin.disableTable(TABLE_NAME);<a 
name="line.311"></a>
+<span class="sourceLineNo">312</span><a name="line.312"></a>
+<span class="sourceLineNo">313</span>    // take a snapshot of the table<a 
name="line.313"></a>
+<span class="sourceLineNo">314</span>    String snapshotName = "snapshot";<a 
name="line.314"></a>
+<span class="sourceLineNo">315</span>    byte[] snapshotNameBytes = 
Bytes.toBytes(snapshotName);<a name="line.315"></a>
+<span class="sourceLineNo">316</span>    admin.snapshot(snapshotNameBytes, 
TABLE_NAME);<a name="line.316"></a>
+<span class="sourceLineNo">317</span><a name="line.317"></a>
+<span class="sourceLineNo">318</span>    LOG.info("After snapshot File-System 
state");<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    FSUtils.logFileSystemState(fs, 
rootDir, LOG);<a name="line.319"></a>
+<span class="sourceLineNo">320</span><a name="line.320"></a>
+<span class="sourceLineNo">321</span>    // ensure we only have one snapshot<a 
name="line.321"></a>
+<span class="sourceLineNo">322</span>    
SnapshotTestingUtils.assertOneSnapshotThatMatches(admin, snapshotNameBytes, 
TABLE_NAME);<a name="line.322"></a>
+<span class="sourceLineNo">323</span><a name="line.323"></a>
+<span class="sourceLineNo">324</span>    td = 
TableDescriptorBuilder.newBuilder(td)<a name="line.324"></a>
+<span class="sourceLineNo">325</span>            .setCompactionEnabled(true)<a 
name="line.325"></a>
+<span class="sourceLineNo">326</span>            .build();<a 
name="line.326"></a>
+<span class="sourceLineNo">327</span>    // enable compactions now<a 
name="line.327"></a>
+<span class="sourceLineNo">328</span>    admin.modifyTable(td);<a 
name="line.328"></a>
+<span class="sourceLineNo">329</span><a name="line.329"></a>
+<span class="sourceLineNo">330</span>    // renable the table so we can 
compact the regions<a name="line.330"></a>
+<span class="sourceLineNo">331</span>    admin.enableTable(TABLE_NAME);<a 
name="line.331"></a>
+<span class="sourceLineNo">332</span><a name="line.332"></a>
+<span class="sourceLineNo">333</span>    // compact the files so we get some 
archived files for the table we just snapshotted<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    List&lt;HRegion&gt; regions = 
UTIL.getHBaseCluster().getRegions(TABLE_NAME);<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    for (HRegion region : regions) {<a 
name="line.335"></a>
+<span class="sourceLineNo">336</span>      
region.waitForFlushesAndCompactions(); // enable can trigger a compaction, wait 
for it.<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      region.compactStores(); // min is 2 
so will compact and archive<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    }<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    List&lt;RegionServerThread&gt; 
regionServerThreads = UTIL.getMiniHBaseCluster()<a name="line.339"></a>
+<span class="sourceLineNo">340</span>        .getRegionServerThreads();<a 
name="line.340"></a>
+<span class="sourceLineNo">341</span>    HRegionServer hrs = null;<a 
name="line.341"></a>
+<span class="sourceLineNo">342</span>    for (RegionServerThread rs : 
regionServerThreads) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span>      if 
(!rs.getRegionServer().getRegions(TABLE_NAME).isEmpty()) {<a 
name="line.343"></a>
+<span class="sourceLineNo">344</span>        hrs = rs.getRegionServer();<a 
name="line.344"></a>
+<span class="sourceLineNo">345</span>        break;<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      }<a name="line.346"></a>
+<span class="sourceLineNo">347</span>    }<a name="line.347"></a>
+<span class="sourceLineNo">348</span>    CompactedHFilesDischarger cleaner = 
new CompactedHFilesDischarger(100, null, hrs, false);<a name="line.348"></a>
+<span class="sourceLineNo">349</span>    cleaner.chore();<a 
name="line.349"></a>
+<span class="sourceLineNo">350</span>    LOG.info("After compaction 
File-System state");<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    FSUtils.logFileSystemState(fs, 
rootDir, LOG);<a name="line.351"></a>
+<span class="sourceLineNo">352</span><a name="line.352"></a>
+<span class="sourceLineNo">353</span>    // make sure the cleaner has run<a 
name="line.353"></a>
+<span class="sourceLineNo">354</span>    LOG.debug("Running hfile 
cleaners");<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    ensureHFileCleanersRun();<a 
name="line.355"></a>
+<span class="sourceLineNo">356</span>    LOG.info("After cleaners File-System 
state: " + rootDir);<a name="line.356"></a>
+<span class="sourceLineNo">357</span>    FSUtils.logFileSystemState(fs, 
rootDir, LOG);<a name="line.357"></a>
+<span class="sourceLineNo">358</span><a name="line.358"></a>
+<span class="sourceLineNo">359</span>    // get the snapshot files for the 
table<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    Path snapshotTable = 
SnapshotDescriptionUtils.getCompletedSnapshotDir(snapshotName, rootDir);<a 
name="line.360"></a>
+<span class="sourceLineNo">361</span>    Set&lt;String&gt; snapshotHFiles = 
SnapshotReferenceUtil.getHFileNames(<a name="line.361"></a>
+<span class="sourceLineNo">362</span>        UTIL.getConfiguration(), fs, 
snapshotTable);<a name="line.362"></a>
+<span class="sourceLineNo">363</span>    // check that the files in the 
archive contain the ones that we need for the snapshot<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    LOG.debug("Have snapshot hfiles:");<a 
name="line.364"></a>
+<span class="sourceLineNo">365</span>    for (String fileName : 
snapshotHFiles) {<a name="line.365"></a>
+<span class="sourceLineNo">366</span>      LOG.debug(fileName);<a 
name="line.366"></a>
+<span class="sourceLineNo">367</span>    }<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    // get the archived files for the 
table<a name="line.368"></a>
+<span class="sourceLineNo">369</span>    Collection&lt;String&gt; archives = 
getHFiles(archiveDir, fs, TABLE_NAME);<a name="line.369"></a>
+<span class="sourceLineNo">370</span><a name="line.370"></a>
+<span class="sourceLineNo">371</span>    // get the hfiles for the table<a 
name="line.371"></a>
+<span class="sourceLineNo">372</span>    Collection&lt;String&gt; hfiles = 
getHFiles(rootDir, fs, TABLE_NAME);<a name="line.372"></a>
 <span class="sourceLineNo">373</span><a name="line.373"></a>
-<span class="sourceLineNo">374</span>    // delete the existing snapshot<a 
name="line.374"></a>
-<span class="sourceLineNo">375</span>    
admin.deleteSnapshot(snapshotNameBytes);<a name="line.375"></a>
-<span class="sourceLineNo">376</span>    
SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.376"></a>
-<span class="sourceLineNo">377</span><a name="line.377"></a>
-<span class="sourceLineNo">378</span>    // make sure that we don't keep 
around the hfiles that aren't in a snapshot<a name="line.378"></a>
-<span class="sourceLineNo">379</span>    // make sure we wait long enough to 
refresh the snapshot hfile<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    List&lt;BaseHFileCleanerDelegate&gt; 
delegates = UTIL.getMiniHBaseCluster().getMaster()<a name="line.380"></a>
-<span class="sourceLineNo">381</span>        
.getHFileCleaner().cleanersChain;<a name="line.381"></a>
-<span class="sourceLineNo">382</span>    for (BaseHFileCleanerDelegate 
delegate: delegates) {<a name="line.382"></a>
-<span class="sourceLineNo">383</span>      if (delegate instanceof 
SnapshotHFileCleaner) {<a name="line.383"></a>
-<span class="sourceLineNo">384</span>        
((SnapshotHFileCleaner)delegate).getFileCacheForTesting().triggerCacheRefreshForTesting();<a
 name="line.384"></a>
-<span class="sourceLineNo">385</span>      }<a name="line.385"></a>
-<span class="sourceLineNo">386</span>    }<a name="line.386"></a>
-<span class="sourceLineNo">387</span>    // run the cleaner again<a 
name="line.387"></a>
-<span class="sourceLineNo">388</span>    LOG.debug("Running hfile 
cleaners");<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    ensureHFileCleanersRun();<a 
name="line.389"></a>
-<span class="sourceLineNo">390</span>    LOG.info("After delete snapshot 
cleaners run File-System state");<a name="line.390"></a>
-<span class="sourceLineNo">391</span>    FSUtils.logFileSystemState(fs, 
rootDir, LOG);<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span>    archives = getHFiles(archiveDir, fs, 
TABLE_NAME);<a name="line.393"></a>
-<span class="sourceLineNo">394</span>    assertEquals("Still have some hfiles 
in the archive, when their snapshot has been deleted.", 0,<a 
name="line.394"></a>
-<span class="sourceLineNo">395</span>      archives.size());<a 
name="line.395"></a>
-<span class="sourceLineNo">396</span>  }<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>   * @return all the HFiles for a given 
table in the specified dir<a name="line.399"></a>
-<span class="sourceLineNo">400</span>   * @throws IOException on expected 
failure<a name="line.400"></a>
-<span class="sourceLineNo">401</span>   */<a name="line.401"></a>
-<span class="sourceLineNo">402</span>  private final Collection&lt;String&gt; 
getHFiles(Path dir, FileSystem fs, TableName tableName) throws IOException {<a 
name="line.402"></a>
-<span class="sourceLineNo">403</span>    Path tableDir = 
FSUtils.getTableDir(dir, tableName);<a name="line.403"></a>
-<span class="sourceLineNo">404</span>    return 
SnapshotTestingUtils.listHFileNames(fs, tableDir);<a name="line.404"></a>
-<span class="sourceLineNo">405</span>  }<a name="line.405"></a>
-<span class="sourceLineNo">406</span><a name="line.406"></a>
-<span class="sourceLineNo">407</span>  /**<a name="line.407"></a>
-<span class="sourceLineNo">408</span>   * Make sure the {@link HFileCleaner 
HFileCleaners} run at least once<a name="line.408"></a>
-<span class="sourceLineNo">409</span>   */<a name="line.409"></a>
-<span class="sourceLineNo">410</span>  private static void 
ensureHFileCleanersRun() {<a name="line.410"></a>
-<span class="sourceLineNo">411</span>    
UTIL.getHBaseCluster().getMaster().getHFileCleaner().chore();<a 
name="line.411"></a>
+<span class="sourceLineNo">374</span>    // and make sure that there is a 
proper subset<a name="line.374"></a>
+<span class="sourceLineNo">375</span>    for (String fileName : 
snapshotHFiles) {<a name="line.375"></a>
+<span class="sourceLineNo">376</span>      boolean exist = 
archives.contains(fileName) || hfiles.contains(fileName);<a name="line.376"></a>
+<span class="sourceLineNo">377</span>      assertTrue("Archived hfiles " + 
archives<a name="line.377"></a>
+<span class="sourceLineNo">378</span>        + " and table hfiles " + hfiles + 
" is missing snapshot file:" + fileName, exist);<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>    // delete the existing snapshot<a 
name="line.381"></a>
+<span class="sourceLineNo">382</span>    
admin.deleteSnapshot(snapshotNameBytes);<a name="line.382"></a>
+<span class="sourceLineNo">383</span>    
SnapshotTestingUtils.assertNoSnapshots(admin);<a name="line.383"></a>
+<span class="sourceLineNo">384</span><a name="line.384"></a>
+<span class="sourceLineNo">385</span>    // make sure that we don't keep 
around the hfiles that aren't in a snapshot<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    // make sure we wait long enough to 
refresh the snapshot hfile<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    List&lt;BaseHFileCleanerDelegate&gt; 
delegates = UTIL.getMiniHBaseCluster().getMaster()<a name="line.387"></a>
+<span class="sourceLineNo">388</span>        
.getHFileCleaner().cleanersChain;<a name="line.388"></a>
+<span class="sourceLineNo">389</span>    for (BaseHFileCleanerDelegate 
delegate: delegates) {<a name="line.389"></a>
+<span class="sourceLineNo">390</span>      if (delegate instanceof 
SnapshotHFileCleaner) {<a name="line.390"></a>
+<span class="sourceLineNo">391</span>        
((SnapshotHFileCleaner)delegate).getFileCacheForTesting().triggerCacheRefreshForTesting();<a
 name="line.391"></a>
+<span class="sourceLineNo">392</span>      }<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    }<a name="line.393"></a>
+<span class="sourceLineNo">394</span>    // run the cleaner again<a 
name="line.394"></a>
+<span class="sourceLineNo">395</span>    LOG.debug("Running hfile 
cleaners");<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    ensureHFileCleanersRun();<a 
name="line.396"></a>
+<span class="sourceLineNo">397</span>    LOG.info("After delete snapshot 
cleaners run File-System state");<a name="line.397"></a>
+<span class="sourceLineNo">398</span>    FSUtils.logFileSystemState(fs, 
rootDir, LOG);<a name="line.398"></a>
+<span class="sourceLineNo">399</span><a name="line.399"></a>
+<span class="sourceLineNo">400</span>    archives = getHFiles(archiveDir, fs, 
TABLE_NAME);<a name="line.400"></a>
+<span class="sourceLineNo">401</span>    assertEquals("Still have some hfiles 
in the archive, when their snapshot has been deleted.", 0,<a 
name="line.401"></a>
+<span class="sourceLineNo">402</span>      archives.size());<a 
name="line.402"></a>
+<span class="sourceLineNo">403</span>  }<a name="line.403"></a>
+<span class="sourceLineNo">404</span><a name="line.404"></a>
+<span class="sourceLineNo">405</span>  /**<a name="line.405"></a>
+<span class="sourceLineNo">406</span>   * @return all the HFiles for a given 
table in the specified dir<a name="line.406"></a>
+<span class="sourceLineNo">407</span>   * @throws IOException on expected 
failure<a name="line.407"></a>
+<span class="sourceLineNo">408</span>   */<a name="line.408"></a>
+<span class="sourceLineNo">409</span>  private final Collection&lt;String&gt; 
getHFiles(Path dir, FileSystem fs, TableName tableName) throws IOException {<a 
name="line.409"></a>
+<span class="sourceLineNo">410</span>    Path tableDir = 
FSUtils.getTableDir(dir, tableName);<a name="line.410"></a>
+<span class="sourceLineNo">411</span>    return 
SnapshotTestingUtils.listHFileNames(fs, tableDir);<a name="line.411"></a>
 <span class="sourceLineNo">412</span>  }<a name="line.412"></a>
 <span class="sourceLineNo">413</span><a name="line.413"></a>
-<span class="sourceLineNo">414</span>  private SnapshotDescription 
createSnapshot(final String snapshotName) throws IOException {<a 
name="line.414"></a>
-<span class="sourceLineNo">415</span>    SnapshotTestingUtils.SnapshotMock 
snapshotMock =<a name="line.415"></a>
-<span class="sourceLineNo">416</span>      new 
SnapshotTestingUtils.SnapshotMock(UTIL.getConfiguration(), fs, rootDir);<a 
name="line.416"></a>
-<span class="sourceLineNo">417</span>    
SnapshotTestingUtils.SnapshotMock.SnapshotBuilder builder =<a 
name="line.417"></a>
-<span class="sourceLineNo">418</span>      
snapshotMock.createSnapshotV2(snapshotName, "test", 0);<a name="line.418"></a>
-<span class="sourceLineNo">419</span>    builder.commit();<a 
name="line.419"></a>
-<span class="sourceLineNo">420</span>    return 
builder.getSnapshotDescription();<a name="line.420"></a>
-<span class="sourceLineNo">421</span>  }<a name="line.421"></a>
-<span class="sourceLineNo">422</span>}<a name="line.422"></a>
+<span class="sourceLineNo">414</span>  /**<a name="line.414"></a>
+<span class="sourceLineNo">415</span>   * Make sure the {@link HFileCleaner 
HFileCleaners} run at least once<a name="line.415"></a>
+<span class="sourceLineNo">416</span>   */<a name="line.416"></a>
+<span class="sourceLineNo">417</span>  private static void 
ensureHFileCleanersRun() {<a name="line.417"></a>
+<span class="sourceLineNo">418</span>    
UTIL.getHBaseCluster().getMaster().getHFileCleaner().chore();<a 
name="line.418"></a>
+<span class="sourceLineNo">419</span>  }<a name="line.419"></a>
+<span class="sourceLineNo">420</span><a name="line.420"></a>
+<span class="sourceLineNo">421</span>  private SnapshotDescription 
createSnapshot(final String snapshotName) throws IOException {<a 
name="line.421"></a>
+<span class="sourceLineNo">422</span>    SnapshotTestingUtils.SnapshotMock 
snapshotMock =<a name="line.422"></a>
+<span class="sourceLineNo">423</span>      new 
SnapshotTestingUtils.SnapshotMock(UTIL.getConfiguration(), fs, rootDir);<a 
name="line.423"></a>
+<span class="sourceLineNo">424</span>    
SnapshotTestingUtils.SnapshotMock.SnapshotBuilder builder =<a 
name="line.424"></a>
+<span class="sourceLineNo">425</span>      
snapshotMock.createSnapshotV2(snapshotName, "test", 0);<a name="line.425"></a>
+<span class="sourceLineNo">426</span>    builder.commit();<a 
name="line.426"></a>
+<span class="sourceLineNo">427</span>    return 
builder.getSnapshotDescription();<a name="line.427"></a>
+<span class="sourceLineNo">428</span>  }<a name="line.428"></a>
+<span class="sourceLineNo">429</span><a name="line.429"></a>
+<span class="sourceLineNo">430</span>  @Test<a name="line.430"></a>
+<span class="sourceLineNo">431</span>  public void 
testAsyncSnapshotWillNotBlockSnapshotHFileCleaner() throws Exception {<a 
name="line.431"></a>
+<span class="sourceLineNo">432</span>    // Write some data<a 
name="line.432"></a>
+<span class="sourceLineNo">433</span>    Table table = 
UTIL.getConnection().getTable(TABLE_NAME);<a name="line.433"></a>
+<span class="sourceLineNo">434</span>    for (int i = 0; i &lt; 10; i++) {<a 
name="line.434"></a>
+<span class="sourceLineNo">435</span>      Put put = new 
Put(Bytes.toBytes(i)).addColumn(TEST_FAM, Bytes.toBytes("q"), 
Bytes.toBytes(i));<a name="line.435"></a>
+<span class="sourceLineNo">436</span>      table.put(put);<a 
name="line.436"></a>
+<span class="sourceLineNo">437</span>    }<a name="line.437"></a>
+<span class="sourceLineNo">438</span>    String snapshotName = 
"testAsyncSnapshotWillNotBlockSnapshotHFileCleaner01";<a name="line.438"></a>
+<span class="sourceLineNo">439</span>    UTIL.getAdmin().snapshotAsync(new 
org.apache.hadoop.hbase.client.SnapshotDescription(<a name="line.439"></a>
+<span class="sourceLineNo">440</span>        snapshotName, TABLE_NAME, 
SnapshotType.FLUSH));<a name="line.440"></a>
+<span class="sourceLineNo">441</span>    
Waiter.waitFor(UTIL.getConfiguration(), 10 * 1000L, 200L,<a name="line.441"></a>
+<span class="sourceLineNo">442</span>      () -&gt; 
UTIL.getAdmin().listSnapshots(Pattern.compile(snapshotName)).size() == 1);<a 
name="line.442"></a>
+<span class="sourceLineNo">443</span>    
assertTrue(master.getSnapshotManager().isTakingAnySnapshot());<a 
name="line.443"></a>
+<span class="sourceLineNo">444</span>    Thread.sleep(11 * 1000L);<a 
name="line.444"></a>
+<span class="sourceLineNo">445</span>    
assertFalse(master.getSnapshotManager().isTakingAnySnapshot());<a 
name="line.445"></a>
+<span class="sourceLineNo">446</span>  }<a name="line.446"></a>
+<span class="sourceLineNo">447</span>}<a name="line.447"></a>