You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/10/27 14:52:04 UTC
[02/14] hbase-site git commit: Published site at
7cdb52519236966a7cb6dff7fbd0609c87545f75.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5150e577/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestHFileArchiving.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestHFileArchiving.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestHFileArchiving.html
index b4dfd9e..c506195 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestHFileArchiving.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestHFileArchiving.html
@@ -27,443 +27,467 @@
<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.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><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.ArrayList;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import java.util.Collections;<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 org.apache.hadoop.conf.Configuration;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.fs.FileStatus;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.fs.FileSystem;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.fs.Path;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.fs.PathFilter;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.*;<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.client.Admin;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.master.cleaner.HFileCleaner;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.regionserver.CompactingMemStore;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.regionserver.HRegion;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.regionserver.HRegionServer;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.regionserver.Region;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.testclassification.MiscTests;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.util.HFileArchiveTestingUtil;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.util.HFileArchiveUtil;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.util.StoppableImplementation;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.junit.After;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.junit.AfterClass;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.junit.Assert;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.junit.BeforeClass;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.junit.ClassRule;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.junit.Rule;<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.experimental.categories.Category;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.junit.rules.TestName;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.slf4j.Logger;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.slf4j.LoggerFactory;<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 that the {@link HFileArchiver} correctly removes all the parts of a region when cleaning up<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * a region<a name="line.63"></a>
-<span class="sourceLineNo">064</span> */<a name="line.64"></a>
-<span class="sourceLineNo">065</span>@Category({MediumTests.class, MiscTests.class})<a name="line.65"></a>
-<span class="sourceLineNo">066</span>public class TestHFileArchiving {<a name="line.66"></a>
+<span class="sourceLineNo">022</span>import static org.junit.Assert.assertNotNull;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import static org.junit.Assert.assertTrue;<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.ArrayList;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import java.util.Collections;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import java.util.HashMap;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import java.util.List;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import java.util.Map;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import java.util.Objects;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.conf.Configuration;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.fs.FileStatus;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.fs.FileSystem;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.fs.Path;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.fs.PathFilter;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.ChoreService;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.HConstants;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.Stoppable;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.TableName;<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.master.HMaster;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.master.cleaner.HFileCleaner;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.regionserver.HRegion;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.regionserver.HRegionServer;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.testclassification.MiscTests;<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.apache.hadoop.hbase.util.FSUtils;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.util.HFileArchiveTestingUtil;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.util.HFileArchiveUtil;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.util.StoppableImplementation;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.junit.After;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.junit.AfterClass;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.junit.Assert;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.junit.BeforeClass;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import org.junit.ClassRule;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>import org.junit.Rule;<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.junit.rules.TestName;<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> @ClassRule<a name="line.68"></a>
-<span class="sourceLineNo">069</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.69"></a>
-<span class="sourceLineNo">070</span> HBaseClassTestRule.forClass(TestHFileArchiving.class);<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span> private static final Logger LOG = LoggerFactory.getLogger(TestHFileArchiving.class);<a name="line.72"></a>
-<span class="sourceLineNo">073</span> private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.73"></a>
-<span class="sourceLineNo">074</span> private static final byte[] TEST_FAM = Bytes.toBytes("fam");<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span> @Rule<a name="line.76"></a>
-<span class="sourceLineNo">077</span> public TestName name = new TestName();<a name="line.77"></a>
+<span class="sourceLineNo">068</span>/**<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * Test that the {@link HFileArchiver} correctly removes all the parts of a region when cleaning up<a name="line.69"></a>
+<span class="sourceLineNo">070</span> * a region<a name="line.70"></a>
+<span class="sourceLineNo">071</span> */<a name="line.71"></a>
+<span class="sourceLineNo">072</span>@Category({MediumTests.class, MiscTests.class})<a name="line.72"></a>
+<span class="sourceLineNo">073</span>public class TestHFileArchiving {<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span> @ClassRule<a name="line.75"></a>
+<span class="sourceLineNo">076</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.76"></a>
+<span class="sourceLineNo">077</span> HBaseClassTestRule.forClass(TestHFileArchiving.class);<a name="line.77"></a>
<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span> /**<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * Setup the config for the cluster<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();<a name="line.85"></a>
-<span class="sourceLineNo">086</span><a name="line.86"></a>
-<span class="sourceLineNo">087</span> // We don't want the cleaner to remove files. The tests do that.<a name="line.87"></a>
-<span class="sourceLineNo">088</span> UTIL.getMiniHBaseCluster().getMaster().getHFileCleaner().cancel(true);<a name="line.88"></a>
-<span class="sourceLineNo">089</span> }<a name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span> private static void setupConf(Configuration conf) {<a name="line.91"></a>
-<span class="sourceLineNo">092</span> // disable the ui<a name="line.92"></a>
-<span class="sourceLineNo">093</span> conf.setInt("hbase.regionsever.info.port", -1);<a name="line.93"></a>
-<span class="sourceLineNo">094</span> // drop the memstore size so we get flushes<a name="line.94"></a>
-<span class="sourceLineNo">095</span> conf.setInt("hbase.hregion.memstore.flush.size", 25000);<a name="line.95"></a>
-<span class="sourceLineNo">096</span> // disable major compactions<a name="line.96"></a>
-<span class="sourceLineNo">097</span> conf.setInt(HConstants.MAJOR_COMPACTION_PERIOD, 0);<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span> // prevent aggressive region split<a name="line.99"></a>
-<span class="sourceLineNo">100</span> conf.set(HConstants.HBASE_REGION_SPLIT_POLICY_KEY,<a name="line.100"></a>
-<span class="sourceLineNo">101</span> ConstantSizeRegionSplitPolicy.class.getName());<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> @After<a name="line.104"></a>
-<span class="sourceLineNo">105</span> public void tearDown() throws Exception {<a name="line.105"></a>
-<span class="sourceLineNo">106</span> // cleanup the archive directory<a name="line.106"></a>
-<span class="sourceLineNo">107</span> try {<a name="line.107"></a>
-<span class="sourceLineNo">108</span> clearArchiveDirectory();<a name="line.108"></a>
-<span class="sourceLineNo">109</span> } catch (IOException e) {<a name="line.109"></a>
-<span class="sourceLineNo">110</span> Assert.fail("Failure to delete archive directory:" + e.getMessage());<a name="line.110"></a>
-<span class="sourceLineNo">111</span> }<a name="line.111"></a>
-<span class="sourceLineNo">112</span> }<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span> @AfterClass<a name="line.114"></a>
-<span class="sourceLineNo">115</span> public static void cleanupTest() throws Exception {<a name="line.115"></a>
-<span class="sourceLineNo">116</span> try {<a name="line.116"></a>
-<span class="sourceLineNo">117</span> UTIL.shutdownMiniCluster();<a name="line.117"></a>
-<span class="sourceLineNo">118</span> } catch (Exception e) {<a name="line.118"></a>
-<span class="sourceLineNo">119</span> // NOOP;<a name="line.119"></a>
-<span class="sourceLineNo">120</span> }<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> @Test<a name="line.123"></a>
-<span class="sourceLineNo">124</span> public void testRemovesRegionDirOnArchive() throws Exception {<a name="line.124"></a>
-<span class="sourceLineNo">125</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.125"></a>
-<span class="sourceLineNo">126</span> UTIL.createTable(tableName, TEST_FAM);<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span> final Admin admin = UTIL.getAdmin();<a name="line.128"></a>
+<span class="sourceLineNo">079</span> private static final Logger LOG = LoggerFactory.getLogger(TestHFileArchiving.class);<a name="line.79"></a>
+<span class="sourceLineNo">080</span> private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.80"></a>
+<span class="sourceLineNo">081</span> private static final byte[] TEST_FAM = Bytes.toBytes("fam");<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span> @Rule<a name="line.83"></a>
+<span class="sourceLineNo">084</span> public TestName name = new TestName();<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span> /**<a name="line.86"></a>
+<span class="sourceLineNo">087</span> * Setup the config for the cluster<a name="line.87"></a>
+<span class="sourceLineNo">088</span> */<a name="line.88"></a>
+<span class="sourceLineNo">089</span> @BeforeClass<a name="line.89"></a>
+<span class="sourceLineNo">090</span> public static void setupCluster() throws Exception {<a name="line.90"></a>
+<span class="sourceLineNo">091</span> setupConf(UTIL.getConfiguration());<a name="line.91"></a>
+<span class="sourceLineNo">092</span> UTIL.startMiniCluster();<a name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span> // We don't want the cleaner to remove files. The tests do that.<a name="line.94"></a>
+<span class="sourceLineNo">095</span> UTIL.getMiniHBaseCluster().getMaster().getHFileCleaner().cancel(true);<a name="line.95"></a>
+<span class="sourceLineNo">096</span> }<a name="line.96"></a>
+<span class="sourceLineNo">097</span><a name="line.97"></a>
+<span class="sourceLineNo">098</span> private static void setupConf(Configuration conf) {<a name="line.98"></a>
+<span class="sourceLineNo">099</span> // disable the ui<a name="line.99"></a>
+<span class="sourceLineNo">100</span> conf.setInt("hbase.regionsever.info.port", -1);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> // drop the memstore size so we get flushes<a name="line.101"></a>
+<span class="sourceLineNo">102</span> conf.setInt("hbase.hregion.memstore.flush.size", 25000);<a name="line.102"></a>
+<span class="sourceLineNo">103</span> // disable major compactions<a name="line.103"></a>
+<span class="sourceLineNo">104</span> conf.setInt(HConstants.MAJOR_COMPACTION_PERIOD, 0);<a name="line.104"></a>
+<span class="sourceLineNo">105</span><a name="line.105"></a>
+<span class="sourceLineNo">106</span> // prevent aggressive region split<a name="line.106"></a>
+<span class="sourceLineNo">107</span> conf.set(HConstants.HBASE_REGION_SPLIT_POLICY_KEY,<a name="line.107"></a>
+<span class="sourceLineNo">108</span> ConstantSizeRegionSplitPolicy.class.getName());<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> @After<a name="line.111"></a>
+<span class="sourceLineNo">112</span> public void tearDown() throws Exception {<a name="line.112"></a>
+<span class="sourceLineNo">113</span> // cleanup the archive directory<a name="line.113"></a>
+<span class="sourceLineNo">114</span> try {<a name="line.114"></a>
+<span class="sourceLineNo">115</span> clearArchiveDirectory();<a name="line.115"></a>
+<span class="sourceLineNo">116</span> } catch (IOException e) {<a name="line.116"></a>
+<span class="sourceLineNo">117</span> Assert.fail("Failure to delete archive directory:" + e.getMessage());<a name="line.117"></a>
+<span class="sourceLineNo">118</span> }<a name="line.118"></a>
+<span class="sourceLineNo">119</span> }<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span> @AfterClass<a name="line.121"></a>
+<span class="sourceLineNo">122</span> public static void cleanupTest() throws Exception {<a name="line.122"></a>
+<span class="sourceLineNo">123</span> try {<a name="line.123"></a>
+<span class="sourceLineNo">124</span> UTIL.shutdownMiniCluster();<a name="line.124"></a>
+<span class="sourceLineNo">125</span> } catch (Exception e) {<a name="line.125"></a>
+<span class="sourceLineNo">126</span> // NOOP;<a name="line.126"></a>
+<span class="sourceLineNo">127</span> }<a name="line.127"></a>
+<span class="sourceLineNo">128</span> }<a name="line.128"></a>
<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span> // get the current store files for the region<a name="line.130"></a>
-<span class="sourceLineNo">131</span> List<HRegion> servingRegions = UTIL.getHBaseCluster().getRegions(tableName);<a name="line.131"></a>
-<span class="sourceLineNo">132</span> // make sure we only have 1 region serving this table<a name="line.132"></a>
-<span class="sourceLineNo">133</span> assertEquals(1, servingRegions.size());<a name="line.133"></a>
-<span class="sourceLineNo">134</span> HRegion region = servingRegions.get(0);<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span> // and load the table<a name="line.136"></a>
-<span class="sourceLineNo">137</span> UTIL.loadRegion(region, TEST_FAM);<a name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span> // shutdown the table so we can manipulate the files<a name="line.139"></a>
-<span class="sourceLineNo">140</span> admin.disableTable(tableName);<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span> FileSystem fs = UTIL.getTestFileSystem();<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span> // now attempt to depose the region<a name="line.144"></a>
-<span class="sourceLineNo">145</span> Path rootDir = region.getRegionFileSystem().getTableDir().getParent();<a name="line.145"></a>
-<span class="sourceLineNo">146</span> Path regionDir = HRegion.getRegionDir(rootDir, region.getRegionInfo());<a name="line.146"></a>
-<span class="sourceLineNo">147</span><a name="line.147"></a>
-<span class="sourceLineNo">148</span> HFileArchiver.archiveRegion(UTIL.getConfiguration(), fs, region.getRegionInfo());<a name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span> // check for the existence of the archive directory and some files in it<a name="line.150"></a>
-<span class="sourceLineNo">151</span> Path archiveDir = HFileArchiveTestingUtil.getRegionArchiveDir(UTIL.getConfiguration(), region);<a name="line.151"></a>
-<span class="sourceLineNo">152</span> assertTrue(fs.exists(archiveDir));<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span> // check to make sure the store directory was copied<a name="line.154"></a>
-<span class="sourceLineNo">155</span> // check to make sure the store directory was copied<a name="line.155"></a>
-<span class="sourceLineNo">156</span> FileStatus[] stores = fs.listStatus(archiveDir, new PathFilter() {<a name="line.156"></a>
-<span class="sourceLineNo">157</span> @Override<a name="line.157"></a>
-<span class="sourceLineNo">158</span> public boolean accept(Path p) {<a name="line.158"></a>
-<span class="sourceLineNo">159</span> if (p.getName().contains(HConstants.RECOVERED_EDITS_DIR)) {<a name="line.159"></a>
-<span class="sourceLineNo">160</span> return false;<a name="line.160"></a>
-<span class="sourceLineNo">161</span> }<a name="line.161"></a>
-<span class="sourceLineNo">162</span> return true;<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> assertTrue(stores.length == 1);<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span> // make sure we archived the store files<a name="line.167"></a>
-<span class="sourceLineNo">168</span> FileStatus[] storeFiles = fs.listStatus(stores[0].getPath());<a name="line.168"></a>
-<span class="sourceLineNo">169</span> assertTrue(storeFiles.length > 0);<a name="line.169"></a>
-<span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span> // then ensure the region's directory isn't present<a name="line.171"></a>
-<span class="sourceLineNo">172</span> assertFalse(fs.exists(regionDir));<a name="line.172"></a>
+<span class="sourceLineNo">130</span> @Test<a name="line.130"></a>
+<span class="sourceLineNo">131</span> public void testRemovesRegionDirOnArchive() throws Exception {<a name="line.131"></a>
+<span class="sourceLineNo">132</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.132"></a>
+<span class="sourceLineNo">133</span> UTIL.createTable(tableName, TEST_FAM);<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span> final Admin admin = UTIL.getAdmin();<a name="line.135"></a>
+<span class="sourceLineNo">136</span><a name="line.136"></a>
+<span class="sourceLineNo">137</span> // get the current store files for the region<a name="line.137"></a>
+<span class="sourceLineNo">138</span> List<HRegion> servingRegions = UTIL.getHBaseCluster().getRegions(tableName);<a name="line.138"></a>
+<span class="sourceLineNo">139</span> // make sure we only have 1 region serving this table<a name="line.139"></a>
+<span class="sourceLineNo">140</span> assertEquals(1, servingRegions.size());<a name="line.140"></a>
+<span class="sourceLineNo">141</span> HRegion region = servingRegions.get(0);<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span> // and load the table<a name="line.143"></a>
+<span class="sourceLineNo">144</span> UTIL.loadRegion(region, TEST_FAM);<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span> // shutdown the table so we can manipulate the files<a name="line.146"></a>
+<span class="sourceLineNo">147</span> admin.disableTable(tableName);<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span> FileSystem fs = UTIL.getTestFileSystem();<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span> // now attempt to depose the region<a name="line.151"></a>
+<span class="sourceLineNo">152</span> Path rootDir = region.getRegionFileSystem().getTableDir().getParent();<a name="line.152"></a>
+<span class="sourceLineNo">153</span> Path regionDir = HRegion.getRegionDir(rootDir, region.getRegionInfo());<a name="line.153"></a>
+<span class="sourceLineNo">154</span><a name="line.154"></a>
+<span class="sourceLineNo">155</span> HFileArchiver.archiveRegion(UTIL.getConfiguration(), fs, region.getRegionInfo());<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span> // check for the existence of the archive directory and some files in it<a name="line.157"></a>
+<span class="sourceLineNo">158</span> Path archiveDir = HFileArchiveTestingUtil.getRegionArchiveDir(UTIL.getConfiguration(), region);<a name="line.158"></a>
+<span class="sourceLineNo">159</span> assertTrue(fs.exists(archiveDir));<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span> // check to make sure the store directory was copied<a name="line.161"></a>
+<span class="sourceLineNo">162</span> // check to make sure the store directory was copied<a name="line.162"></a>
+<span class="sourceLineNo">163</span> FileStatus[] stores = fs.listStatus(archiveDir, new PathFilter() {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> @Override<a name="line.164"></a>
+<span class="sourceLineNo">165</span> public boolean accept(Path p) {<a name="line.165"></a>
+<span class="sourceLineNo">166</span> if (p.getName().contains(HConstants.RECOVERED_EDITS_DIR)) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span> return false;<a name="line.167"></a>
+<span class="sourceLineNo">168</span> }<a name="line.168"></a>
+<span class="sourceLineNo">169</span> return true;<a name="line.169"></a>
+<span class="sourceLineNo">170</span> }<a name="line.170"></a>
+<span class="sourceLineNo">171</span> });<a name="line.171"></a>
+<span class="sourceLineNo">172</span> assertTrue(stores.length == 1);<a name="line.172"></a>
<span class="sourceLineNo">173</span><a name="line.173"></a>
-<span class="sourceLineNo">174</span> UTIL.deleteTable(tableName);<a name="line.174"></a>
-<span class="sourceLineNo">175</span> }<a name="line.175"></a>
-<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span> /**<a name="line.177"></a>
-<span class="sourceLineNo">178</span> * Test that the region directory is removed when we archive a region without store files, but<a name="line.178"></a>
-<span class="sourceLineNo">179</span> * still has hidden files.<a name="line.179"></a>
-<span class="sourceLineNo">180</span> * @throws Exception<a name="line.180"></a>
-<span class="sourceLineNo">181</span> */<a name="line.181"></a>
-<span class="sourceLineNo">182</span> @Test<a name="line.182"></a>
-<span class="sourceLineNo">183</span> public void testDeleteRegionWithNoStoreFiles() throws Exception {<a name="line.183"></a>
-<span class="sourceLineNo">184</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.184"></a>
-<span class="sourceLineNo">185</span> UTIL.createTable(tableName, TEST_FAM);<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span> // get the current store files for the region<a name="line.187"></a>
-<span class="sourceLineNo">188</span> List<HRegion> servingRegions = UTIL.getHBaseCluster().getRegions(tableName);<a name="line.188"></a>
-<span class="sourceLineNo">189</span> // make sure we only have 1 region serving this table<a name="line.189"></a>
-<span class="sourceLineNo">190</span> assertEquals(1, servingRegions.size());<a name="line.190"></a>
-<span class="sourceLineNo">191</span> HRegion region = servingRegions.get(0);<a name="line.191"></a>
-<span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span> FileSystem fs = region.getRegionFileSystem().getFileSystem();<a name="line.193"></a>
+<span class="sourceLineNo">174</span> // make sure we archived the store files<a name="line.174"></a>
+<span class="sourceLineNo">175</span> FileStatus[] storeFiles = fs.listStatus(stores[0].getPath());<a name="line.175"></a>
+<span class="sourceLineNo">176</span> assertTrue(storeFiles.length > 0);<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span> // then ensure the region's directory isn't present<a name="line.178"></a>
+<span class="sourceLineNo">179</span> assertFalse(fs.exists(regionDir));<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span> UTIL.deleteTable(tableName);<a name="line.181"></a>
+<span class="sourceLineNo">182</span> }<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span> /**<a name="line.184"></a>
+<span class="sourceLineNo">185</span> * Test that the region directory is removed when we archive a region without store files, but<a name="line.185"></a>
+<span class="sourceLineNo">186</span> * still has hidden files.<a name="line.186"></a>
+<span class="sourceLineNo">187</span> * @throws IOException throws an IOException if there's problem creating a table<a name="line.187"></a>
+<span class="sourceLineNo">188</span> * or if there's an issue with accessing FileSystem.<a name="line.188"></a>
+<span class="sourceLineNo">189</span> */<a name="line.189"></a>
+<span class="sourceLineNo">190</span> @Test<a name="line.190"></a>
+<span class="sourceLineNo">191</span> public void testDeleteRegionWithNoStoreFiles() throws IOException {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.192"></a>
+<span class="sourceLineNo">193</span> UTIL.createTable(tableName, TEST_FAM);<a name="line.193"></a>
<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span> // make sure there are some files in the regiondir<a name="line.195"></a>
-<span class="sourceLineNo">196</span> Path rootDir = FSUtils.getRootDir(fs.getConf());<a name="line.196"></a>
-<span class="sourceLineNo">197</span> Path regionDir = HRegion.getRegionDir(rootDir, region.getRegionInfo());<a name="line.197"></a>
-<span class="sourceLineNo">198</span> FileStatus[] regionFiles = FSUtils.listStatus(fs, regionDir, null);<a name="line.198"></a>
-<span class="sourceLineNo">199</span> Assert.assertNotNull("No files in the region directory", regionFiles);<a name="line.199"></a>
-<span class="sourceLineNo">200</span> if (LOG.isDebugEnabled()) {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> List<Path> files = new ArrayList<>();<a name="line.201"></a>
-<span class="sourceLineNo">202</span> for (FileStatus file : regionFiles) {<a name="line.202"></a>
-<span class="sourceLineNo">203</span> files.add(file.getPath());<a name="line.203"></a>
-<span class="sourceLineNo">204</span> }<a name="line.204"></a>
-<span class="sourceLineNo">205</span> LOG.debug("Current files:" + files);<a name="line.205"></a>
-<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span> // delete the visible folders so we just have hidden files/folders<a name="line.207"></a>
-<span class="sourceLineNo">208</span> final PathFilter dirFilter = new FSUtils.DirFilter(fs);<a name="line.208"></a>
-<span class="sourceLineNo">209</span> PathFilter nonHidden = new PathFilter() {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> @Override<a name="line.210"></a>
-<span class="sourceLineNo">211</span> public boolean accept(Path file) {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> return dirFilter.accept(file) && !file.getName().toString().startsWith(".");<a name="line.212"></a>
-<span class="sourceLineNo">213</span> }<a name="line.213"></a>
-<span class="sourceLineNo">214</span> };<a name="line.214"></a>
-<span class="sourceLineNo">215</span> FileStatus[] storeDirs = FSUtils.listStatus(fs, regionDir, nonHidden);<a name="line.215"></a>
-<span class="sourceLineNo">216</span> for (FileStatus store : storeDirs) {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> LOG.debug("Deleting store for test");<a name="line.217"></a>
-<span class="sourceLineNo">218</span> fs.delete(store.getPath(), true);<a name="line.218"></a>
-<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span> // then archive the region<a name="line.221"></a>
-<span class="sourceLineNo">222</span> HFileArchiver.archiveRegion(UTIL.getConfiguration(), fs, region.getRegionInfo());<a name="line.222"></a>
-<span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span> // and check to make sure the region directoy got deleted<a name="line.224"></a>
-<span class="sourceLineNo">225</span> assertFalse("Region directory (" + regionDir + "), still exists.", fs.exists(regionDir));<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span> UTIL.deleteTable(tableName);<a name="line.227"></a>
-<span class="sourceLineNo">228</span> }<a name="line.228"></a>
-<span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span> @Test<a name="line.230"></a>
-<span class="sourceLineNo">231</span> public void testArchiveOnTableDelete() throws Exception {<a name="line.231"></a>
-<span class="sourceLineNo">232</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.232"></a>
-<span class="sourceLineNo">233</span> UTIL.createTable(tableName, TEST_FAM);<a name="line.233"></a>
+<span class="sourceLineNo">195</span> // get the current store files for the region<a name="line.195"></a>
+<span class="sourceLineNo">196</span> List<HRegion> servingRegions = UTIL.getHBaseCluster().getRegions(tableName);<a name="line.196"></a>
+<span class="sourceLineNo">197</span> // make sure we only have 1 region serving this table<a name="line.197"></a>
+<span class="sourceLineNo">198</span> assertEquals(1, servingRegions.size());<a name="line.198"></a>
+<span class="sourceLineNo">199</span> HRegion region = servingRegions.get(0);<a name="line.199"></a>
+<span class="sourceLineNo">200</span><a name="line.200"></a>
+<span class="sourceLineNo">201</span> FileSystem fs = region.getRegionFileSystem().getFileSystem();<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span> // make sure there are some files in the regiondir<a name="line.203"></a>
+<span class="sourceLineNo">204</span> Path rootDir = FSUtils.getRootDir(fs.getConf());<a name="line.204"></a>
+<span class="sourceLineNo">205</span> Path regionDir = HRegion.getRegionDir(rootDir, region.getRegionInfo());<a name="line.205"></a>
+<span class="sourceLineNo">206</span> FileStatus[] regionFiles = FSUtils.listStatus(fs, regionDir, null);<a name="line.206"></a>
+<span class="sourceLineNo">207</span> Assert.assertNotNull("No files in the region directory", regionFiles);<a name="line.207"></a>
+<span class="sourceLineNo">208</span> if (LOG.isDebugEnabled()) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span> List<Path> files = new ArrayList<>();<a name="line.209"></a>
+<span class="sourceLineNo">210</span> for (FileStatus file : regionFiles) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> files.add(file.getPath());<a name="line.211"></a>
+<span class="sourceLineNo">212</span> }<a name="line.212"></a>
+<span class="sourceLineNo">213</span> LOG.debug("Current files:" + files);<a name="line.213"></a>
+<span class="sourceLineNo">214</span> }<a name="line.214"></a>
+<span class="sourceLineNo">215</span> // delete the visible folders so we just have hidden files/folders<a name="line.215"></a>
+<span class="sourceLineNo">216</span> final PathFilter dirFilter = new FSUtils.DirFilter(fs);<a name="line.216"></a>
+<span class="sourceLineNo">217</span> PathFilter nonHidden = new PathFilter() {<a name="line.217"></a>
+<span class="sourceLineNo">218</span> @Override<a name="line.218"></a>
+<span class="sourceLineNo">219</span> public boolean accept(Path file) {<a name="line.219"></a>
+<span class="sourceLineNo">220</span> return dirFilter.accept(file) && !file.getName().startsWith(".");<a name="line.220"></a>
+<span class="sourceLineNo">221</span> }<a name="line.221"></a>
+<span class="sourceLineNo">222</span> };<a name="line.222"></a>
+<span class="sourceLineNo">223</span> FileStatus[] storeDirs = FSUtils.listStatus(fs, regionDir, nonHidden);<a name="line.223"></a>
+<span class="sourceLineNo">224</span> for (FileStatus store : storeDirs) {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> LOG.debug("Deleting store for test");<a name="line.225"></a>
+<span class="sourceLineNo">226</span> fs.delete(store.getPath(), true);<a name="line.226"></a>
+<span class="sourceLineNo">227</span> }<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span> // then archive the region<a name="line.229"></a>
+<span class="sourceLineNo">230</span> HFileArchiver.archiveRegion(UTIL.getConfiguration(), fs, region.getRegionInfo());<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span> // and check to make sure the region directoy got deleted<a name="line.232"></a>
+<span class="sourceLineNo">233</span> assertFalse("Region directory (" + regionDir + "), still exists.", fs.exists(regionDir));<a name="line.233"></a>
<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span> List<HRegion> servingRegions = UTIL.getHBaseCluster().getRegions(tableName);<a name="line.235"></a>
-<span class="sourceLineNo">236</span> // make sure we only have 1 region serving this table<a name="line.236"></a>
-<span class="sourceLineNo">237</span> assertEquals(1, servingRegions.size());<a name="line.237"></a>
-<span class="sourceLineNo">238</span> HRegion region = servingRegions.get(0);<a name="line.238"></a>
-<span class="sourceLineNo">239</span><a name="line.239"></a>
-<span class="sourceLineNo">240</span> // get the parent RS and monitor<a name="line.240"></a>
-<span class="sourceLineNo">241</span> HRegionServer hrs = UTIL.getRSForFirstRegionInTable(tableName);<a name="line.241"></a>
-<span class="sourceLineNo">242</span> FileSystem fs = hrs.getFileSystem();<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span> // put some data on the region<a name="line.244"></a>
-<span class="sourceLineNo">245</span> LOG.debug("-------Loading table");<a name="line.245"></a>
-<span class="sourceLineNo">246</span> UTIL.loadRegion(region, TEST_FAM);<a name="line.246"></a>
+<span class="sourceLineNo">235</span> UTIL.deleteTable(tableName);<a name="line.235"></a>
+<span class="sourceLineNo">236</span> }<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span> @Test<a name="line.238"></a>
+<span class="sourceLineNo">239</span> public void testArchiveOnTableDelete() throws Exception {<a name="line.239"></a>
+<span class="sourceLineNo">240</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.240"></a>
+<span class="sourceLineNo">241</span> UTIL.createTable(tableName, TEST_FAM);<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span> List<HRegion> servingRegions = UTIL.getHBaseCluster().getRegions(tableName);<a name="line.243"></a>
+<span class="sourceLineNo">244</span> // make sure we only have 1 region serving this table<a name="line.244"></a>
+<span class="sourceLineNo">245</span> assertEquals(1, servingRegions.size());<a name="line.245"></a>
+<span class="sourceLineNo">246</span> HRegion region = servingRegions.get(0);<a name="line.246"></a>
<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span> // get the hfiles in the region<a name="line.248"></a>
-<span class="sourceLineNo">249</span> List<HRegion> regions = hrs.getRegions(tableName);<a name="line.249"></a>
-<span class="sourceLineNo">250</span> assertEquals("More that 1 region for test table.", 1, regions.size());<a name="line.250"></a>
+<span class="sourceLineNo">248</span> // get the parent RS and monitor<a name="line.248"></a>
+<span class="sourceLineNo">249</span> HRegionServer hrs = UTIL.getRSForFirstRegionInTable(tableName);<a name="line.249"></a>
+<span class="sourceLineNo">250</span> FileSystem fs = hrs.getFileSystem();<a name="line.250"></a>
<span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span> region = regions.get(0);<a name="line.252"></a>
-<span class="sourceLineNo">253</span> // wait for all the compactions to complete<a name="line.253"></a>
-<span class="sourceLineNo">254</span> region.waitForFlushesAndCompactions();<a name="line.254"></a>
+<span class="sourceLineNo">252</span> // put some data on the region<a name="line.252"></a>
+<span class="sourceLineNo">253</span> LOG.debug("-------Loading table");<a name="line.253"></a>
+<span class="sourceLineNo">254</span> UTIL.loadRegion(region, TEST_FAM);<a name="line.254"></a>
<span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span> // disable table to prevent new updates<a name="line.256"></a>
-<span class="sourceLineNo">257</span> UTIL.getAdmin().disableTable(tableName);<a name="line.257"></a>
-<span class="sourceLineNo">258</span> LOG.debug("Disabled table");<a name="line.258"></a>
+<span class="sourceLineNo">256</span> // get the hfiles in the region<a name="line.256"></a>
+<span class="sourceLineNo">257</span> List<HRegion> regions = hrs.getRegions(tableName);<a name="line.257"></a>
+<span class="sourceLineNo">258</span> assertEquals("More that 1 region for test table.", 1, regions.size());<a name="line.258"></a>
<span class="sourceLineNo">259</span><a name="line.259"></a>
-<span class="sourceLineNo">260</span> // remove all the files from the archive to get a fair comparison<a name="line.260"></a>
-<span class="sourceLineNo">261</span> clearArchiveDirectory();<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span> // then get the current store files<a name="line.263"></a>
-<span class="sourceLineNo">264</span> byte[][]columns = region.getTableDescriptor().getColumnFamilyNames().toArray(new byte[0][]);<a name="line.264"></a>
-<span class="sourceLineNo">265</span> List<String> storeFiles = region.getStoreFileList(columns);<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span> // then delete the table so the hfiles get archived<a name="line.267"></a>
-<span class="sourceLineNo">268</span> UTIL.deleteTable(tableName);<a name="line.268"></a>
-<span class="sourceLineNo">269</span> LOG.debug("Deleted table");<a name="line.269"></a>
+<span class="sourceLineNo">260</span> region = regions.get(0);<a name="line.260"></a>
+<span class="sourceLineNo">261</span> // wait for all the compactions to complete<a name="line.261"></a>
+<span class="sourceLineNo">262</span> region.waitForFlushesAndCompactions();<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span> // disable table to prevent new updates<a name="line.264"></a>
+<span class="sourceLineNo">265</span> UTIL.getAdmin().disableTable(tableName);<a name="line.265"></a>
+<span class="sourceLineNo">266</span> LOG.debug("Disabled table");<a name="line.266"></a>
+<span class="sourceLineNo">267</span><a name="line.267"></a>
+<span class="sourceLineNo">268</span> // remove all the files from the archive to get a fair comparison<a name="line.268"></a>
+<span class="sourceLineNo">269</span> clearArchiveDirectory();<a name="line.269"></a>
<span class="sourceLineNo">270</span><a name="line.270"></a>
-<span class="sourceLineNo">271</span> assertArchiveFiles(fs, storeFiles, 30000);<a name="line.271"></a>
-<span class="sourceLineNo">272</span> }<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span> private void assertArchiveFiles(FileSystem fs, List<String> storeFiles, long timeout) throws IOException {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> long end = System.currentTimeMillis() + timeout;<a name="line.275"></a>
-<span class="sourceLineNo">276</span> Path archiveDir = HFileArchiveUtil.getArchivePath(UTIL.getConfiguration());<a name="line.276"></a>
-<span class="sourceLineNo">277</span> List<String> archivedFiles = new ArrayList<>();<a name="line.277"></a>
+<span class="sourceLineNo">271</span> // then get the current store files<a name="line.271"></a>
+<span class="sourceLineNo">272</span> byte[][]columns = region.getTableDescriptor().getColumnFamilyNames().toArray(new byte[0][]);<a name="line.272"></a>
+<span class="sourceLineNo">273</span> List<String> storeFiles = region.getStoreFileList(columns);<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span> // then delete the table so the hfiles get archived<a name="line.275"></a>
+<span class="sourceLineNo">276</span> UTIL.deleteTable(tableName);<a name="line.276"></a>
+<span class="sourceLineNo">277</span> LOG.debug("Deleted table");<a name="line.277"></a>
<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span> // We have to ensure that the DeleteTableHandler is finished. HBaseAdmin.deleteXXX() can return before all files<a name="line.279"></a>
-<span class="sourceLineNo">280</span> // are archived. We should fix HBASE-5487 and fix synchronous operations from admin.<a name="line.280"></a>
-<span class="sourceLineNo">281</span> while (System.currentTimeMillis() < end) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span> archivedFiles = getAllFileNames(fs, archiveDir);<a name="line.282"></a>
-<span class="sourceLineNo">283</span> if (archivedFiles.size() >= storeFiles.size()) {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> break;<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">279</span> assertArchiveFiles(fs, storeFiles, 30000);<a name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span> private void assertArchiveFiles(FileSystem fs, List<String> storeFiles, long timeout)<a name="line.282"></a>
+<span class="sourceLineNo">283</span> throws IOException {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> long end = System.currentTimeMillis() + timeout;<a name="line.284"></a>
+<span class="sourceLineNo">285</span> Path archiveDir = HFileArchiveUtil.getArchivePath(UTIL.getConfiguration());<a name="line.285"></a>
+<span class="sourceLineNo">286</span> List<String> archivedFiles = new ArrayList<>();<a name="line.286"></a>
<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span> Collections.sort(storeFiles);<a name="line.288"></a>
-<span class="sourceLineNo">289</span> Collections.sort(archivedFiles);<a name="line.289"></a>
-<span class="sourceLineNo">290</span><a name="line.290"></a>
-<span class="sourceLineNo">291</span> LOG.debug("Store files:");<a name="line.291"></a>
-<span class="sourceLineNo">292</span> for (int i = 0; i < storeFiles.size(); i++) {<a name="line.292"></a>
-<span class="sourceLineNo">293</span> LOG.debug(i + " - " + storeFiles.get(i));<a name="line.293"></a>
-<span class="sourceLineNo">294</span> }<a name="line.294"></a>
-<span class="sourceLineNo">295</span> LOG.debug("Archive files:");<a name="line.295"></a>
-<span class="sourceLineNo">296</span> for (int i = 0; i < archivedFiles.size(); i++) {<a name="line.296"></a>
-<span class="sourceLineNo">297</span> LOG.debug(i + " - " + archivedFiles.get(i));<a name="line.297"></a>
-<span class="sourceLineNo">298</span> }<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span> assertTrue("Archived files are missing some of the store files!",<a name="line.300"></a>
-<span class="sourceLineNo">301</span> archivedFiles.containsAll(storeFiles));<a name="line.301"></a>
-<span class="sourceLineNo">302</span> }<a name="line.302"></a>
-<span class="sourceLineNo">303</span><a name="line.303"></a>
-<span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span> /**<a name="line.305"></a>
-<span class="sourceLineNo">306</span> * Test that the store files are archived when a column family is removed.<a name="line.306"></a>
-<span class="sourceLineNo">307</span> * @throws Exception<a name="line.307"></a>
-<span class="sourceLineNo">308</span> */<a name="line.308"></a>
-<span class="sourceLineNo">309</span> @Test<a name="line.309"></a>
-<span class="sourceLineNo">310</span> public void testArchiveOnTableFamilyDelete() throws Exception {<a name="line.310"></a>
-<span class="sourceLineNo">311</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.311"></a>
-<span class="sourceLineNo">312</span> UTIL.createTable(tableName, new byte[][] {TEST_FAM, Bytes.toBytes("fam2")});<a name="line.312"></a>
+<span class="sourceLineNo">288</span> // We have to ensure that the DeleteTableHandler is finished. HBaseAdmin.deleteXXX()<a name="line.288"></a>
+<span class="sourceLineNo">289</span> // can return before all files<a name="line.289"></a>
+<span class="sourceLineNo">290</span> // are archived. We should fix HBASE-5487 and fix synchronous operations from admin.<a name="line.290"></a>
+<span class="sourceLineNo">291</span> while (System.currentTimeMillis() < end) {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> archivedFiles = getAllFileNames(fs, archiveDir);<a name="line.292"></a>
+<span class="sourceLineNo">293</span> if (archivedFiles.size() >= storeFiles.size()) {<a name="line.293"></a>
+<span class="sourceLineNo">294</span> break;<a name="line.294"></a>
+<span class="sourceLineNo">295</span> }<a name="line.295"></a>
+<span class="sourceLineNo">296</span> }<a name="line.296"></a>
+<span class="sourceLineNo">297</span><a name="line.297"></a>
+<span class="sourceLineNo">298</span> Collections.sort(storeFiles);<a name="line.298"></a>
+<span class="sourceLineNo">299</span> Collections.sort(archivedFiles);<a name="line.299"></a>
+<span class="sourceLineNo">300</span><a name="line.300"></a>
+<span class="sourceLineNo">301</span> LOG.debug("Store files:");<a name="line.301"></a>
+<span class="sourceLineNo">302</span> for (int i = 0; i < storeFiles.size(); i++) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span> LOG.debug(i + " - " + storeFiles.get(i));<a name="line.303"></a>
+<span class="sourceLineNo">304</span> }<a name="line.304"></a>
+<span class="sourceLineNo">305</span> LOG.debug("Archive files:");<a name="line.305"></a>
+<span class="sourceLineNo">306</span> for (int i = 0; i < archivedFiles.size(); i++) {<a name="line.306"></a>
+<span class="sourceLineNo">307</span> LOG.debug(i + " - " + archivedFiles.get(i));<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> assertTrue("Archived files are missing some of the store files!",<a name="line.310"></a>
+<span class="sourceLineNo">311</span> archivedFiles.containsAll(storeFiles));<a name="line.311"></a>
+<span class="sourceLineNo">312</span> }<a name="line.312"></a>
<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span> List<HRegion> servingRegions = UTIL.getHBaseCluster().getRegions(tableName);<a name="line.314"></a>
-<span class="sourceLineNo">315</span> // make sure we only have 1 region serving this table<a name="line.315"></a>
-<span class="sourceLineNo">316</span> assertEquals(1, servingRegions.size());<a name="line.316"></a>
-<span class="sourceLineNo">317</span> HRegion region = servingRegions.get(0);<a name="line.317"></a>
-<span class="sourceLineNo">318</span><a name="line.318"></a>
-<span class="sourceLineNo">319</span> // get the parent RS and monitor<a name="line.319"></a>
-<span class="sourceLineNo">320</span> HRegionServer hrs = UTIL.getRSForFirstRegionInTable(tableName);<a name="line.320"></a>
-<span class="sourceLineNo">321</span> FileSystem fs = hrs.getFileSystem();<a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span> // put some data on the region<a name="line.323"></a>
-<span class="sourceLineNo">324</span> LOG.debug("-------Loading table");<a name="line.324"></a>
-<span class="sourceLineNo">325</span> UTIL.loadRegion(region, TEST_FAM);<a name="line.325"></a>
-<span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span> // get the hfiles in the region<a name="line.327"></a>
-<span class="sourceLineNo">328</span> List<HRegion> regions = hrs.getRegions(tableName);<a name="line.328"></a>
-<span class="sourceLineNo">329</span> assertEquals("More that 1 region for test table.", 1, regions.size());<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span> region = regions.get(0);<a name="line.331"></a>
-<span class="sourceLineNo">332</span> // wait for all the compactions to complete<a name="line.332"></a>
-<span class="sourceLineNo">333</span> region.waitForFlushesAndCompactions();<a name="line.333"></a>
-<span class="sourceLineNo">334</span><a name="line.334"></a>
-<span class="sourceLineNo">335</span> // disable table to prevent new updates<a name="line.335"></a>
-<span class="sourceLineNo">336</span> UTIL.getAdmin().disableTable(tableName);<a name="line.336"></a>
-<span class="sourceLineNo">337</span> LOG.debug("Disabled table");<a name="line.337"></a>
-<span class="sourceLineNo">338</span><a name="line.338"></a>
-<span class="sourceLineNo">339</span> // remove all the files from the archive to get a fair comparison<a name="line.339"></a>
-<span class="sourceLineNo">340</span> clearArchiveDirectory();<a name="line.340"></a>
+<span class="sourceLineNo">314</span><a name="line.314"></a>
+<span class="sourceLineNo">315</span> /**<a name="line.315"></a>
+<span class="sourceLineNo">316</span> * Test that the store files are archived when a column family is removed.<a name="line.316"></a>
+<span class="sourceLineNo">317</span> * @throws java.io.IOException if there's a problem creating a table.<a name="line.317"></a>
+<span class="sourceLineNo">318</span> * @throws java.lang.InterruptedException problem getting a RegionServer.<a name="line.318"></a>
+<span class="sourceLineNo">319</span> */<a name="line.319"></a>
+<span class="sourceLineNo">320</span> @Test<a name="line.320"></a>
+<span class="sourceLineNo">321</span> public void testArchiveOnTableFamilyDelete() throws IOException, InterruptedException {<a name="line.321"></a>
+<span class="sourceLineNo">322</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.322"></a>
+<span class="sourceLineNo">323</span> UTIL.createTable(tableName, new byte[][] {TEST_FAM, Bytes.toBytes("fam2")});<a name="line.323"></a>
+<span class="sourceLineNo">324</span><a name="line.324"></a>
+<span class="sourceLineNo">325</span> List<HRegion> servingRegions = UTIL.getHBaseCluster().getRegions(tableName);<a name="line.325"></a>
+<span class="sourceLineNo">326</span> // make sure we only have 1 region serving this table<a name="line.326"></a>
+<span class="sourceLineNo">327</span> assertEquals(1, servingRegions.size());<a name="line.327"></a>
+<span class="sourceLineNo">328</span> HRegion region = servingRegions.get(0);<a name="line.328"></a>
+<span class="sourceLineNo">329</span><a name="line.329"></a>
+<span class="sourceLineNo">330</span> // get the parent RS and monitor<a name="line.330"></a>
+<span class="sourceLineNo">331</span> HRegionServer hrs = UTIL.getRSForFirstRegionInTable(tableName);<a name="line.331"></a>
+<span class="sourceLineNo">332</span> FileSystem fs = hrs.getFileSystem();<a name="line.332"></a>
+<span class="sourceLineNo">333</span><a name="line.333"></a>
+<span class="sourceLineNo">334</span> // put some data on the region<a name="line.334"></a>
+<span class="sourceLineNo">335</span> LOG.debug("-------Loading table");<a name="line.335"></a>
+<span class="sourceLineNo">336</span> UTIL.loadRegion(region, TEST_FAM);<a name="line.336"></a>
+<span class="sourceLineNo">337</span><a name="line.337"></a>
+<span class="sourceLineNo">338</span> // get the hfiles in the region<a name="line.338"></a>
+<span class="sourceLineNo">339</span> List<HRegion> regions = hrs.getRegions(tableName);<a name="line.339"></a>
+<span class="sourceLineNo">340</span> assertEquals("More that 1 region for test table.", 1, regions.size());<a name="line.340"></a>
<span class="sourceLineNo">341</span><a name="line.341"></a>
-<span class="sourceLineNo">342</span> // then get the current store files<a name="line.342"></a>
-<span class="sourceLineNo">343</span> byte[][]columns = region.getTableDescriptor().getColumnFamilyNames().toArray(new byte[0][]);<a name="line.343"></a>
-<span class="sourceLineNo">344</span> List<String> storeFiles = region.getStoreFileList(columns);<a name="line.344"></a>
+<span class="sourceLineNo">342</span> region = regions.get(0);<a name="line.342"></a>
+<span class="sourceLineNo">343</span> // wait for all the compactions to complete<a name="line.343"></a>
+<span class="sourceLineNo">344</span> region.waitForFlushesAndCompactions();<a name="line.344"></a>
<span class="sourceLineNo">345</span><a name="line.345"></a>
-<span class="sourceLineNo">346</span> // then delete the table so the hfiles get archived<a name="line.346"></a>
-<span class="sourceLineNo">347</span> UTIL.getAdmin().deleteColumnFamily(tableName, TEST_FAM);<a name="line.347"></a>
-<span class="sourceLineNo">348</span><a name="line.348"></a>
-<span class="sourceLineNo">349</span> assertArchiveFiles(fs, storeFiles, 30000);<a name="line.349"></a>
-<span class="sourceLineNo">350</span><a name="line.350"></a>
-<span class="sourceLineNo">351</span> UTIL.deleteTable(tableName);<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> * Test HFileArchiver.resolveAndArchive() race condition HBASE-7643<a name="line.355"></a>
-<span class="sourceLineNo">356</span> */<a name="line.356"></a>
-<span class="sourceLineNo">357</span> @Test<a name="line.357"></a>
-<span class="sourceLineNo">358</span> public void testCleaningRace() throws Exception {<a name="line.358"></a>
-<span class="sourceLineNo">359</span> final long TEST_TIME = 20 * 1000;<a name="line.359"></a>
-<span class="sourceLineNo">360</span> final ChoreService choreService = new ChoreService("TEST_SERVER_NAME");<a name="line.360"></a>
+<span class="sourceLineNo">346</span> // disable table to prevent new updates<a name="line.346"></a>
+<span class="sourceLineNo">347</span> UTIL.getAdmin().disableTable(tableName);<a name="line.347"></a>
+<span class="sourceLineNo">348</span> LOG.debug("Disabled table");<a name="line.348"></a>
+<span class="sourceLineNo">349</span><a name="line.349"></a>
+<span class="sourceLineNo">350</span> // remove all the files from the archive to get a fair comparison<a name="line.350"></a>
+<span class="sourceLineNo">351</span> clearArchiveDirectory();<a name="line.351"></a>
+<span class="sourceLineNo">352</span><a name="line.352"></a>
+<span class="sourceLineNo">353</span> // then get the current store files<a name="line.353"></a>
+<span class="sourceLineNo">354</span> byte[][]columns = region.getTableDescriptor().getColumnFamilyNames().toArray(new byte[0][]);<a name="line.354"></a>
+<span class="sourceLineNo">355</span> List<String> storeFiles = region.getStoreFileList(columns);<a name="line.355"></a>
+<span class="sourceLineNo">356</span><a name="line.356"></a>
+<span class="sourceLineNo">357</span> // then delete the table so the hfiles get archived<a name="line.357"></a>
+<span class="sourceLineNo">358</span> UTIL.getAdmin().deleteColumnFamily(tableName, TEST_FAM);<a name="line.358"></a>
+<span class="sourceLineNo">359</span><a name="line.359"></a>
+<span class="sourceLineNo">360</span> assertArchiveFiles(fs, storeFiles, 30000);<a name="line.360"></a>
<span class="sourceLineNo">361</span><a name="line.361"></a>
-<span class="sourceLineNo">362</span> Configuration conf = UTIL.getMiniHBaseCluster().getMaster().getConfiguration();<a name="line.362"></a>
-<span class="sourceLineNo">363</span> Path rootDir = UTIL.getDataTestDirOnTestFS("testCleaningRace");<a name="line.363"></a>
-<span class="sourceLineNo">364</span> FileSystem fs = UTIL.getTestFileSystem();<a name="line.364"></a>
-<span class="sourceLineNo">365</span><a name="line.365"></a>
-<span class="sourceLineNo">366</span> Path archiveDir = new Path(rootDir, HConstants.HFILE_ARCHIVE_DIRECTORY);<a name="line.366"></a>
-<span class="sourceLineNo">367</span> Path regionDir = new Path(FSUtils.getTableDir(new Path("./"),<a name="line.367"></a>
-<span class="sourceLineNo">368</span> TableName.valueOf(name.getMethodName())), "abcdef");<a name="line.368"></a>
-<span class="sourceLineNo">369</span> Path familyDir = new Path(regionDir, "cf");<a name="line.369"></a>
-<span class="sourceLineNo">370</span><a name="line.370"></a>
-<span class="sourceLineNo">371</span> Path sourceRegionDir = new Path(rootDir, regionDir);<a name="line.371"></a>
-<span class="sourceLineNo">372</span> fs.mkdirs(sourceRegionDir);<a name="line.372"></a>
-<span class="sourceLineNo">373</span><a name="line.373"></a>
-<span class="sourceLineNo">374</span> Stoppable stoppable = new StoppableImplementation();<a name="line.374"></a>
-<span class="sourceLineNo">375</span><a name="line.375"></a>
-<span class="sourceLineNo">376</span> // The cleaner should be looping without long pauses to reproduce the race condition.<a name="line.376"></a>
-<span class="sourceLineNo">377</span> HFileCleaner cleaner = new HFileCleaner(1, stoppable, conf, fs, archiveDir);<a name="line.377"></a>
-<span class="sourceLineNo">378</span> assertFalse("cleaner should not be null", cleaner == null);<a name="line.378"></a>
-<span class="sourceLineNo">379</span> try {<a name="line.379"></a>
-<span class="sourceLineNo">380</span> choreService.scheduleChore(cleaner);<a name="line.380"></a>
+<span class="sourceLineNo">362</span> UTIL.deleteTable(tableName);<a name="line.362"></a>
+<span class="sourceLineNo">363</span> }<a name="line.363"></a>
+<span class="sourceLineNo">364</span><a name="line.364"></a>
+<span class="sourceLineNo">365</span> /**<a name="line.365"></a>
+<span class="sourceLineNo">366</span> * Test HFileArchiver.resolveAndArchive() race condition HBASE-7643<a name="line.366"></a>
+<span class="sourceLineNo">367</span> */<a name="line.367"></a>
+<span class="sourceLineNo">368</span> @Test<a name="line.368"></a>
+<span class="sourceLineNo">369</span> public void testCleaningRace() throws Exception {<a name="line.369"></a>
+<span class="sourceLineNo">370</span> final long TEST_TIME = 20 * 1000;<a name="line.370"></a>
+<span class="sourceLineNo">371</span> final ChoreService choreService = new ChoreService("TEST_SERVER_NAME");<a name="line.371"></a>
+<span class="sourceLineNo">372</span><a name="line.372"></a>
+<span class="sourceLineNo">373</span> Configuration conf = UTIL.getMiniHBaseCluster().getMaster().getConfiguration();<a name="line.373"></a>
+<span class="sourceLineNo">374</span> Path rootDir = UTIL.getDataTestDirOnTestFS("testCleaningRace");<a name="line.374"></a>
+<span class="sourceLineNo">375</span> FileSystem fs = UTIL.getTestFileSystem();<a name="line.375"></a>
+<span class="sourceLineNo">376</span><a name="line.376"></a>
+<span class="sourceLineNo">377</span> Path archiveDir = new Path(rootDir, HConstants.HFILE_ARCHIVE_DIRECTORY);<a name="line.377"></a>
+<span class="sourceLineNo">378</span> Path regionDir = new Path(FSUtils.getTableDir(new Path("./"),<a name="line.378"></a>
+<span class="sourceLineNo">379</span> TableName.valueOf(name.getMethodName())), "abcdef");<a name="line.379"></a>
+<span class="sourceLineNo">380</span> Path familyDir = new Path(regionDir, "cf");<a name="line.380"></a>
<span class="sourceLineNo">381</span><a name="line.381"></a>
-<span class="sourceLineNo">382</span> // Keep creating/archiving new files while the cleaner is running in the other thread<a name="line.382"></a>
-<span class="sourceLineNo">383</span> long startTime = System.currentTimeMillis();<a name="line.383"></a>
-<span class="sourceLineNo">384</span> for (long fid = 0; (System.currentTimeMillis() - startTime) < TEST_TIME; ++fid) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span> Path file = new Path(familyDir, String.valueOf(fid));<a name="line.385"></a>
-<span class="sourceLineNo">386</span> Path sourceFile = new Path(rootDir, file);<a name="line.386"></a>
-<span class="sourceLineNo">387</span> Path archiveFile = new Path(archiveDir, file);<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span> fs.createNewFile(sourceFile);<a name="line.389"></a>
-<span class="sourceLineNo">390</span><a name="line.390"></a>
-<span class="sourceLineNo">391</span> try {<a name="line.391"></a>
-<span class="sourceLineNo">392</span> // Try to archive the file<a name="line.392"></a>
-<span class="sourceLineNo">393</span> HFileArchiver.archiveRegion(fs, rootDir,<a name="line.393"></a>
-<span class="sourceLineNo">394</span> sourceRegionDir.getParent(), sourceRegionDir);<a name="line.394"></a>
-<span class="sourceLineNo">395</span><a name="line.395"></a>
-<span class="sourceLineNo">396</span> // The archiver succeded, the file is no longer in the original location<a name="line.396"></a>
-<span class="sourceLineNo">397</span> // but it's in the archive location.<a name="line.397"></a>
-<span class="sourceLineNo">398</span> LOG.debug("hfile=" + fid + " should be in the archive");<a name="line.398"></a>
-<span class="sourceLineNo">399</span> assertTrue(fs.exists(archiveFile));<a name="line.399"></a>
-<span class="sourceLineNo">400</span> assertFalse(fs.exists(sourceFile));<a name="line.400"></a>
-<span class="sourceLineNo">401</span> } catch (IOException e) {<a name="line.401"></a>
-<span class="sourceLineNo">402</span> // The archiver is unable to archive the file. Probably HBASE-7643 race condition.<a name="line.402"></a>
-<span class="sourceLineNo">403</span> // in this case, the file should not be archived, and we should have the file<a name="line.403"></a>
-<span class="sourceLineNo">404</span> // in the original location.<a name="line.404"></a>
-<span class="sourceLineNo">405</span> LOG.debug("hfile=" + fid + " should be in the source location");<a name="line.405"></a>
-<span class="sourceLineNo">406</span> assertFalse(fs.exists(archiveFile));<a name="line.406"></a>
-<span class="sourceLineNo">407</span> assertTrue(fs.exists(sourceFile));<a name="line.407"></a>
-<span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span> // Avoid to have this file in the next run<a name="line.409"></a>
-<span class="sourceLineNo">410</span> fs.delete(sourceFile, false);<a name="line.410"></a>
-<span class="sourceLineNo">411</span> }<a name="line.411"></a>
-<span class="sourceLineNo">412</span> }<a name="line.412"></a>
-<span class="sourceLineNo">413</span> } finally {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> stoppable.stop("test end");<a name="line.414"></a>
-<span class="sourceLineNo">415</span> cleaner.cancel(true);<a name="line.415"></a>
-<span class="sourceLineNo">416</span> choreService.shutdown();<a name="line.416"></a>
-<span class="sourceLineNo">417</span> fs.delete(rootDir, true);<a name="line.417"></a>
-<span class="sourceLineNo">418</span> }<a name="line.418"></a>
-<span class="sourceLineNo">419</span> }<a name="line.419"></a>
-<span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span> private void clearArchiveDirectory() throws IOException {<a name="line.421"></a>
-<span class="sourceLineNo">422</span> UTIL.getTestFileSystem().delete(<a name="line.422"></a>
-<span class="sourceLineNo">423</span> new Path(UTIL.getDefaultRootDirPath(), HConstants.HFILE_ARCHIVE_DIRECTORY), true);<a name="line.423"></a>
-<span class="sourceLineNo">424</span> }<a name="line.424"></a>
-<span class="sourceLineNo">425</span><a name="line.425"></a>
-<span class="sourceLineNo">426</span> /**<a name="line.426"></a>
-<span class="sourceLineNo">427</span> * Get the names of all the files below the given directory<a name="line.427"></a>
-<span class="sourceLineNo">428</span> * @param fs the file system to inspect<a name="line.428"></a>
-<span class="sourceLineNo">429</span> * @param archiveDir the directory in which to look<a name="line.429"></a>
-<span class="sourceLineNo">430</span> * @return a list of all files in the directory and sub-directories<a name="line.430"></a>
-<span class="sourceLineNo">431</span> * @throws IOException<a name="line.431"></a>
-<span class="sourceLineNo">432</span> */<a name="line.432"></a>
-<span class="sourceLineNo">433</span> private List<String> getAllFileNames(final FileSystem fs, Path archiveDir) throws IOException {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> FileStatus[] files = FSUtils.listStatus(fs, archiveDir, new PathFilter() {<a name="line.434"></a>
-<span class="sourceLineNo">435</span> @Override<a name="line.435"></a>
-<span class="sourceLineNo">436</span> public boolean accept(Path p) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> if (p.getName().contains(HConstants.RECOVERED_EDITS_DIR)) {<a name="line.437"></a>
-<span class="sourceLineNo">438</span> return false;<a name="line.438"></a>
-<span class="sourceLineNo">439</span> }<a name="line.439"></a>
-<span class="sourceLineNo">440</span> return true;<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> return recurseOnFiles(fs, files, new ArrayList<>());<a name="line.443"></a>
+<span class="sourceLineNo">382</span> Path sourceRegionDir = new Path(rootDir, regionDir);<a name="line.382"></a>
+<span class="sourceLineNo">383</span> fs.mkdirs(sourceRegionDir);<a name="line.383"></a>
+<span class="sourceLineNo">384</span><a name="line.384"></a>
+<span class="sourceLineNo">385</span> Stoppable stoppable = new StoppableImplementation();<a name="line.385"></a>
+<span class="sourceLineNo">386</span><a name="line.386"></a>
+<span class="sourceLineNo">387</span> // The cleaner should be looping without long pauses to reproduce the race condition.<a name="line.387"></a>
+<span class="sourceLineNo">388</span> HFileCleaner cleaner = getHFileCleaner(stoppable, conf, fs, archiveDir);<a name="line.388"></a>
+<span class="sourceLineNo">389</span> assertNotNull("cleaner should not be null", cleaner);<a name="line.389"></a>
+<span class="sourceLineNo">390</span> try {<a name="line.390"></a>
+<span class="sourceLineNo">391</span> choreService.scheduleChore(cleaner);<a name="line.391"></a>
+<span class="sourceLineNo">392</span> // Keep creating/archiving new files while the cleaner is running in the other thread<a name="line.392"></a>
+<span class="sourceLineNo">393</span> long startTime = System.currentTimeMillis();<a name="line.393"></a>
+<span class="sourceLineNo">394</span> for (long fid = 0; (System.currentTimeMillis() - startTime) < TEST_TIME; ++fid) {<a name="line.394"></a>
+<span class="sourceLineNo">395</span> Path file = new Path(familyDir, String.valueOf(fid));<a name="line.395"></a>
+<span class="sourceLineNo">396</span> Path sourceFile = new Path(rootDir, file);<a name="line.396"></a>
+<span class="sourceLineNo">397</span> Path archiveFile = new Path(archiveDir, file);<a name="line.397"></a>
+<span class="sourceLineNo">398</span><a name="line.398"></a>
+<span class="sourceLineNo">399</span> fs.createNewFile(sourceFile);<a name="line.399"></a>
+<span class="sourceLineNo">400</span><a name="line.400"></a>
+<span class="sourceLineNo">401</span> try {<a name="line.401"></a>
+<span class="sourceLineNo">402</span> // Try to archive the file<a name="line.402"></a>
+<span class="sourceLineNo">403</span> HFileArchiver.archiveRegion(fs, rootDir,<a name="line.403"></a>
+<span class="sourceLineNo">404</span> sourceRegionDir.getParent(), sourceRegionDir);<a name="line.404"></a>
+<span class="sourceLineNo">405</span><a name="line.405"></a>
+<span class="sourceLineNo">406</span> // The archiver succeded, the file is no longer in the original location<a name="line.406"></a>
+<span class="sourceLineNo">407</span> // but it's in the archive location.<a name="line.407"></a>
+<span class="sourceLineNo">408</span> LOG.debug("hfile=" + fid + " should be in the archive");<a name="line.408"></a>
+<span class="sourceLineNo">409</span> assertTrue(fs.exists(archiveFile));<a name="line.409"></a>
+<span class="sourceLineNo">410</span> assertFalse(fs.exists(sourceFile));<a name="line.410"></a>
+<span class="sourceLineNo">411</span> } catch (IOException e) {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> // The archiver is unable to archive the file. Probably HBASE-7643 race condition.<a name="line.412"></a>
+<span class="sourceLineNo">413</span> // in this case, the file should not be archived, and we should have the file<a name="line.413"></a>
+<span class="sourceLineNo">414</span> // in the original location.<a name="line.414"></a>
+<span class="sourceLineNo">415</span> LOG.debug("hfile=" + fid + " should be in the source location");<a name="line.415"></a>
+<span class="sourceLineNo">416</span> assertFalse(fs.exists(archiveFile));<a name="line.416"></a>
+<span class="sourceLineNo">417</span> assertTrue(fs.exists(sourceFile));<a name="line.417"></a>
+<span class="sourceLineNo">418</span><a name="line.418"></a>
+<span class="sourceLineNo">419</span> // Avoid to have this file in the next run<a name="line.419"></a>
+<span class="sourceLineNo">420</span> fs.delete(sourceFile, false);<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">423</span> } finally {<a name="line.423"></a>
+<span class="sourceLineNo">424</span> stoppable.stop("test end");<a name="line.424"></a>
+<span class="sourceLineNo">425</span> cleaner.cancel(true);<a name="line.425"></a>
+<span class="sourceLineNo">426</span> choreService.shutdown();<a name="line.426"></a>
+<span class="sourceLineNo">427</span> fs.delete(rootDir, true);<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><a name="line.430"></a>
+<span class="sourceLineNo">431</span> // Avoid passing a null master to CleanerChore, see HBASE-21175<a name="line.431"></a>
+<span class="sourceLineNo">432</span> private HFileCleaner getHFileCleaner(Stoppable stoppable, Configuration conf,<a name="line.432"></a>
+<span class="sourceLineNo">433</span> FileSystem fs, Path archiveDir) throws IOException {<a name="line.433"></a>
+<span class="sourceLineNo">434</span> Map<String, Object> params = new HashMap<>();<a name="line.434"></a>
+<span class="sourceLineNo">435</span> params.put(HMaster.MASTER, UTIL.getMiniHBaseCluster().getMaster());<a name="line.435"></a>
+<span class="sourceLineNo">436</span> HFileCleaner cleaner = new HFileCleaner(1, stoppable, conf, fs, archiveDir);<a name="line.436"></a>
+<span class="sourceLineNo">437</span> cleaner.init(params);<a name="line.437"></a>
+<span class="sourceLineNo">438</span> return Objects.requireNonNull(cleaner);<a name="line.438"></a>
+<span class="sourceLineNo">439</span> }<a name="line.439"></a>
+<span class="sourceLineNo">440</span><a name="line.440"></a>
+<span class="sourceLineNo">441</span> private void clearArchiveDirectory() throws IOException {<a name="line.441"></a>
+<span class="sourceLineNo">442</span> UTIL.getTestFileSystem().delete(<a name="line.442"></a>
+<span class="sourceLineNo">443</span> new Path(UTIL.getDefaultRootDirPath(), HConstants.HFILE_ARCHIVE_DIRECTORY), true);<a name="line.443"></a>
<span class="sourceLineNo">444</span> }<a name="line.444"></a>
<span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span> /** Recursively lookup all the file names under the file[] array **/<a name="line.446"></a>
-<span class="sourceLineNo">447</span> private List<String> recurseOnFiles(FileSystem fs, FileStatus[] files, List<String> fileNames)<a name="line.447"></a>
-<span class="sourceLineNo">448</span> throws IOException {<a name="line.448"></a>
-<span class="sourceLineNo">449</span> if (files == null || files.length == 0) return fileNames;<a name="line.449"></a>
-<span class="sourceLineNo">450</span><a name="line.450"></a>
-<span class="sourceLineNo">451</span> for (FileStatus file : files) {<a name="line.451"></a>
-<span class="sourceLineNo">452</span> if (file.isDirectory()) {<a name="line.452"></a>
-<span class="sourceLineNo">453</span> recurseOnFiles(fs, FSUtils.listStatus(fs, file.getPath(), null), fileNames);<a name="line.453"></a>
-<span class="sourceLineNo">454</span> } else fileNames.add(file.getPath().getName());<a name="line.454"></a>
-<span class="sourceLineNo">455</span> }<a name="line.455"></a>
-<span class="sourceLineNo">456</span> return fileNames;<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">446</span> /**<a name="line.446"></a>
+<span class="sourceLineNo">447</span> * Get the names of all the files below the given directory<a name="line.447"></a>
+<span class="sourceLineNo">448</span> * @param fs the file system to inspect<a name="line.448"></a>
+<span class="sourceLineNo">449</span> * @param archiveDir the directory in which to look<a name="line.449"></a>
+<span class="sourceLineNo">450</span> * @return a list of all files in the directory and sub-directories<a name="line.450"></a>
+<span class="sourceLineNo">451</span> * @throws java.io.IOException throws IOException in case FS is unavailable<a name="line.451"></a>
+<span class="sourceLineNo">452</span> */<a name="line.452"></a>
+<span class="sourceLineNo">453</span> private List<String> getAllFileNames(final FileSystem fs, Path archiveDir) throws IOException {<a name="line.453"></a>
+<span class="sourceLineNo">454</span> FileStatus[] files = FSUtils.listStatus(fs, archiveDir, new PathFilter() {<a name="line.454"></a>
+<span class="sourceLineNo">455</span> @Override<a name="line.455"></a>
+<span class="sourceLineNo">456</span> public boolean accept(Path p) {<a name="line.456"></a>
+<span class="sourceLineNo">457</span> if (p.getName().contains(HConstants.RECOVERED_EDITS_DIR)) {<a name="line.457"></a>
+<span class="sourceLineNo">458</span> return false;<a name="line.458"></a>
+<span class="sourceLineNo">459</span> }<a name="line.459"></a>
+<span class="sourceLineNo">460</span> return true;<a name="line.460"></a>
+<span class="sourceLineNo">461</span> }<a name="line.461"></a>
+<span class="sourceLineNo">462</span> });<a name="line.462"></a>
+<span class="sourceLineNo">463</span> return recurseOnFiles(fs, files, new ArrayList<>());<a name="line.463"></a>
+<span class="sourceLineNo">464</span> }<a name="line.464"></a>
+<span class="sourceLineNo">465</span><a name="line.465"></a>
+<span class="sourceLineNo">466</span> /** Recursively lookup all the file names under the file[] array **/<a name="line.466"></a>
+<span class="sourceLineNo">467</span> private List<String> recurseOnFiles(FileSystem fs, FileStatus[] files, List<String> fileNames)<a name="line.467"></a>
+<span class="sourceLineNo">468</span> throws IOException {<a name="line.468"></a>
+<span class="sourceLineNo">469</span> if (files == null || files.length == 0) {<a name="line.469"></a>
+<span class="sourceLineNo">470</span> return fileNames;<a name="line.470"></a>
+<span class="sourceLineNo">471</span> }<a name="line.471"></a>
+<span class="sourceLineNo">472</span><a name="line.472"></a>
+<span class="sourceLineNo">473</span> for (FileStatus file : files) {<a name="line.473"></a>
+<span class="sourceLineNo">474</span> if (file.isDirectory()) {<a name="line.474"></a>
+<span class="sourceLineNo">475</span> recurseOnFiles(fs, FSUtils.listStatus(fs, file.getPath(), null), fileNames);<a name="line.475"></a>
+<span class="sourceLineNo">476</span> } else {<a name="line.476"></a>
+<span class="sourceLineNo">477</span> fileNames.add(file.getPath().getName());<a name="line.477"></a>
+<span class="sourceLineNo">478</span> }<a name="line.478"></a>
+<span class="sourceLineNo">479</span> }<a name="line.479"></a>
+<span class="sourceLineNo">480</span> return fileNames;<a name="line.480"></a>
+<span class="sourceLineNo">481</span> }<a name="line.481"></a>
+<span class="sourceLineNo">482</span>}<a name="line.482"></a>