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/04/18 14:46:15 UTC
[03/15] hbase-site git commit: Published site at
f4f2b68238a094d7b1931dc8b7939742ccbb2b57.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/dadf279b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestCleanerChore.NeverDelete.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestCleanerChore.NeverDelete.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestCleanerChore.NeverDelete.html
index fb03488..032358a 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestCleanerChore.NeverDelete.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestCleanerChore.NeverDelete.html
@@ -31,452 +31,500 @@
<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.Random;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.conf.Configuration;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.fs.FSDataOutputStream;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.fs.FileStatus;<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.Stoppable;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.util.StoppableImplementation;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.junit.After;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.junit.Before;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.junit.ClassRule;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.junit.Test;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.junit.experimental.categories.Category;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.mockito.Mockito;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.mockito.invocation.InvocationOnMock;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.mockito.stubbing.Answer;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.slf4j.Logger;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.slf4j.LoggerFactory;<a name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>@Category({MasterTests.class, SmallTests.class})<a name="line.49"></a>
-<span class="sourceLineNo">050</span>public class TestCleanerChore {<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span> @ClassRule<a name="line.52"></a>
-<span class="sourceLineNo">053</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.53"></a>
-<span class="sourceLineNo">054</span> HBaseClassTestRule.forClass(TestCleanerChore.class);<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span> private static final Logger LOG = LoggerFactory.getLogger(TestCleanerChore.class);<a name="line.56"></a>
-<span class="sourceLineNo">057</span> private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span> @Before<a name="line.59"></a>
-<span class="sourceLineNo">060</span> public void setup() throws Exception {<a name="line.60"></a>
-<span class="sourceLineNo">061</span> CleanerChore.initChorePool(UTIL.getConfiguration());<a name="line.61"></a>
-<span class="sourceLineNo">062</span> }<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span> @After<a name="line.64"></a>
-<span class="sourceLineNo">065</span> public void cleanup() throws Exception {<a name="line.65"></a>
-<span class="sourceLineNo">066</span> // delete and recreate the test directory, ensuring a clean test dir between tests<a name="line.66"></a>
-<span class="sourceLineNo">067</span> UTIL.cleanupTestDir();<a name="line.67"></a>
-<span class="sourceLineNo">068</span> }<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span> @Test<a name="line.70"></a>
-<span class="sourceLineNo">071</span> public void testSavesFilesOnRequest() throws Exception {<a name="line.71"></a>
-<span class="sourceLineNo">072</span> Stoppable stop = new StoppableImplementation();<a name="line.72"></a>
-<span class="sourceLineNo">073</span> Configuration conf = UTIL.getConfiguration();<a name="line.73"></a>
-<span class="sourceLineNo">074</span> Path testDir = UTIL.getDataTestDir();<a name="line.74"></a>
-<span class="sourceLineNo">075</span> FileSystem fs = UTIL.getTestFileSystem();<a name="line.75"></a>
-<span class="sourceLineNo">076</span> String confKey = "hbase.test.cleaner.delegates";<a name="line.76"></a>
-<span class="sourceLineNo">077</span> conf.set(confKey, NeverDelete.class.getName());<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span> AllValidPaths chore = new AllValidPaths("test-file-cleaner", stop, conf, fs, testDir, confKey);<a name="line.79"></a>
+<span class="sourceLineNo">026</span>import java.util.concurrent.atomic.AtomicBoolean;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.conf.Configuration;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.fs.FSDataOutputStream;<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.FilterFileSystem;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.fs.Path;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.Stoppable;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.util.StoppableImplementation;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.junit.After;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.junit.Before;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.junit.ClassRule;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.junit.Test;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.junit.experimental.categories.Category;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.mockito.Mockito;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.mockito.invocation.InvocationOnMock;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.mockito.stubbing.Answer;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.slf4j.Logger;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.slf4j.LoggerFactory;<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>@Category({MasterTests.class, SmallTests.class})<a name="line.51"></a>
+<span class="sourceLineNo">052</span>public class TestCleanerChore {<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span> @ClassRule<a name="line.54"></a>
+<span class="sourceLineNo">055</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.55"></a>
+<span class="sourceLineNo">056</span> HBaseClassTestRule.forClass(TestCleanerChore.class);<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span> private static final Logger LOG = LoggerFactory.getLogger(TestCleanerChore.class);<a name="line.58"></a>
+<span class="sourceLineNo">059</span> private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span> @Before<a name="line.61"></a>
+<span class="sourceLineNo">062</span> public void setup() throws Exception {<a name="line.62"></a>
+<span class="sourceLineNo">063</span> CleanerChore.initChorePool(UTIL.getConfiguration());<a name="line.63"></a>
+<span class="sourceLineNo">064</span> }<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span> @After<a name="line.66"></a>
+<span class="sourceLineNo">067</span> public void cleanup() throws Exception {<a name="line.67"></a>
+<span class="sourceLineNo">068</span> // delete and recreate the test directory, ensuring a clean test dir between tests<a name="line.68"></a>
+<span class="sourceLineNo">069</span> UTIL.cleanupTestDir();<a name="line.69"></a>
+<span class="sourceLineNo">070</span> }<a name="line.70"></a>
+<span class="sourceLineNo">071</span><a name="line.71"></a>
+<span class="sourceLineNo">072</span> @Test<a name="line.72"></a>
+<span class="sourceLineNo">073</span> public void testSavesFilesOnRequest() throws Exception {<a name="line.73"></a>
+<span class="sourceLineNo">074</span> Stoppable stop = new StoppableImplementation();<a name="line.74"></a>
+<span class="sourceLineNo">075</span> Configuration conf = UTIL.getConfiguration();<a name="line.75"></a>
+<span class="sourceLineNo">076</span> Path testDir = UTIL.getDataTestDir();<a name="line.76"></a>
+<span class="sourceLineNo">077</span> FileSystem fs = UTIL.getTestFileSystem();<a name="line.77"></a>
+<span class="sourceLineNo">078</span> String confKey = "hbase.test.cleaner.delegates";<a name="line.78"></a>
+<span class="sourceLineNo">079</span> conf.set(confKey, NeverDelete.class.getName());<a name="line.79"></a>
<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span> // create the directory layout in the directory to clean<a name="line.81"></a>
-<span class="sourceLineNo">082</span> Path parent = new Path(testDir, "parent");<a name="line.82"></a>
-<span class="sourceLineNo">083</span> Path file = new Path(parent, "someFile");<a name="line.83"></a>
-<span class="sourceLineNo">084</span> fs.mkdirs(parent);<a name="line.84"></a>
-<span class="sourceLineNo">085</span> // touch a new file<a name="line.85"></a>
-<span class="sourceLineNo">086</span> fs.create(file).close();<a name="line.86"></a>
-<span class="sourceLineNo">087</span> assertTrue("Test file didn't get created.", fs.exists(file));<a name="line.87"></a>
-<span class="sourceLineNo">088</span><a name="line.88"></a>
-<span class="sourceLineNo">089</span> // run the chore<a name="line.89"></a>
-<span class="sourceLineNo">090</span> chore.chore();<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span> // verify all the files got deleted<a name="line.92"></a>
-<span class="sourceLineNo">093</span> assertTrue("File didn't get deleted", fs.exists(file));<a name="line.93"></a>
-<span class="sourceLineNo">094</span> assertTrue("Empty directory didn't get deleted", fs.exists(parent));<a name="line.94"></a>
-<span class="sourceLineNo">095</span> }<a name="line.95"></a>
-<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span> @Test<a name="line.97"></a>
-<span class="sourceLineNo">098</span> public void testDeletesEmptyDirectories() throws Exception {<a name="line.98"></a>
-<span class="sourceLineNo">099</span> Stoppable stop = new StoppableImplementation();<a name="line.99"></a>
-<span class="sourceLineNo">100</span> Configuration conf = UTIL.getConfiguration();<a name="line.100"></a>
-<span class="sourceLineNo">101</span> Path testDir = UTIL.getDataTestDir();<a name="line.101"></a>
-<span class="sourceLineNo">102</span> FileSystem fs = UTIL.getTestFileSystem();<a name="line.102"></a>
-<span class="sourceLineNo">103</span> String confKey = "hbase.test.cleaner.delegates";<a name="line.103"></a>
-<span class="sourceLineNo">104</span> conf.set(confKey, AlwaysDelete.class.getName());<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span> AllValidPaths chore = new AllValidPaths("test-file-cleaner", stop, conf, fs, testDir, confKey);<a name="line.106"></a>
-<span class="sourceLineNo">107</span><a name="line.107"></a>
-<span class="sourceLineNo">108</span> // create the directory layout in the directory to clean<a name="line.108"></a>
-<span class="sourceLineNo">109</span> Path parent = new Path(testDir, "parent");<a name="line.109"></a>
-<span class="sourceLineNo">110</span> Path child = new Path(parent, "child");<a name="line.110"></a>
-<span class="sourceLineNo">111</span> Path emptyChild = new Path(parent, "emptyChild");<a name="line.111"></a>
-<span class="sourceLineNo">112</span> Path file = new Path(child, "someFile");<a name="line.112"></a>
-<span class="sourceLineNo">113</span> fs.mkdirs(child);<a name="line.113"></a>
-<span class="sourceLineNo">114</span> fs.mkdirs(emptyChild);<a name="line.114"></a>
-<span class="sourceLineNo">115</span> // touch a new file<a name="line.115"></a>
-<span class="sourceLineNo">116</span> fs.create(file).close();<a name="line.116"></a>
-<span class="sourceLineNo">117</span> // also create a file in the top level directory<a name="line.117"></a>
-<span class="sourceLineNo">118</span> Path topFile = new Path(testDir, "topFile");<a name="line.118"></a>
-<span class="sourceLineNo">119</span> fs.create(topFile).close();<a name="line.119"></a>
-<span class="sourceLineNo">120</span> assertTrue("Test file didn't get created.", fs.exists(file));<a name="line.120"></a>
-<span class="sourceLineNo">121</span> assertTrue("Test file didn't get created.", fs.exists(topFile));<a name="line.121"></a>
+<span class="sourceLineNo">081</span> AllValidPaths chore = new AllValidPaths("test-file-cleaner", stop, conf, fs, testDir, confKey);<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span> // create the directory layout in the directory to clean<a name="line.83"></a>
+<span class="sourceLineNo">084</span> Path parent = new Path(testDir, "parent");<a name="line.84"></a>
+<span class="sourceLineNo">085</span> Path file = new Path(parent, "someFile");<a name="line.85"></a>
+<span class="sourceLineNo">086</span> fs.mkdirs(parent);<a name="line.86"></a>
+<span class="sourceLineNo">087</span> // touch a new file<a name="line.87"></a>
+<span class="sourceLineNo">088</span> fs.create(file).close();<a name="line.88"></a>
+<span class="sourceLineNo">089</span> assertTrue("Test file didn't get created.", fs.exists(file));<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span> // run the chore<a name="line.91"></a>
+<span class="sourceLineNo">092</span> chore.chore();<a name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span> // verify all the files were preserved<a name="line.94"></a>
+<span class="sourceLineNo">095</span> assertTrue("File shouldn't have been deleted", fs.exists(file));<a name="line.95"></a>
+<span class="sourceLineNo">096</span> assertTrue("directory shouldn't have been deleted", fs.exists(parent));<a name="line.96"></a>
+<span class="sourceLineNo">097</span> }<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span> @Test<a name="line.99"></a>
+<span class="sourceLineNo">100</span> public void retriesIOExceptionInStatus() throws Exception {<a name="line.100"></a>
+<span class="sourceLineNo">101</span> Stoppable stop = new StoppableImplementation();<a name="line.101"></a>
+<span class="sourceLineNo">102</span> Configuration conf = UTIL.getConfiguration();<a name="line.102"></a>
+<span class="sourceLineNo">103</span> Path testDir = UTIL.getDataTestDir();<a name="line.103"></a>
+<span class="sourceLineNo">104</span> FileSystem fs = UTIL.getTestFileSystem();<a name="line.104"></a>
+<span class="sourceLineNo">105</span> String confKey = "hbase.test.cleaner.delegates";<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span> Path child = new Path(testDir, "child");<a name="line.107"></a>
+<span class="sourceLineNo">108</span> Path file = new Path(child, "file");<a name="line.108"></a>
+<span class="sourceLineNo">109</span> fs.mkdirs(child);<a name="line.109"></a>
+<span class="sourceLineNo">110</span> fs.create(file).close();<a name="line.110"></a>
+<span class="sourceLineNo">111</span> assertTrue("test file didn't get created.", fs.exists(file));<a name="line.111"></a>
+<span class="sourceLineNo">112</span> final AtomicBoolean fails = new AtomicBoolean(true);<a name="line.112"></a>
+<span class="sourceLineNo">113</span><a name="line.113"></a>
+<span class="sourceLineNo">114</span> FilterFileSystem filtered = new FilterFileSystem(fs) {<a name="line.114"></a>
+<span class="sourceLineNo">115</span> public FileStatus[] listStatus(Path f) throws IOException {<a name="line.115"></a>
+<span class="sourceLineNo">116</span> if (fails.get()) {<a name="line.116"></a>
+<span class="sourceLineNo">117</span> throw new IOException("whomp whomp.");<a name="line.117"></a>
+<span class="sourceLineNo">118</span> }<a name="line.118"></a>
+<span class="sourceLineNo">119</span> return fs.listStatus(f);<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> // run the chore<a name="line.123"></a>
-<span class="sourceLineNo">124</span> chore.chore();<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span> // verify all the files got deleted<a name="line.126"></a>
-<span class="sourceLineNo">127</span> assertFalse("File didn't get deleted", fs.exists(topFile));<a name="line.127"></a>
-<span class="sourceLineNo">128</span> assertFalse("File didn't get deleted", fs.exists(file));<a name="line.128"></a>
-<span class="sourceLineNo">129</span> assertFalse("Empty directory didn't get deleted", fs.exists(child));<a name="line.129"></a>
-<span class="sourceLineNo">130</span> assertFalse("Empty directory didn't get deleted", fs.exists(parent));<a name="line.130"></a>
-<span class="sourceLineNo">131</span> }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span> /**<a name="line.133"></a>
-<span class="sourceLineNo">134</span> * Test to make sure that we don't attempt to ask the delegate whether or not we should preserve a<a name="line.134"></a>
-<span class="sourceLineNo">135</span> * directory.<a name="line.135"></a>
-<span class="sourceLineNo">136</span> * @throws Exception on failure<a name="line.136"></a>
-<span class="sourceLineNo">137</span> */<a name="line.137"></a>
-<span class="sourceLineNo">138</span> @Test<a name="line.138"></a>
-<span class="sourceLineNo">139</span> public void testDoesNotCheckDirectories() throws Exception {<a name="line.139"></a>
-<span class="sourceLineNo">140</span> Stoppable stop = new StoppableImplementation();<a name="line.140"></a>
-<span class="sourceLineNo">141</span> Configuration conf = UTIL.getConfiguration();<a name="line.141"></a>
-<span class="sourceLineNo">142</span> Path testDir = UTIL.getDataTestDir();<a name="line.142"></a>
-<span class="sourceLineNo">143</span> FileSystem fs = UTIL.getTestFileSystem();<a name="line.143"></a>
-<span class="sourceLineNo">144</span> String confKey = "hbase.test.cleaner.delegates";<a name="line.144"></a>
-<span class="sourceLineNo">145</span> conf.set(confKey, AlwaysDelete.class.getName());<a name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span> AllValidPaths chore = new AllValidPaths("test-file-cleaner", stop, conf, fs, testDir, confKey);<a name="line.147"></a>
-<span class="sourceLineNo">148</span> // spy on the delegate to ensure that we don't check for directories<a name="line.148"></a>
-<span class="sourceLineNo">149</span> AlwaysDelete delegate = (AlwaysDelete) chore.cleanersChain.get(0);<a name="line.149"></a>
-<span class="sourceLineNo">150</span> AlwaysDelete spy = Mockito.spy(delegate);<a name="line.150"></a>
-<span class="sourceLineNo">151</span> chore.cleanersChain.set(0, spy);<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span> // create the directory layout in the directory to clean<a name="line.153"></a>
-<span class="sourceLineNo">154</span> Path parent = new Path(testDir, "parent");<a name="line.154"></a>
-<span class="sourceLineNo">155</span> Path file = new Path(parent, "someFile");<a name="line.155"></a>
-<span class="sourceLineNo">156</span> fs.mkdirs(parent);<a name="line.156"></a>
-<span class="sourceLineNo">157</span> assertTrue("Test parent didn't get created.", fs.exists(parent));<a name="line.157"></a>
-<span class="sourceLineNo">158</span> // touch a new file<a name="line.158"></a>
-<span class="sourceLineNo">159</span> fs.create(file).close();<a name="line.159"></a>
-<span class="sourceLineNo">160</span> assertTrue("Test file didn't get created.", fs.exists(file));<a name="line.160"></a>
-<span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span> FileStatus fStat = fs.getFileStatus(parent);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> chore.chore();<a name="line.163"></a>
-<span class="sourceLineNo">164</span> // make sure we never checked the directory<a name="line.164"></a>
-<span class="sourceLineNo">165</span> Mockito.verify(spy, Mockito.never()).isFileDeletable(fStat);<a name="line.165"></a>
-<span class="sourceLineNo">166</span> Mockito.reset(spy);<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<a name="line.169"></a>
-<span class="sourceLineNo">170</span> public void testStoppedCleanerDoesNotDeleteFiles() throws Exception {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> Stoppable stop = new StoppableImplementation();<a name="line.171"></a>
-<span class="sourceLineNo">172</span> Configuration conf = UTIL.getConfiguration();<a name="line.172"></a>
-<span class="sourceLineNo">173</span> Path testDir = UTIL.getDataTestDir();<a name="line.173"></a>
-<span class="sourceLineNo">174</span> FileSystem fs = UTIL.getTestFileSystem();<a name="line.174"></a>
-<span class="sourceLineNo">175</span> String confKey = "hbase.test.cleaner.delegates";<a name="line.175"></a>
-<span class="sourceLineNo">176</span> conf.set(confKey, AlwaysDelete.class.getName());<a name="line.176"></a>
-<span class="sourceLineNo">177</span><a name="line.177"></a>
-<span class="sourceLineNo">178</span> AllValidPaths chore = new AllValidPaths("test-file-cleaner", stop, conf, fs, testDir, confKey);<a name="line.178"></a>
-<span class="sourceLineNo">179</span><a name="line.179"></a>
-<span class="sourceLineNo">180</span> // also create a file in the top level directory<a name="line.180"></a>
-<span class="sourceLineNo">181</span> Path topFile = new Path(testDir, "topFile");<a name="line.181"></a>
-<span class="sourceLineNo">182</span> fs.create(topFile).close();<a name="line.182"></a>
-<span class="sourceLineNo">183</span> assertTrue("Test file didn't get created.", fs.exists(topFile));<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span> // stop the chore<a name="line.185"></a>
-<span class="sourceLineNo">186</span> stop.stop("testing stop");<a name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span> // run the chore<a name="line.188"></a>
-<span class="sourceLineNo">189</span> chore.chore();<a name="line.189"></a>
-<span class="sourceLineNo">190</span><a name="line.190"></a>
-<span class="sourceLineNo">191</span> // test that the file still exists<a name="line.191"></a>
-<span class="sourceLineNo">192</span> assertTrue("File got deleted while chore was stopped", fs.exists(topFile));<a name="line.192"></a>
-<span class="sourceLineNo">193</span> }<a name="line.193"></a>
+<span class="sourceLineNo">123</span> AllValidPaths chore = new AllValidPaths("test-retry-ioe", stop, conf, filtered, testDir, confKey);<a name="line.123"></a>
+<span class="sourceLineNo">124</span><a name="line.124"></a>
+<span class="sourceLineNo">125</span> // trouble talking to the filesystem<a name="line.125"></a>
+<span class="sourceLineNo">126</span> Boolean result = chore.runCleaner();<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span> // verify that it couldn't clean the files.<a name="line.128"></a>
+<span class="sourceLineNo">129</span> assertTrue("test rig failed to inject failure.", fs.exists(file));<a name="line.129"></a>
+<span class="sourceLineNo">130</span> assertTrue("test rig failed to inject failure.", fs.exists(child));<a name="line.130"></a>
+<span class="sourceLineNo">131</span> // and verify that it accurately reported the failure.<a name="line.131"></a>
+<span class="sourceLineNo">132</span> assertFalse("chore should report that it failed.", result);<a name="line.132"></a>
+<span class="sourceLineNo">133</span><a name="line.133"></a>
+<span class="sourceLineNo">134</span> // filesystem is back<a name="line.134"></a>
+<span class="sourceLineNo">135</span> fails.set(false);<a name="line.135"></a>
+<span class="sourceLineNo">136</span> result = chore.runCleaner();<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span> // verify everything is gone.<a name="line.138"></a>
+<span class="sourceLineNo">139</span> assertFalse("file should have been destroyed.", fs.exists(file));<a name="line.139"></a>
+<span class="sourceLineNo">140</span> assertFalse("directory should have been destroyed.", fs.exists(child));<a name="line.140"></a>
+<span class="sourceLineNo">141</span> // and verify that it accurately reported success.<a name="line.141"></a>
+<span class="sourceLineNo">142</span> assertTrue("chore should claim it succeeded.", result);<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> @Test<a name="line.145"></a>
+<span class="sourceLineNo">146</span> public void testDeletesEmptyDirectories() throws Exception {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> Stoppable stop = new StoppableImplementation();<a name="line.147"></a>
+<span class="sourceLineNo">148</span> Configuration conf = UTIL.getConfiguration();<a name="line.148"></a>
+<span class="sourceLineNo">149</span> Path testDir = UTIL.getDataTestDir();<a name="line.149"></a>
+<span class="sourceLineNo">150</span> FileSystem fs = UTIL.getTestFileSystem();<a name="line.150"></a>
+<span class="sourceLineNo">151</span> String confKey = "hbase.test.cleaner.delegates";<a name="line.151"></a>
+<span class="sourceLineNo">152</span> conf.set(confKey, AlwaysDelete.class.getName());<a name="line.152"></a>
+<span class="sourceLineNo">153</span><a name="line.153"></a>
+<span class="sourceLineNo">154</span> AllValidPaths chore = new AllValidPaths("test-file-cleaner", stop, conf, fs, testDir, confKey);<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span> // create the directory layout in the directory to clean<a name="line.156"></a>
+<span class="sourceLineNo">157</span> Path parent = new Path(testDir, "parent");<a name="line.157"></a>
+<span class="sourceLineNo">158</span> Path child = new Path(parent, "child");<a name="line.158"></a>
+<span class="sourceLineNo">159</span> Path emptyChild = new Path(parent, "emptyChild");<a name="line.159"></a>
+<span class="sourceLineNo">160</span> Path file = new Path(child, "someFile");<a name="line.160"></a>
+<span class="sourceLineNo">161</span> fs.mkdirs(child);<a name="line.161"></a>
+<span class="sourceLineNo">162</span> fs.mkdirs(emptyChild);<a name="line.162"></a>
+<span class="sourceLineNo">163</span> // touch a new file<a name="line.163"></a>
+<span class="sourceLineNo">164</span> fs.create(file).close();<a name="line.164"></a>
+<span class="sourceLineNo">165</span> // also create a file in the top level directory<a name="line.165"></a>
+<span class="sourceLineNo">166</span> Path topFile = new Path(testDir, "topFile");<a name="line.166"></a>
+<span class="sourceLineNo">167</span> fs.create(topFile).close();<a name="line.167"></a>
+<span class="sourceLineNo">168</span> assertTrue("Test file didn't get created.", fs.exists(file));<a name="line.168"></a>
+<span class="sourceLineNo">169</span> assertTrue("Test file didn't get created.", fs.exists(topFile));<a name="line.169"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span> // run the chore<a name="line.171"></a>
+<span class="sourceLineNo">172</span> chore.chore();<a name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span> // verify all the files got deleted<a name="line.174"></a>
+<span class="sourceLineNo">175</span> assertFalse("File didn't get deleted", fs.exists(topFile));<a name="line.175"></a>
+<span class="sourceLineNo">176</span> assertFalse("File didn't get deleted", fs.exists(file));<a name="line.176"></a>
+<span class="sourceLineNo">177</span> assertFalse("Empty directory didn't get deleted", fs.exists(child));<a name="line.177"></a>
+<span class="sourceLineNo">178</span> assertFalse("Empty directory didn't get deleted", fs.exists(parent));<a name="line.178"></a>
+<span class="sourceLineNo">179</span> }<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span> /**<a name="line.181"></a>
+<span class="sourceLineNo">182</span> * Test to make sure that we don't attempt to ask the delegate whether or not we should preserve a<a name="line.182"></a>
+<span class="sourceLineNo">183</span> * directory.<a name="line.183"></a>
+<span class="sourceLineNo">184</span> * @throws Exception on failure<a name="line.184"></a>
+<span class="sourceLineNo">185</span> */<a name="line.185"></a>
+<span class="sourceLineNo">186</span> @Test<a name="line.186"></a>
+<span class="sourceLineNo">187</span> public void testDoesNotCheckDirectories() throws Exception {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> Stoppable stop = new StoppableImplementation();<a name="line.188"></a>
+<span class="sourceLineNo">189</span> Configuration conf = UTIL.getConfiguration();<a name="line.189"></a>
+<span class="sourceLineNo">190</span> Path testDir = UTIL.getDataTestDir();<a name="line.190"></a>
+<span class="sourceLineNo">191</span> FileSystem fs = UTIL.getTestFileSystem();<a name="line.191"></a>
+<span class="sourceLineNo">192</span> String confKey = "hbase.test.cleaner.delegates";<a name="line.192"></a>
+<span class="sourceLineNo">193</span> conf.set(confKey, AlwaysDelete.class.getName());<a name="line.193"></a>
<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span> /**<a name="line.195"></a>
-<span class="sourceLineNo">196</span> * While cleaning a directory, all the files in the directory may be deleted, but there may be<a name="line.196"></a>
-<span class="sourceLineNo">197</span> * another file added, in which case the directory shouldn't be deleted.<a name="line.197"></a>
-<span class="sourceLineNo">198</span> * @throws IOException on failure<a name="line.198"></a>
-<span class="sourceLineNo">199</span> */<a name="line.199"></a>
-<span class="sourceLineNo">200</span> @Test<a name="line.200"></a>
-<span class="sourceLineNo">201</span> public void testCleanerDoesNotDeleteDirectoryWithLateAddedFiles() throws IOException {<a name="line.201"></a>
-<span class="sourceLineNo">202</span> Stoppable stop = new StoppableImplementation();<a name="line.202"></a>
-<span class="sourceLineNo">203</span> Configuration conf = UTIL.getConfiguration();<a name="line.203"></a>
-<span class="sourceLineNo">204</span> final Path testDir = UTIL.getDataTestDir();<a name="line.204"></a>
-<span class="sourceLineNo">205</span> final FileSystem fs = UTIL.getTestFileSystem();<a name="line.205"></a>
-<span class="sourceLineNo">206</span> String confKey = "hbase.test.cleaner.delegates";<a name="line.206"></a>
-<span class="sourceLineNo">207</span> conf.set(confKey, AlwaysDelete.class.getName());<a name="line.207"></a>
-<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span> AllValidPaths chore = new AllValidPaths("test-file-cleaner", stop, conf, fs, testDir, confKey);<a name="line.209"></a>
-<span class="sourceLineNo">210</span> // spy on the delegate to ensure that we don't check for directories<a name="line.210"></a>
-<span class="sourceLineNo">211</span> AlwaysDelete delegate = (AlwaysDelete) chore.cleanersChain.get(0);<a name="line.211"></a>
-<span class="sourceLineNo">212</span> AlwaysDelete spy = Mockito.spy(delegate);<a name="line.212"></a>
-<span class="sourceLineNo">213</span> chore.cleanersChain.set(0, spy);<a name="line.213"></a>
-<span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span> // create the directory layout in the directory to clean<a name="line.215"></a>
-<span class="sourceLineNo">216</span> final Path parent = new Path(testDir, "parent");<a name="line.216"></a>
-<span class="sourceLineNo">217</span> Path file = new Path(parent, "someFile");<a name="line.217"></a>
-<span class="sourceLineNo">218</span> fs.mkdirs(parent);<a name="line.218"></a>
-<span class="sourceLineNo">219</span> // touch a new file<a name="line.219"></a>
-<span class="sourceLineNo">220</span> fs.create(file).close();<a name="line.220"></a>
-<span class="sourceLineNo">221</span> assertTrue("Test file didn't get created.", fs.exists(file));<a name="line.221"></a>
-<span class="sourceLineNo">222</span> final Path addedFile = new Path(parent, "addedFile");<a name="line.222"></a>
-<span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span> // when we attempt to delete the original file, add another file in the same directory<a name="line.224"></a>
-<span class="sourceLineNo">225</span> Mockito.doAnswer(new Answer<Boolean>() {<a name="line.225"></a>
-<span class="sourceLineNo">226</span> @Override<a name="line.226"></a>
-<span class="sourceLineNo">227</span> public Boolean answer(InvocationOnMock invocation) throws Throwable {<a name="line.227"></a>
-<span class="sourceLineNo">228</span> fs.create(addedFile).close();<a name="line.228"></a>
-<span class="sourceLineNo">229</span> FSUtils.logFileSystemState(fs, testDir, LOG);<a name="line.229"></a>
-<span class="sourceLineNo">230</span> return (Boolean) invocation.callRealMethod();<a name="line.230"></a>
-<span class="sourceLineNo">231</span> }<a name="line.231"></a>
-<span class="sourceLineNo">232</span> }).when(spy).isFileDeletable(Mockito.any());<a name="line.232"></a>
-<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span> // run the chore<a name="line.234"></a>
-<span class="sourceLineNo">235</span> chore.chore();<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span> // make sure all the directories + added file exist, but the original file is deleted<a name="line.237"></a>
-<span class="sourceLineNo">238</span> assertTrue("Added file unexpectedly deleted", fs.exists(addedFile));<a name="line.238"></a>
-<span class="sourceLineNo">239</span> assertTrue("Parent directory deleted unexpectedly", fs.exists(parent));<a name="line.239"></a>
-<span class="sourceLineNo">240</span> assertFalse("Original file unexpectedly retained", fs.exists(file));<a name="line.240"></a>
-<span class="sourceLineNo">241</span> Mockito.verify(spy, Mockito.times(1)).isFileDeletable(Mockito.any());<a name="line.241"></a>
-<span class="sourceLineNo">242</span> Mockito.reset(spy);<a name="line.242"></a>
-<span class="sourceLineNo">243</span> }<a name="line.243"></a>
-<span class="sourceLineNo">244</span><a name="line.244"></a>
-<span class="sourceLineNo">245</span> /**<a name="line.245"></a>
-<span class="sourceLineNo">246</span> * The cleaner runs in a loop, where it first checks to see all the files under a directory can be<a name="line.246"></a>
-<span class="sourceLineNo">247</span> * deleted. If they all can, then we try to delete the directory. However, a file may be added<a name="line.247"></a>
-<span class="sourceLineNo">248</span> * that directory to after the original check. This ensures that we don't accidentally delete that<a name="line.248"></a>
-<span class="sourceLineNo">249</span> * directory on and don't get spurious IOExceptions.<a name="line.249"></a>
-<span class="sourceLineNo">250</span> * <p><a name="line.250"></a>
-<span class="sourceLineNo">251</span> * This was from HBASE-7465.<a name="line.251"></a>
-<span class="sourceLineNo">252</span> * @throws Exception on failure<a name="line.252"></a>
-<span class="sourceLineNo">253</span> */<a name="line.253"></a>
-<span class="sourceLineNo">254</span> @Test<a name="line.254"></a>
-<span class="sourceLineNo">255</span> public void testNoExceptionFromDirectoryWithRacyChildren() throws Exception {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> Stoppable stop = new StoppableImplementation();<a name="line.256"></a>
-<span class="sourceLineNo">257</span> // need to use a localutil to not break the rest of the test that runs on the local FS, which<a name="line.257"></a>
-<span class="sourceLineNo">258</span> // gets hosed when we start to use a minicluster.<a name="line.258"></a>
-<span class="sourceLineNo">259</span> HBaseTestingUtility localUtil = new HBaseTestingUtility();<a name="line.259"></a>
-<span class="sourceLineNo">260</span> Configuration conf = localUtil.getConfiguration();<a name="line.260"></a>
-<span class="sourceLineNo">261</span> final Path testDir = UTIL.getDataTestDir();<a name="line.261"></a>
-<span class="sourceLineNo">262</span> final FileSystem fs = UTIL.getTestFileSystem();<a name="line.262"></a>
-<span class="sourceLineNo">263</span> LOG.debug("Writing test data to: " + testDir);<a name="line.263"></a>
-<span class="sourceLineNo">264</span> String confKey = "hbase.test.cleaner.delegates";<a name="line.264"></a>
-<span class="sourceLineNo">265</span> conf.set(confKey, AlwaysDelete.class.getName());<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span> AllValidPaths chore = new AllValidPaths("test-file-cleaner", stop, conf, fs, testDir, confKey);<a name="line.267"></a>
-<span class="sourceLineNo">268</span> // spy on the delegate to ensure that we don't check for directories<a name="line.268"></a>
-<span class="sourceLineNo">269</span> AlwaysDelete delegate = (AlwaysDelete) chore.cleanersChain.get(0);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> AlwaysDelete spy = Mockito.spy(delegate);<a name="line.270"></a>
-<span class="sourceLineNo">271</span> chore.cleanersChain.set(0, spy);<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span> // create the directory layout in the directory to clean<a name="line.273"></a>
-<span class="sourceLineNo">274</span> final Path parent = new Path(testDir, "parent");<a name="line.274"></a>
-<span class="sourceLineNo">275</span> Path file = new Path(parent, "someFile");<a name="line.275"></a>
-<span class="sourceLineNo">276</span> fs.mkdirs(parent);<a name="line.276"></a>
-<span class="sourceLineNo">277</span> // touch a new file<a name="line.277"></a>
-<span class="sourceLineNo">278</span> fs.create(file).close();<a name="line.278"></a>
-<span class="sourceLineNo">279</span> assertTrue("Test file didn't get created.", fs.exists(file));<a name="line.279"></a>
-<span class="sourceLineNo">280</span> final Path racyFile = new Path(parent, "addedFile");<a name="line.280"></a>
+<span class="sourceLineNo">195</span> AllValidPaths chore = new AllValidPaths("test-file-cleaner", stop, conf, fs, testDir, confKey);<a name="line.195"></a>
+<span class="sourceLineNo">196</span> // spy on the delegate to ensure that we don't check for directories<a name="line.196"></a>
+<span class="sourceLineNo">197</span> AlwaysDelete delegate = (AlwaysDelete) chore.cleanersChain.get(0);<a name="line.197"></a>
+<span class="sourceLineNo">198</span> AlwaysDelete spy = Mockito.spy(delegate);<a name="line.198"></a>
+<span class="sourceLineNo">199</span> chore.cleanersChain.set(0, spy);<a name="line.199"></a>
+<span class="sourceLineNo">200</span><a name="line.200"></a>
+<span class="sourceLineNo">201</span> // create the directory layout in the directory to clean<a name="line.201"></a>
+<span class="sourceLineNo">202</span> Path parent = new Path(testDir, "parent");<a name="line.202"></a>
+<span class="sourceLineNo">203</span> Path file = new Path(parent, "someFile");<a name="line.203"></a>
+<span class="sourceLineNo">204</span> fs.mkdirs(parent);<a name="line.204"></a>
+<span class="sourceLineNo">205</span> assertTrue("Test parent didn't get created.", fs.exists(parent));<a name="line.205"></a>
+<span class="sourceLineNo">206</span> // touch a new file<a name="line.206"></a>
+<span class="sourceLineNo">207</span> fs.create(file).close();<a name="line.207"></a>
+<span class="sourceLineNo">208</span> assertTrue("Test file didn't get created.", fs.exists(file));<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span> FileStatus fStat = fs.getFileStatus(parent);<a name="line.210"></a>
+<span class="sourceLineNo">211</span> chore.chore();<a name="line.211"></a>
+<span class="sourceLineNo">212</span> // make sure we never checked the directory<a name="line.212"></a>
+<span class="sourceLineNo">213</span> Mockito.verify(spy, Mockito.never()).isFileDeletable(fStat);<a name="line.213"></a>
+<span class="sourceLineNo">214</span> Mockito.reset(spy);<a name="line.214"></a>
+<span class="sourceLineNo">215</span> }<a name="line.215"></a>
+<span class="sourceLineNo">216</span><a name="line.216"></a>
+<span class="sourceLineNo">217</span> @Test<a name="line.217"></a>
+<span class="sourceLineNo">218</span> public void testStoppedCleanerDoesNotDeleteFiles() throws Exception {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> Stoppable stop = new StoppableImplementation();<a name="line.219"></a>
+<span class="sourceLineNo">220</span> Configuration conf = UTIL.getConfiguration();<a name="line.220"></a>
+<span class="sourceLineNo">221</span> Path testDir = UTIL.getDataTestDir();<a name="line.221"></a>
+<span class="sourceLineNo">222</span> FileSystem fs = UTIL.getTestFileSystem();<a name="line.222"></a>
+<span class="sourceLineNo">223</span> String confKey = "hbase.test.cleaner.delegates";<a name="line.223"></a>
+<span class="sourceLineNo">224</span> conf.set(confKey, AlwaysDelete.class.getName());<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> AllValidPaths chore = new AllValidPaths("test-file-cleaner", stop, conf, fs, testDir, confKey);<a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span> // also create a file in the top level directory<a name="line.228"></a>
+<span class="sourceLineNo">229</span> Path topFile = new Path(testDir, "topFile");<a name="line.229"></a>
+<span class="sourceLineNo">230</span> fs.create(topFile).close();<a name="line.230"></a>
+<span class="sourceLineNo">231</span> assertTrue("Test file didn't get created.", fs.exists(topFile));<a name="line.231"></a>
+<span class="sourceLineNo">232</span><a name="line.232"></a>
+<span class="sourceLineNo">233</span> // stop the chore<a name="line.233"></a>
+<span class="sourceLineNo">234</span> stop.stop("testing stop");<a name="line.234"></a>
+<span class="sourceLineNo">235</span><a name="line.235"></a>
+<span class="sourceLineNo">236</span> // run the chore<a name="line.236"></a>
+<span class="sourceLineNo">237</span> chore.chore();<a name="line.237"></a>
+<span class="sourceLineNo">238</span><a name="line.238"></a>
+<span class="sourceLineNo">239</span> // test that the file still exists<a name="line.239"></a>
+<span class="sourceLineNo">240</span> assertTrue("File got deleted while chore was stopped", fs.exists(topFile));<a name="line.240"></a>
+<span class="sourceLineNo">241</span> }<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span> /**<a name="line.243"></a>
+<span class="sourceLineNo">244</span> * While cleaning a directory, all the files in the directory may be deleted, but there may be<a name="line.244"></a>
+<span class="sourceLineNo">245</span> * another file added, in which case the directory shouldn't be deleted.<a name="line.245"></a>
+<span class="sourceLineNo">246</span> * @throws IOException on failure<a name="line.246"></a>
+<span class="sourceLineNo">247</span> */<a name="line.247"></a>
+<span class="sourceLineNo">248</span> @Test<a name="line.248"></a>
+<span class="sourceLineNo">249</span> public void testCleanerDoesNotDeleteDirectoryWithLateAddedFiles() throws IOException {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> Stoppable stop = new StoppableImplementation();<a name="line.250"></a>
+<span class="sourceLineNo">251</span> Configuration conf = UTIL.getConfiguration();<a name="line.251"></a>
+<span class="sourceLineNo">252</span> final Path testDir = UTIL.getDataTestDir();<a name="line.252"></a>
+<span class="sourceLineNo">253</span> final FileSystem fs = UTIL.getTestFileSystem();<a name="line.253"></a>
+<span class="sourceLineNo">254</span> String confKey = "hbase.test.cleaner.delegates";<a name="line.254"></a>
+<span class="sourceLineNo">255</span> conf.set(confKey, AlwaysDelete.class.getName());<a name="line.255"></a>
+<span class="sourceLineNo">256</span><a name="line.256"></a>
+<span class="sourceLineNo">257</span> AllValidPaths chore = new AllValidPaths("test-file-cleaner", stop, conf, fs, testDir, confKey);<a name="line.257"></a>
+<span class="sourceLineNo">258</span> // spy on the delegate to ensure that we don't check for directories<a name="line.258"></a>
+<span class="sourceLineNo">259</span> AlwaysDelete delegate = (AlwaysDelete) chore.cleanersChain.get(0);<a name="line.259"></a>
+<span class="sourceLineNo">260</span> AlwaysDelete spy = Mockito.spy(delegate);<a name="line.260"></a>
+<span class="sourceLineNo">261</span> chore.cleanersChain.set(0, spy);<a name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span> // create the directory layout in the directory to clean<a name="line.263"></a>
+<span class="sourceLineNo">264</span> final Path parent = new Path(testDir, "parent");<a name="line.264"></a>
+<span class="sourceLineNo">265</span> Path file = new Path(parent, "someFile");<a name="line.265"></a>
+<span class="sourceLineNo">266</span> fs.mkdirs(parent);<a name="line.266"></a>
+<span class="sourceLineNo">267</span> // touch a new file<a name="line.267"></a>
+<span class="sourceLineNo">268</span> fs.create(file).close();<a name="line.268"></a>
+<span class="sourceLineNo">269</span> assertTrue("Test file didn't get created.", fs.exists(file));<a name="line.269"></a>
+<span class="sourceLineNo">270</span> final Path addedFile = new Path(parent, "addedFile");<a name="line.270"></a>
+<span class="sourceLineNo">271</span><a name="line.271"></a>
+<span class="sourceLineNo">272</span> // when we attempt to delete the original file, add another file in the same directory<a name="line.272"></a>
+<span class="sourceLineNo">273</span> Mockito.doAnswer(new Answer<Boolean>() {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> @Override<a name="line.274"></a>
+<span class="sourceLineNo">275</span> public Boolean answer(InvocationOnMock invocation) throws Throwable {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> fs.create(addedFile).close();<a name="line.276"></a>
+<span class="sourceLineNo">277</span> FSUtils.logFileSystemState(fs, testDir, LOG);<a name="line.277"></a>
+<span class="sourceLineNo">278</span> return (Boolean) invocation.callRealMethod();<a name="line.278"></a>
+<span class="sourceLineNo">279</span> }<a name="line.279"></a>
+<span class="sourceLineNo">280</span> }).when(spy).isFileDeletable(Mockito.any());<a name="line.280"></a>
<span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span> // when we attempt to delete the original file, add another file in the same directory<a name="line.282"></a>
-<span class="sourceLineNo">283</span> Mockito.doAnswer(new Answer<Boolean>() {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> @Override<a name="line.284"></a>
-<span class="sourceLineNo">285</span> public Boolean answer(InvocationOnMock invocation) throws Throwable {<a name="line.285"></a>
-<span class="sourceLineNo">286</span> fs.create(racyFile).close();<a name="line.286"></a>
-<span class="sourceLineNo">287</span> FSUtils.logFileSystemState(fs, testDir, LOG);<a name="line.287"></a>
-<span class="sourceLineNo">288</span> return (Boolean) invocation.callRealMethod();<a name="line.288"></a>
-<span class="sourceLineNo">289</span> }<a name="line.289"></a>
-<span class="sourceLineNo">290</span> }).when(spy).isFileDeletable(Mockito.any());<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span> // run the chore<a name="line.292"></a>
-<span class="sourceLineNo">293</span> chore.chore();<a name="line.293"></a>
-<span class="sourceLineNo">294</span><a name="line.294"></a>
-<span class="sourceLineNo">295</span> // make sure all the directories + added file exist, but the original file is deleted<a name="line.295"></a>
-<span class="sourceLineNo">296</span> assertTrue("Added file unexpectedly deleted", fs.exists(racyFile));<a name="line.296"></a>
-<span class="sourceLineNo">297</span> assertTrue("Parent directory deleted unexpectedly", fs.exists(parent));<a name="line.297"></a>
-<span class="sourceLineNo">298</span> assertFalse("Original file unexpectedly retained", fs.exists(file));<a name="line.298"></a>
-<span class="sourceLineNo">299</span> Mockito.verify(spy, Mockito.times(1)).isFileDeletable(Mockito.any());<a name="line.299"></a>
-<span class="sourceLineNo">300</span> }<a name="line.300"></a>
-<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">282</span> // run the chore<a name="line.282"></a>
+<span class="sourceLineNo">283</span> chore.chore();<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span> // make sure all the directories + added file exist, but the original file is deleted<a name="line.285"></a>
+<span class="sourceLineNo">286</span> assertTrue("Added file unexpectedly deleted", fs.exists(addedFile));<a name="line.286"></a>
+<span class="sourceLineNo">287</span> assertTrue("Parent directory deleted unexpectedly", fs.exists(parent));<a name="line.287"></a>
+<span class="sourceLineNo">288</span> assertFalse("Original file unexpectedly retained", fs.exists(file));<a name="line.288"></a>
+<span class="sourceLineNo">289</span> Mockito.verify(spy, Mockito.times(1)).isFileDeletable(Mockito.any());<a name="line.289"></a>
+<span class="sourceLineNo">290</span> Mockito.reset(spy);<a name="line.290"></a>
+<span class="sourceLineNo">291</span> }<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span> /**<a name="line.293"></a>
+<span class="sourceLineNo">294</span> * The cleaner runs in a loop, where it first checks to see all the files under a directory can be<a name="line.294"></a>
+<span class="sourceLineNo">295</span> * deleted. If they all can, then we try to delete the directory. However, a file may be added<a name="line.295"></a>
+<span class="sourceLineNo">296</span> * that directory to after the original check. This ensures that we don't accidentally delete that<a name="line.296"></a>
+<span class="sourceLineNo">297</span> * directory on and don't get spurious IOExceptions.<a name="line.297"></a>
+<span class="sourceLineNo">298</span> * <p><a name="line.298"></a>
+<span class="sourceLineNo">299</span> * This was from HBASE-7465.<a name="line.299"></a>
+<span class="sourceLineNo">300</span> * @throws Exception on failure<a name="line.300"></a>
+<span class="sourceLineNo">301</span> */<a name="line.301"></a>
<span class="sourceLineNo">302</span> @Test<a name="line.302"></a>
-<span class="sourceLineNo">303</span> public void testDeleteFileWithCleanerEnabled() throws Exception {<a name="line.303"></a>
+<span class="sourceLineNo">303</span> public void testNoExceptionFromDirectoryWithRacyChildren() throws Exception {<a name="line.303"></a>
<span class="sourceLineNo">304</span> Stoppable stop = new StoppableImplementation();<a name="line.304"></a>
-<span class="sourceLineNo">305</span> Configuration conf = UTIL.getConfiguration();<a name="line.305"></a>
-<span class="sourceLineNo">306</span> Path testDir = UTIL.getDataTestDir();<a name="line.306"></a>
-<span class="sourceLineNo">307</span> FileSystem fs = UTIL.getTestFileSystem();<a name="line.307"></a>
-<span class="sourceLineNo">308</span> String confKey = "hbase.test.cleaner.delegates";<a name="line.308"></a>
-<span class="sourceLineNo">309</span> conf.set(confKey, AlwaysDelete.class.getName());<a name="line.309"></a>
-<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span> AllValidPaths chore = new AllValidPaths("test-file-cleaner", stop, conf, fs, testDir, confKey);<a name="line.311"></a>
-<span class="sourceLineNo">312</span><a name="line.312"></a>
-<span class="sourceLineNo">313</span> // Enable cleaner<a name="line.313"></a>
-<span class="sourceLineNo">314</span> chore.setEnabled(true);<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span> // create the directory layout in the directory to clean<a name="line.316"></a>
-<span class="sourceLineNo">317</span> Path parent = new Path(testDir, "parent");<a name="line.317"></a>
-<span class="sourceLineNo">318</span> Path child = new Path(parent, "child");<a name="line.318"></a>
-<span class="sourceLineNo">319</span> Path file = new Path(child, "someFile");<a name="line.319"></a>
-<span class="sourceLineNo">320</span> fs.mkdirs(child);<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> // touch a new file<a name="line.322"></a>
-<span class="sourceLineNo">323</span> fs.create(file).close();<a name="line.323"></a>
-<span class="sourceLineNo">324</span> assertTrue("Test file didn't get created.", fs.exists(file));<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span> // run the chore<a name="line.326"></a>
-<span class="sourceLineNo">327</span> chore.chore();<a name="line.327"></a>
-<span class="sourceLineNo">328</span><a name="line.328"></a>
-<span class="sourceLineNo">329</span> // verify all the files got deleted<a name="line.329"></a>
-<span class="sourceLineNo">330</span> assertFalse("File didn't get deleted", fs.exists(file));<a name="line.330"></a>
-<span class="sourceLineNo">331</span> assertFalse("Empty directory didn't get deleted", fs.exists(child));<a name="line.331"></a>
-<span class="sourceLineNo">332</span> assertFalse("Empty directory didn't get deleted", fs.exists(parent));<a name="line.332"></a>
-<span class="sourceLineNo">333</span> }<a name="line.333"></a>
-<span class="sourceLineNo">334</span><a name="line.334"></a>
-<span class="sourceLineNo">335</span> @Test<a name="line.335"></a>
-<span class="sourceLineNo">336</span> public void testDeleteFileWithCleanerDisabled() throws Exception {<a name="line.336"></a>
-<span class="sourceLineNo">337</span> Stoppable stop = new StoppableImplementation();<a name="line.337"></a>
-<span class="sourceLineNo">338</span> Configuration conf = UTIL.getConfiguration();<a name="line.338"></a>
-<span class="sourceLineNo">339</span> Path testDir = UTIL.getDataTestDir();<a name="line.339"></a>
-<span class="sourceLineNo">340</span> FileSystem fs = UTIL.getTestFileSystem();<a name="line.340"></a>
-<span class="sourceLineNo">341</span> String confKey = "hbase.test.cleaner.delegates";<a name="line.341"></a>
-<span class="sourceLineNo">342</span> conf.set(confKey, AlwaysDelete.class.getName());<a name="line.342"></a>
-<span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span> AllValidPaths chore = new AllValidPaths("test-file-cleaner", stop, conf, fs, testDir, confKey);<a name="line.344"></a>
-<span class="sourceLineNo">345</span><a name="line.345"></a>
-<span class="sourceLineNo">346</span> // Disable cleaner<a name="line.346"></a>
-<span class="sourceLineNo">347</span> chore.setEnabled(false);<a name="line.347"></a>
-<span class="sourceLineNo">348</span><a name="line.348"></a>
-<span class="sourceLineNo">349</span> // create the directory layout in the directory to clean<a name="line.349"></a>
-<span class="sourceLineNo">350</span> Path parent = new Path(testDir, "parent");<a name="line.350"></a>
-<span class="sourceLineNo">351</span> Path child = new Path(parent, "child");<a name="line.351"></a>
-<span class="sourceLineNo">352</span> Path file = new Path(child, "someFile");<a name="line.352"></a>
-<span class="sourceLineNo">353</span> fs.mkdirs(child);<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span> // touch a new file<a name="line.355"></a>
-<span class="sourceLineNo">356</span> fs.create(file).close();<a name="line.356"></a>
-<span class="sourceLineNo">357</span> assertTrue("Test file didn't get created.", fs.exists(file));<a name="line.357"></a>
+<span class="sourceLineNo">305</span> // need to use a localutil to not break the rest of the test that runs on the local FS, which<a name="line.305"></a>
+<span class="sourceLineNo">306</span> // gets hosed when we start to use a minicluster.<a name="line.306"></a>
+<span class="sourceLineNo">307</span> HBaseTestingUtility localUtil = new HBaseTestingUtility();<a name="line.307"></a>
+<span class="sourceLineNo">308</span> Configuration conf = localUtil.getConfiguration();<a name="line.308"></a>
+<span class="sourceLineNo">309</span> final Path testDir = UTIL.getDataTestDir();<a name="line.309"></a>
+<span class="sourceLineNo">310</span> final FileSystem fs = UTIL.getTestFileSystem();<a name="line.310"></a>
+<span class="sourceLineNo">311</span> LOG.debug("Writing test data to: " + testDir);<a name="line.311"></a>
+<span class="sourceLineNo">312</span> String confKey = "hbase.test.cleaner.delegates";<a name="line.312"></a>
+<span class="sourceLineNo">313</span> conf.set(confKey, AlwaysDelete.class.getName());<a name="line.313"></a>
+<span class="sourceLineNo">314</span><a name="line.314"></a>
+<span class="sourceLineNo">315</span> AllValidPaths chore = new AllValidPaths("test-file-cleaner", stop, conf, fs, testDir, confKey);<a name="line.315"></a>
+<span class="sourceLineNo">316</span> // spy on the delegate to ensure that we don't check for directories<a name="line.316"></a>
+<span class="sourceLineNo">317</span> AlwaysDelete delegate = (AlwaysDelete) chore.cleanersChain.get(0);<a name="line.317"></a>
+<span class="sourceLineNo">318</span> AlwaysDelete spy = Mockito.spy(delegate);<a name="line.318"></a>
+<span class="sourceLineNo">319</span> chore.cleanersChain.set(0, spy);<a name="line.319"></a>
+<span class="sourceLineNo">320</span><a name="line.320"></a>
+<span class="sourceLineNo">321</span> // create the directory layout in the directory to clean<a name="line.321"></a>
+<span class="sourceLineNo">322</span> final Path parent = new Path(testDir, "parent");<a name="line.322"></a>
+<span class="sourceLineNo">323</span> Path file = new Path(parent, "someFile");<a name="line.323"></a>
+<span class="sourceLineNo">324</span> fs.mkdirs(parent);<a name="line.324"></a>
+<span class="sourceLineNo">325</span> // touch a new file<a name="line.325"></a>
+<span class="sourceLineNo">326</span> fs.create(file).close();<a name="line.326"></a>
+<span class="sourceLineNo">327</span> assertTrue("Test file didn't get created.", fs.exists(file));<a name="line.327"></a>
+<span class="sourceLineNo">328</span> final Path racyFile = new Path(parent, "addedFile");<a name="line.328"></a>
+<span class="sourceLineNo">329</span><a name="line.329"></a>
+<span class="sourceLineNo">330</span> // when we attempt to delete the original file, add another file in the same directory<a name="line.330"></a>
+<span class="sourceLineNo">331</span> Mockito.doAnswer(new Answer<Boolean>() {<a name="line.331"></a>
+<span class="sourceLineNo">332</span> @Override<a name="line.332"></a>
+<span class="sourceLineNo">333</span> public Boolean answer(InvocationOnMock invocation) throws Throwable {<a name="line.333"></a>
+<span class="sourceLineNo">334</span> fs.create(racyFile).close();<a name="line.334"></a>
+<span class="sourceLineNo">335</span> FSUtils.logFileSystemState(fs, testDir, LOG);<a name="line.335"></a>
+<span class="sourceLineNo">336</span> return (Boolean) invocation.callRealMethod();<a name="line.336"></a>
+<span class="sourceLineNo">337</span> }<a name="line.337"></a>
+<span class="sourceLineNo">338</span> }).when(spy).isFileDeletable(Mockito.any());<a name="line.338"></a>
+<span class="sourceLineNo">339</span><a name="line.339"></a>
+<span class="sourceLineNo">340</span> // run the chore<a name="line.340"></a>
+<span class="sourceLineNo">341</span> chore.chore();<a name="line.341"></a>
+<span class="sourceLineNo">342</span><a name="line.342"></a>
+<span class="sourceLineNo">343</span> // make sure all the directories + added file exist, but the original file is deleted<a name="line.343"></a>
+<span class="sourceLineNo">344</span> assertTrue("Added file unexpectedly deleted", fs.exists(racyFile));<a name="line.344"></a>
+<span class="sourceLineNo">345</span> assertTrue("Parent directory deleted unexpectedly", fs.exists(parent));<a name="line.345"></a>
+<span class="sourceLineNo">346</span> assertFalse("Original file unexpectedly retained", fs.exists(file));<a name="line.346"></a>
+<span class="sourceLineNo">347</span> Mockito.verify(spy, Mockito.times(1)).isFileDeletable(Mockito.any());<a name="line.347"></a>
+<span class="sourceLineNo">348</span> }<a name="line.348"></a>
+<span class="sourceLineNo">349</span><a name="line.349"></a>
+<span class="sourceLineNo">350</span> @Test<a name="line.350"></a>
+<span class="sourceLineNo">351</span> public void testDeleteFileWithCleanerEnabled() throws Exception {<a name="line.351"></a>
+<span class="sourceLineNo">352</span> Stoppable stop = new StoppableImplementation();<a name="line.352"></a>
+<span class="sourceLineNo">353</span> Configuration conf = UTIL.getConfiguration();<a name="line.353"></a>
+<span class="sourceLineNo">354</span> Path testDir = UTIL.getDataTestDir();<a name="line.354"></a>
+<span class="sourceLineNo">355</span> FileSystem fs = UTIL.getTestFileSystem();<a name="line.355"></a>
+<span class="sourceLineNo">356</span> String confKey = "hbase.test.cleaner.delegates";<a name="line.356"></a>
+<span class="sourceLineNo">357</span> conf.set(confKey, AlwaysDelete.class.getName());<a name="line.357"></a>
<span class="sourceLineNo">358</span><a name="line.358"></a>
-<span class="sourceLineNo">359</span> // run the chore<a name="line.359"></a>
-<span class="sourceLineNo">360</span> chore.chore();<a name="line.360"></a>
-<span class="sourceLineNo">361</span><a name="line.361"></a>
-<span class="sourceLineNo">362</span> // verify all the files exist<a name="line.362"></a>
-<span class="sourceLineNo">363</span> assertTrue("File got deleted with cleaner disabled", fs.exists(file));<a name="line.363"></a>
-<span class="sourceLineNo">364</span> assertTrue("Directory got deleted", fs.exists(child));<a name="line.364"></a>
-<span class="sourceLineNo">365</span> assertTrue("Directory got deleted", fs.exists(parent));<a name="line.365"></a>
-<span class="sourceLineNo">366</span> }<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 testOnConfigurationChange() throws Exception {<a name="line.369"></a>
-<span class="sourceLineNo">370</span> int availableProcessorNum = Runtime.getRuntime().availableProcessors();<a name="line.370"></a>
-<span class="sourceLineNo">371</span> if (availableProcessorNum == 1) { // no need to run this test<a name="line.371"></a>
-<span class="sourceLineNo">372</span> return;<a name="line.372"></a>
-<span class="sourceLineNo">373</span> }<a name="line.373"></a>
-<span class="sourceLineNo">374</span><a name="line.374"></a>
-<span class="sourceLineNo">375</span> // have at least 2 available processors/cores<a name="line.375"></a>
-<span class="sourceLineNo">376</span> int initPoolSize = availableProcessorNum / 2;<a name="line.376"></a>
-<span class="sourceLineNo">377</span> int changedPoolSize = availableProcessorNum;<a name="line.377"></a>
-<span class="sourceLineNo">378</span><a name="line.378"></a>
-<span class="sourceLineNo">379</span> Stoppable stop = new StoppableImplementation();<a name="line.379"></a>
-<span class="sourceLineNo">380</span> Configuration conf = UTIL.getConfiguration();<a name="line.380"></a>
-<span class="sourceLineNo">381</span> Path testDir = UTIL.getDataTestDir();<a name="line.381"></a>
-<span class="sourceLineNo">382</span> FileSystem fs = UTIL.getTestFileSystem();<a name="line.382"></a>
-<span class="sourceLineNo">383</span> String confKey = "hbase.test.cleaner.delegates";<a name="line.383"></a>
-<span class="sourceLineNo">384</span> conf.set(confKey, AlwaysDelete.class.getName());<a name="line.384"></a>
-<span class="sourceLineNo">385</span> conf.set(CleanerChore.CHORE_POOL_SIZE, String.valueOf(initPoolSize));<a name="line.385"></a>
-<span class="sourceLineNo">386</span> AllValidPaths chore = new AllValidPaths("test-file-cleaner", stop, conf, fs, testDir, confKey);<a name="line.386"></a>
-<span class="sourceLineNo">387</span> chore.setEnabled(true);<a name="line.387"></a>
-<span class="sourceLineNo">388</span> // Create subdirs under testDir<a name="line.388"></a>
-<span class="sourceLineNo">389</span> int dirNums = 6;<a name="line.389"></a>
-<span class="sourceLineNo">390</span> Path[] subdirs = new Path[dirNums];<a name="line.390"></a>
-<span class="sourceLineNo">391</span> for (int i = 0; i < dirNums; i++) {<a name="line.391"></a>
-<span class="sourceLineNo">392</span> subdirs[i] = new Path(testDir, "subdir-" + i);<a name="line.392"></a>
-<span class="sourceLineNo">393</span> fs.mkdirs(subdirs[i]);<a name="line.393"></a>
-<span class="sourceLineNo">394</span> }<a name="line.394"></a>
-<span class="sourceLineNo">395</span> // Under each subdirs create 6 files<a name="line.395"></a>
-<span class="sourceLineNo">396</span> for (Path subdir : subdirs) {<a name="line.396"></a>
-<span class="sourceLineNo">397</span> createFiles(fs, subdir, 6);<a name="line.397"></a>
-<span class="sourceLineNo">398</span> }<a name="line.398"></a>
-<span class="sourceLineNo">399</span> // Start chore<a name="line.399"></a>
-<span class="sourceLineNo">400</span> Thread t = new Thread(() -> chore.chore());<a name="line.400"></a>
-<span class="sourceLineNo">401</span> t.setDaemon(true);<a name="line.401"></a>
-<span class="sourceLineNo">402</span> t.start();<a name="line.402"></a>
-<span class="sourceLineNo">403</span> // Change size of chore's pool<a name="line.403"></a>
-<span class="sourceLineNo">404</span> conf.set(CleanerChore.CHORE_POOL_SIZE, String.valueOf(changedPoolSize));<a name="line.404"></a>
-<span class="sourceLineNo">405</span> chore.onConfigurationChange(conf);<a name="line.405"></a>
-<span class="sourceLineNo">406</span> assertEquals(changedPoolSize, chore.getChorePoolSize());<a name="line.406"></a>
-<span class="sourceLineNo">407</span> // Stop chore<a name="line.407"></a>
-<span class="sourceLineNo">408</span> t.join();<a name="line.408"></a>
-<span class="sourceLineNo">409</span> }<a name="line.409"></a>
-<span class="sourceLineNo">410</span><a name="line.410"></a>
-<span class="sourceLineNo">411</span> @Test<a name="line.411"></a>
-<span class="sourceLineNo">412</span> public void testMinimumNumberOfThreads() throws Exception {<a name="line.412"></a>
-<span class="sourceLineNo">413</span> Stoppable stop = new StoppableImplementation();<a name="line.413"></a>
-<span class="sourceLineNo">414</span> Configuration conf = UTIL.getConfiguration();<a name="line.414"></a>
-<span class="sourceLineNo">415</span> Path testDir = UTIL.getDataTestDir();<a name="line.415"></a>
-<span class="sourceLineNo">416</span> FileSystem fs = UTIL.getTestFileSystem();<a name="line.416"></a>
-<span class="sourceLineNo">417</span> String confKey = "hbase.test.cleaner.delegates";<a name="line.417"></a>
-<span class="sourceLineNo">418</span> conf.set(confKey, AlwaysDelete.class.getName());<a name="line.418"></a>
-<span class="sourceLineNo">419</span> conf.set(CleanerChore.CHORE_POOL_SIZE, "2");<a name="line.419"></a>
-<span class="sourceLineNo">420</span> AllValidPaths chore = new AllValidPaths("test-file-cleaner", stop, conf, fs, testDir, confKey);<a name="line.420"></a>
-<span class="sourceLineNo">421</span> int numProcs = Runtime.getRuntime().availableProcessors();<a name="line.421"></a>
-<span class="sourceLineNo">422</span> // Sanity<a name="line.422"></a>
-<span class="sourceLineNo">423</span> assertEquals(numProcs, chore.calculatePoolSize(Integer.toString(numProcs)));<a name="line.423"></a>
-<span class="sourceLineNo">424</span> // The implementation does not allow us to set more threads than we have processors<a name="line.424"></a>
-<span class="sourceLineNo">425</span> assertEquals(numProcs, chore.calculatePoolSize(Integer.toString(numProcs + 2)));<a name="line.425"></a>
-<span class="sourceLineNo">426</span> // Force us into the branch that is multiplying 0.0 against the number of processors<a name="line.426"></a>
-<span class="sourceLineNo">427</span> assertEquals(1, chore.calculatePoolSize("0.0"));<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> private void createFiles(FileSystem fs, Path parentDir, int numOfFiles) throws IOException {<a name="line.430"></a>
-<span class="sourceLineNo">431</span> Random random = new Random();<a name="line.431"></a>
-<span class="sourceLineNo">432</span> for (int i = 0; i < numOfFiles; i++) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> int xMega = 1 + random.nextInt(3); // size of each file is between 1~3M<a name="line.433"></a>
-<span class="sourceLineNo">434</span> try (FSDataOutputStream fsdos = fs.create(new Path(parentDir, "file-" + i))) {<a name="line.434"></a>
-<span class="sourceLineNo">435</span> for (int m = 0; m < xMega; m++) {<a name="line.435"></a>
-<span class="sourceLineNo">436</span> byte[] M = new byte[1024 * 1024];<a name="line.436"></a>
-<span class="sourceLineNo">437</span> random.nextBytes(M);<a name="line.437"></a>
-<span class="sourceLineNo">438</span> fsdos.write(M);<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> }<a name="line.441"></a>
-<span class="sourceLineNo">442</span> }<a name="line.442"></a>
-<span class="sourceLineNo">443</span><a name="line.443"></a>
-<span class="sourceLineNo">444</span> private static class AllValidPaths extends CleanerChore<BaseHFileCleanerDelegate> {<a name="line.444"></a>
-<span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span> public AllValidPaths(String name, Stoppable s, Configuration conf, FileSystem fs,<a name="line.446"></a>
-<span class="sourceLineNo">447</span> Path oldFileDir, String confkey) {<a name="line.447"></a>
-<span class="sourceLineNo">448</span> super(name, Integer.MAX_VALUE, s, conf, fs, oldFileDir, confkey);<a name="line.448"></a>
-<span class="sourceLineNo">449</span> }<a name="line.449"></a>
-<span class="sourceLineNo">450</span><a name="line.450"></a>
-<span class="sourceLineNo">451</span> // all paths are valid<a name="line.451"></a>
-<span class="sourceLineNo">452</span> @Override<a name="line.452"></a>
-<span class="sourceLineNo">453</span> protected boolean validate(Path file) {<a name="line.453"></a>
-<span class="sourceLineNo">454</span> return true;<a name="line.454"></a>
-<span class="sourceLineNo">455</span> }<a name="line.455"></a>
-<span class="sourceLineNo">456</span> }<a name="line.456"></a>
-<span class="sourceLineNo">457</span><a name="line.457"></a>
-<span class="sourceLineNo">458</span> public static class AlwaysDelete extends BaseHFileCleanerDelegate {<a name="line.458"></a>
-<span class="sourceLineNo">459</span> @Override<a name="line.459"></a>
-<span class="sourceLineNo">460</span> public boolean isFileDeletable(FileStatus fStat) {<a name="line.460"></a>
-<span class="sourceLineNo">461</span> return true;<a name="line.461"></a>
-<span class="sourceLineNo">462</span> }<a name="line.462"></a>
-<span class="sourceLineNo">463</span> }<a name="line.463"></a>
-<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span> public static class NeverDelete extends BaseHFileCleanerDelegate {<a name="line.465"></a>
-<span class="sourceLineNo">466</span> @Override<a name="line.466"></a>
-<span class="sourceLineNo">467</span> public boolean isFileDeletable(FileStatus fStat) {<a name="line.467"></a>
-<span class="sourceLineNo">468</span> return false;<a name="line.468"></a>
-<span class="sourceLineNo">469</span> }<a name="line.469"></a>
-<span class="sourceLineNo">470</span> }<a name="line.470"></a>
-<span class="sourceLineNo">471</span>}<a name="line.471"></a>
+<span class="sourceLineNo">359</span> AllValidPaths chore = new AllValidPaths("test-file-cleaner", stop, conf, fs, testDir, confKey);<a name="line.359"></a>
+<span class="sourceLineNo">360</span><a name="line.360"></a>
+<span class="sourceLineNo">361</span> // Enable cleaner<a name="line.361"></a>
+<span class="sourceLineNo">362</span> chore.setEnabled(true);<a name="line.362"></a>
+<span class="sourceLineNo">363</span><a name="line.363"></a>
+<span class="sourceLineNo">364</span> // create the directory layout in the directory to clean<a name="line.364"></a>
+<span class="sourceLineNo">365</span> Path parent = new Path(testDir, "parent");<a name="line.365"></a>
+<span class="sourceLineNo">366</span> Path child = new Path(parent, "child");<a name="line.366"></a>
+<span class="sourceLineNo">367</span> Path file = new Path(child, "someFile");<a name="line.367"></a>
+<span class="sourceLineNo">368</span> fs.mkdirs(child);<a name="line.368"></a>
+<span class="sourceLineNo">369</span><a name="line.369"></a>
+<span class="sourceLineNo">370</span> // touch a new file<a name="line.370"></a>
+<span class="sourceLineNo">371</span> fs.create(file).close();<a name="line.371"></a>
+<span class="sourceLineNo">372</span> assertTrue("Test file didn't get created.", fs.exists(file));<a name="line.372"></a>
+<span class="sourceLineNo">373</span><a name="line.373"></a>
+<span class="sourceLineNo">374</span> // run the chore<a name="line.374"></a>
+<span class="sourceLineNo">375</span> chore.chore();<a name="line.375"></a>
+<span class="sourceLineNo">376</span><a name="line.376"></a>
+<span class="sourceLineNo">377</span> // verify all the files got deleted<a name="line.377"></a>
+<span class="sourceLineNo">378</span> assertFalse("File didn't get deleted", fs.exists(file));<a name="line.378"></a>
+<span class="sourceLineNo">379</span> assertFalse("Empty directory didn't get deleted", fs.exists(child));<a name="line.379"></a>
+<span class="sourceLineNo">380</span> assertFalse("Empty directory didn't get deleted", fs.exists(parent));<a name="line.380"></a>
+<span class="sourceLineNo">381</span> }<a name="line.381"></a>
+<span class="sourceLineNo">382</span><a name="line.382"></a>
+<span class="sourceLineNo">383</span> @Test<a name="line.383"></a>
+<span class="sourceLineNo">384</span> public void testDeleteFileWithCleanerDisabled() throws Exception {<a name="line.384"></a>
+<span class="sourceLineNo">385</span> Stoppable stop = new StoppableImplementation();<a name="line.385"></a>
+<span class="sourceLineNo">386</span> Configuration conf = UTIL.getConfiguration();<a name="line.386"></a>
+<span class="sourceLineNo">387</span> Path testDir = UTIL.getDataTestDir();<a name="line.387"></a>
+<span class="sourceLineNo">388</span> FileSystem fs = UTIL.getTestFileSystem();<a name="line.388"></a>
+<span class="sourceLineNo">389</span> String confKey = "hbase.test.cleaner.delegates";<a name="line.389"></a>
+<span class="sourceLineNo">390</span> conf.set(confKey, AlwaysDelete.class.getName());<a name="line.390"></a>
+<span class="sourceLineNo">391</span><a name="line.391"></a>
+<span class="sourceLineNo">392</span> AllValidPaths chore = new AllValidPaths("test-file-cleaner", stop, conf, fs, testDir, confKey);<a name="line.392"></a>
+<span class="sourceLineNo">393</span><a name="line.393"></a>
+<span class="sourceLineNo">394</span> // Disable cleaner<a name="line.394"></a>
+<span class="sourceLineNo">395</span> chore.setEnabled(false);<a name="line.395"></a>
+<span class="sourceLineNo">396</span><a name="line.396"></a>
+<span class="sourceLineNo">397</span> // create the directory layout in the directory to clean<a name="line.397"></a>
+<span class="sourceLineNo">398</span> Path parent = new Path(testDir, "parent");<a name="line.398"></a>
+<span class="sourceLineNo">399</span> Path child = new Path(parent, "child");<a name="line.399"></a>
+<span class="sourceLineNo">400</span> Path file = new Path(child, "someFile");<a name="line.400"></a>
+<span class="sourceLineNo">401</span> fs.mkdirs(child);<a name="line.401"></a>
+<span class="sourceLineNo">402</span><a name="line.402"></a>
+<span class="sourceLineNo">403</span> // touch a new file<a name="line.403"></a>
+<span class="sourceLineNo">404</span> fs.create(file).close();<a name="line.404"></a>
+<span class="sourceLineNo">405</span> assertTrue("Test file didn't get created.", fs.exists(file));<a name="line.405"></a>
+<span class="sourceLineNo">406</span><a name="line.406"></a>
+<span class="sourceLineNo">407</span> // run the chore<a name="line.407"></a>
+<span class="sourceLineNo">408</span> chore.chore();<a name="line.408"></a>
+<span class="sourceLineNo">409</span><a name="line.409"></a>
+<span class="sourceLineNo">410</span> // verify all the files exist<a name="line.410"></a>
+<span class="sourceLineNo">411</span> assertTrue("File got deleted with cleaner disabled", fs.exists(file));<a name="line.411"></a>
+<span class="sourceLineNo">412</span> assertTrue("Directory got deleted", fs.exists(child));<a name="line.412"></a>
+<span class="sourceLineNo">413</span> assertTrue("Directory got deleted", fs.exists(parent));<a name="line.413"></a>
+<span class="sourceLineNo">414</span> }<a name="line.414"></a>
+<span class="sourceLineNo">415</span><a name="line.415"></a>
+<span class="sourceLineNo">416</span> @Test<a name="line.416"></a>
+<span class="sourceLineNo">417</span> public void testOnConfigurationChange() throws Exception {<a name="line.417"></a>
+<span class="sourceLineNo">418</span> int availableProcessorNum = Runtime.getRuntime().availableProcessors();<a name="line.418"></a>
+<span class="sourceLineNo">419</span> if (availableProcessorNum == 1) { // no need to run this test<a name="line.419"></a>
+<span class="sourceLineNo">420</span> return;<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> // have at least 2 available processors/cores<a name="line.423"></a>
+<span class="sourceLineNo">424</span> int initPoolSize = availableProcessorNum / 2;<a name="line.424"></a>
+<span class="sourceLineNo">425</span> int changedPoolSize = availableProcessorNum;<a name="line.425"></a>
+<span class="sourceLineNo">426</span><a name="line.426"></a>
+<span class="sourceLineNo">427</span> Stoppable stop = new StoppableImplementation();<a name="line.427"></a>
+<span class="sourceLineNo">428</span> Configuration conf = UTIL.getConfiguration();<a name="line.428"></a>
+<span class="sourceLineNo">429</span> Path testDir = UTIL.getDataTestDir();<a name="line.429"></a>
+<span class="sourceLineNo">430</span> FileSystem fs = UTIL.getTestFileSystem();<a name="line.430"></a>
+<span class="sourceLineNo">431</span> String confKey = "hbase.test.cleaner.delegates";<a name="line.431"></a>
+<span class="sourceLineNo">432</span> conf.set(confKey, AlwaysDelete.class.getName());<a name="line.432"></a>
+<span class="sourceLineNo">433</span> conf.set(CleanerChore.CHORE_POOL_SIZE, String.valueOf(initPoolSize));<a name="line.433"></a>
+<span class="sourceLineNo">434</span> AllValidPaths chore = new AllValidPaths("test-file-cleaner", stop, conf, fs, testDir, confKey);<a name="line.434"></a>
+<span class="sourceLineNo">435</span> chore.setEnabled(true);<a name="line.435"></a>
+<span class="sourceLineNo">436</span> // Create subdirs under testDir<a name="line.436"></a>
+<span class="sourceLineNo">437</span> int dirNums = 6;<a name="line.437"></a>
+<span class="sourceLineNo">438</span> Path[] subdirs = new Path[dirNums];<a name="line.438"></a>
+<span class="sourceLineNo">439</span> for (int i = 0; i < dirNums; i++) {<a name="line.439"></a>
+<span class="sourceLineNo">440</span> subdirs[i] = new Path(testDir, "subdir-" + i);<a name="line.440"></a>
+<span class="sourceLineNo">441</span> fs.mkdirs(subdirs[i]);<a name="line.441"></a>
+<span class="sourceLineNo">442</span> }<a name="line.442"></a>
+<span class="sourceLineNo">443</span> // Under each subdirs create 6 files<a name="line.443"></a>
+<span class="sourceLineNo">444</span> for (Path subdir : subdirs) {<a name="line.444"></a>
+<span class="sourceLineNo">445</span> createFiles(fs, subdir, 6);<a name="line.445"></a>
+<span class="sourceLineNo">446</span> }<a name="line.446"></a>
+<span class="sourceLineNo">447</span> // Start chore<a name="line.447"></a>
+<span class="sourceLineNo">448</span> Thread t = new Thread(() -> chore.chore());<a name="line.448"></a>
+<span class="sourceLineNo">449</span> t.setDaemon(true);<a name="line.449"></a>
+<span class="sourceLineNo">450</span> t.start();<a name="line.450"></a>
+<span class="sourceLineNo">451</span> // Change size of chore's pool<a name="line.451"></a>
+<span class="sourceLineNo">452</span> conf.set(CleanerChore.CHORE_POOL_SIZE, String.valueOf(changedPoolSize));<a name="line.452"></a>
+<span class="sourceLineNo">453</span> chore.onConfigurationChange(conf);<a name="line.453"></a>
+<span class="sourceLineNo">454</span> assertEquals(changedPoolSize, chore.getChorePoolSize());<a name="line.454"></a>
+<span class="sourceLineNo">455</span> // Stop chore<a name="line.455"></a>
+<span class="sourceLineNo">456</span> t.join();<a name="line.456"></a>
+<span class="sourceLineNo">457</span> }<a name="line.457"></a>
+<span class="sourceLineNo">458</span><a name="line.458"></a>
+<span class="sourceLineNo">459</span> @Test<a name="line.459"></a>
+<span class="sourceLineNo">460</span> public void testMinimumNumberOfThreads() throws Exception {<a name="line.460"></a>
+<span class="sourceLineNo">461</span> Stoppable stop = new StoppableImplementation();<a name="line.461"></a>
+<span class="sourceLineNo">462</span> Configuration conf = UTIL.getConfiguration();<a name="line.462"></a>
+<span class="sourceLineNo">463</span> Path testDir = UTIL.getDataTestDir();<a name="line.463"></a>
+<span class="sourceLineNo">464</span> FileSystem fs = UTIL.getTestFileSystem();<a name="line.464"></a>
+<span class="sourceLineNo">465</span> String confKey = "hbase.test.cleaner.delegates";<a name="line.465"></a>
+<span class="sourceLineNo">466</span> conf.set(confKey, AlwaysDelete.class.getName());<a name="line.466"></a>
+<span class="sourceLineNo">467</span> conf.set(CleanerChore.CHORE_POOL_SIZE, "2");<a name="line.467"></a>
+<span class="sourceLineNo">468</span> AllValidPaths chore = new AllValidPaths("test-file-cleaner", stop, conf, fs, testDir, confKey);<a name="line.468"></a>
+<span class="sourceLineNo">469</span> int numProcs = Runtime.getRuntime().availableProcessors();<a name="line.469"></a>
+<span class="sourceLineNo">470</span> // Sanity<a n
<TRUNCATED>