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/07/23 14:50:32 UTC
[18/31] hbase-site git commit: Published site at
4804483f7e55edf91a8e9d7ad30ad8239a96eaf3.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b248f175/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html
index 224fc91..31d4f2f 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html
@@ -31,437 +31,480 @@
<span class="sourceLineNo">023</span>import java.util.List;<a name="line.23"></a>
<span class="sourceLineNo">024</span>import java.util.Map;<a name="line.24"></a>
<span class="sourceLineNo">025</span>import java.util.concurrent.BlockingQueue;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import java.util.concurrent.atomic.AtomicLong;<a name="line.26"></a>
-<span class="sourceLineNo">027</span><a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.conf.Configuration;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.fs.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.hbase.Stoppable;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.io.HFileLink;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.regionserver.StoreFileInfo;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.util.StealJobQueue;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.slf4j.Logger;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.slf4j.LoggerFactory;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>/**<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * This Chore, every time it runs, will clear the HFiles in the hfile archive<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * folder that are deletable for each HFile cleaner in the chain.<a name="line.42"></a>
-<span class="sourceLineNo">043</span> */<a name="line.43"></a>
-<span class="sourceLineNo">044</span>@InterfaceAudience.Private<a name="line.44"></a>
-<span class="sourceLineNo">045</span>public class HFileCleaner extends CleanerChore<BaseHFileCleanerDelegate> {<a name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span> public static final String MASTER_HFILE_CLEANER_PLUGINS = "hbase.master.hfilecleaner.plugins";<a name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span> public HFileCleaner(final int period, final Stoppable stopper, Configuration conf, FileSystem fs,<a name="line.49"></a>
-<span class="sourceLineNo">050</span> Path directory) {<a name="line.50"></a>
-<span class="sourceLineNo">051</span> this(period, stopper, conf, fs, directory, null);<a name="line.51"></a>
-<span class="sourceLineNo">052</span> }<a name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span> // Configuration key for large/small throttle point<a name="line.54"></a>
-<span class="sourceLineNo">055</span> public final static String HFILE_DELETE_THROTTLE_THRESHOLD =<a name="line.55"></a>
-<span class="sourceLineNo">056</span> "hbase.regionserver.thread.hfilecleaner.throttle";<a name="line.56"></a>
-<span class="sourceLineNo">057</span> public final static int DEFAULT_HFILE_DELETE_THROTTLE_THRESHOLD = 64 * 1024 * 1024;// 64M<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span> // Configuration key for large queue initial size<a name="line.59"></a>
-<span class="sourceLineNo">060</span> public final static String LARGE_HFILE_QUEUE_INIT_SIZE =<a name="line.60"></a>
-<span class="sourceLineNo">061</span> "hbase.regionserver.hfilecleaner.large.queue.size";<a name="line.61"></a>
-<span class="sourceLineNo">062</span> public final static int DEFAULT_LARGE_HFILE_QUEUE_INIT_SIZE = 10240;<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span> // Configuration key for small queue initial size<a name="line.64"></a>
-<span class="sourceLineNo">065</span> public final static String SMALL_HFILE_QUEUE_INIT_SIZE =<a name="line.65"></a>
-<span class="sourceLineNo">066</span> "hbase.regionserver.hfilecleaner.small.queue.size";<a name="line.66"></a>
-<span class="sourceLineNo">067</span> public final static int DEFAULT_SMALL_HFILE_QUEUE_INIT_SIZE = 10240;<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span> // Configuration key for large file delete thread number<a name="line.69"></a>
-<span class="sourceLineNo">070</span> public final static String LARGE_HFILE_DELETE_THREAD_NUMBER =<a name="line.70"></a>
-<span class="sourceLineNo">071</span> "hbase.regionserver.hfilecleaner.large.thread.count";<a name="line.71"></a>
-<span class="sourceLineNo">072</span> public final static int DEFAULT_LARGE_HFILE_DELETE_THREAD_NUMBER = 1;<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span> // Configuration key for small file delete thread number<a name="line.74"></a>
-<span class="sourceLineNo">075</span> public final static String SMALL_HFILE_DELETE_THREAD_NUMBER =<a name="line.75"></a>
-<span class="sourceLineNo">076</span> "hbase.regionserver.hfilecleaner.small.thread.count";<a name="line.76"></a>
-<span class="sourceLineNo">077</span> public final static int DEFAULT_SMALL_HFILE_DELETE_THREAD_NUMBER = 1;<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span> private static final Logger LOG = LoggerFactory.getLogger(HFileCleaner.class);<a name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span> StealJobQueue<HFileDeleteTask> largeFileQueue;<a name="line.81"></a>
-<span class="sourceLineNo">082</span> BlockingQueue<HFileDeleteTask> smallFileQueue;<a name="line.82"></a>
-<span class="sourceLineNo">083</span> private int throttlePoint;<a name="line.83"></a>
-<span class="sourceLineNo">084</span> private int largeQueueInitSize;<a name="line.84"></a>
-<span class="sourceLineNo">085</span> private int smallQueueInitSize;<a name="line.85"></a>
-<span class="sourceLineNo">086</span> private int largeFileDeleteThreadNumber;<a name="line.86"></a>
-<span class="sourceLineNo">087</span> private int smallFileDeleteThreadNumber;<a name="line.87"></a>
-<span class="sourceLineNo">088</span> private List<Thread> threads = new ArrayList<Thread>();<a name="line.88"></a>
-<span class="sourceLineNo">089</span> private boolean running;<a name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span> private AtomicLong deletedLargeFiles = new AtomicLong();<a name="line.91"></a>
-<span class="sourceLineNo">092</span> private AtomicLong deletedSmallFiles = new AtomicLong();<a name="line.92"></a>
-<span class="sourceLineNo">093</span><a name="line.93"></a>
-<span class="sourceLineNo">094</span> /**<a name="line.94"></a>
-<span class="sourceLineNo">095</span> * @param period the period of time to sleep between each run<a name="line.95"></a>
-<span class="sourceLineNo">096</span> * @param stopper the stopper<a name="line.96"></a>
-<span class="sourceLineNo">097</span> * @param conf configuration to use<a name="line.97"></a>
-<span class="sourceLineNo">098</span> * @param fs handle to the FS<a name="line.98"></a>
-<span class="sourceLineNo">099</span> * @param directory directory to be cleaned<a name="line.99"></a>
-<span class="sourceLineNo">100</span> * @param params params could be used in subclass of BaseHFileCleanerDelegate<a name="line.100"></a>
-<span class="sourceLineNo">101</span> */<a name="line.101"></a>
-<span class="sourceLineNo">102</span> public HFileCleaner(final int period, final Stoppable stopper, Configuration conf, FileSystem fs,<a name="line.102"></a>
-<span class="sourceLineNo">103</span> Path directory, Map<String, Object> params) {<a name="line.103"></a>
-<span class="sourceLineNo">104</span> super("HFileCleaner", period, stopper, conf, fs,<a name="line.104"></a>
-<span class="sourceLineNo">105</span> directory, MASTER_HFILE_CLEANER_PLUGINS, params);<a name="line.105"></a>
-<span class="sourceLineNo">106</span> throttlePoint =<a name="line.106"></a>
-<span class="sourceLineNo">107</span> conf.getInt(HFILE_DELETE_THROTTLE_THRESHOLD, DEFAULT_HFILE_DELETE_THROTTLE_THRESHOLD);<a name="line.107"></a>
-<span class="sourceLineNo">108</span> largeQueueInitSize =<a name="line.108"></a>
-<span class="sourceLineNo">109</span> conf.getInt(LARGE_HFILE_QUEUE_INIT_SIZE, DEFAULT_LARGE_HFILE_QUEUE_INIT_SIZE);<a name="line.109"></a>
-<span class="sourceLineNo">110</span> smallQueueInitSize =<a name="line.110"></a>
-<span class="sourceLineNo">111</span> conf.getInt(SMALL_HFILE_QUEUE_INIT_SIZE, DEFAULT_SMALL_HFILE_QUEUE_INIT_SIZE);<a name="line.111"></a>
-<span class="sourceLineNo">112</span> largeFileQueue = new StealJobQueue<>(largeQueueInitSize, smallQueueInitSize, COMPARATOR);<a name="line.112"></a>
-<span class="sourceLineNo">113</span> smallFileQueue = largeFileQueue.getStealFromQueue();<a name="line.113"></a>
-<span class="sourceLineNo">114</span> largeFileDeleteThreadNumber =<a name="line.114"></a>
-<span class="sourceLineNo">115</span> conf.getInt(LARGE_HFILE_DELETE_THREAD_NUMBER, DEFAULT_LARGE_HFILE_DELETE_THREAD_NUMBER);<a name="line.115"></a>
-<span class="sourceLineNo">116</span> smallFileDeleteThreadNumber =<a name="line.116"></a>
-<span class="sourceLineNo">117</span> conf.getInt(SMALL_HFILE_DELETE_THREAD_NUMBER, DEFAULT_SMALL_HFILE_DELETE_THREAD_NUMBER);<a name="line.117"></a>
-<span class="sourceLineNo">118</span> startHFileDeleteThreads();<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> @Override<a name="line.121"></a>
-<span class="sourceLineNo">122</span> protected boolean validate(Path file) {<a name="line.122"></a>
-<span class="sourceLineNo">123</span> if (HFileLink.isBackReferencesDir(file) || HFileLink.isBackReferencesDir(file.getParent())) {<a name="line.123"></a>
-<span class="sourceLineNo">124</span> return true;<a name="line.124"></a>
-<span class="sourceLineNo">125</span> }<a name="line.125"></a>
-<span class="sourceLineNo">126</span> return StoreFileInfo.validateStoreFileName(file.getName());<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> * Exposed for TESTING!<a name="line.130"></a>
-<span class="sourceLineNo">131</span> */<a name="line.131"></a>
-<span class="sourceLineNo">132</span> public List<BaseHFileCleanerDelegate> getDelegatesForTesting() {<a name="line.132"></a>
-<span class="sourceLineNo">133</span> return this.cleanersChain;<a name="line.133"></a>
-<span class="sourceLineNo">134</span> }<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span> @Override<a name="line.136"></a>
-<span class="sourceLineNo">137</span> public int deleteFiles(Iterable<FileStatus> filesToDelete) {<a name="line.137"></a>
-<span class="sourceLineNo">138</span> int deletedFiles = 0;<a name="line.138"></a>
-<span class="sourceLineNo">139</span> List<HFileDeleteTask> tasks = new ArrayList<HFileDeleteTask>();<a name="line.139"></a>
-<span class="sourceLineNo">140</span> // construct delete tasks and add into relative queue<a name="line.140"></a>
-<span class="sourceLineNo">141</span> for (FileStatus file : filesToDelete) {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> HFileDeleteTask task = deleteFile(file);<a name="line.142"></a>
-<span class="sourceLineNo">143</span> if (task != null) {<a name="line.143"></a>
-<span class="sourceLineNo">144</span> tasks.add(task);<a name="line.144"></a>
-<span class="sourceLineNo">145</span> }<a name="line.145"></a>
-<span class="sourceLineNo">146</span> }<a name="line.146"></a>
-<span class="sourceLineNo">147</span> // wait for each submitted task to finish<a name="line.147"></a>
-<span class="sourceLineNo">148</span> for (HFileDeleteTask task : tasks) {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> if (task.getResult()) {<a name="line.149"></a>
-<span class="sourceLineNo">150</span> deletedFiles++;<a name="line.150"></a>
-<span class="sourceLineNo">151</span> }<a name="line.151"></a>
-<span class="sourceLineNo">152</span> }<a name="line.152"></a>
-<span class="sourceLineNo">153</span> return deletedFiles;<a name="line.153"></a>
-<span class="sourceLineNo">154</span> }<a name="line.154"></a>
-<span class="sourceLineNo">155</span><a name="line.155"></a>
-<span class="sourceLineNo">156</span> /**<a name="line.156"></a>
-<span class="sourceLineNo">157</span> * Construct an {@link HFileDeleteTask} for each file to delete and add into the correct queue<a name="line.157"></a>
-<span class="sourceLineNo">158</span> * @param file the file to delete<a name="line.158"></a>
-<span class="sourceLineNo">159</span> * @return HFileDeleteTask to track progress<a name="line.159"></a>
-<span class="sourceLineNo">160</span> */<a name="line.160"></a>
-<span class="sourceLineNo">161</span> private HFileDeleteTask deleteFile(FileStatus file) {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> HFileDeleteTask task = new HFileDeleteTask(file);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> boolean enqueued = dispatch(task);<a name="line.163"></a>
-<span class="sourceLineNo">164</span> return enqueued ? task : null;<a name="line.164"></a>
-<span class="sourceLineNo">165</span> }<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span> private boolean dispatch(HFileDeleteTask task) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> if (task.fileLength >= this.throttlePoint) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span> if (!this.largeFileQueue.offer(task)) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span> // should never arrive here as long as we use PriorityQueue<a name="line.170"></a>
-<span class="sourceLineNo">171</span> LOG.trace("Large file deletion queue is full");<a name="line.171"></a>
-<span class="sourceLineNo">172</span> return false;<a name="line.172"></a>
-<span class="sourceLineNo">173</span> }<a name="line.173"></a>
-<span class="sourceLineNo">174</span> } else {<a name="line.174"></a>
-<span class="sourceLineNo">175</span> if (!this.smallFileQueue.offer(task)) {<a name="line.175"></a>
-<span class="sourceLineNo">176</span> // should never arrive here as long as we use PriorityQueue<a name="line.176"></a>
-<span class="sourceLineNo">177</span> LOG.trace("Small file deletion queue is full");<a name="line.177"></a>
-<span class="sourceLineNo">178</span> return false;<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> return true;<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> @Override<a name="line.184"></a>
-<span class="sourceLineNo">185</span> public synchronized void cleanup() {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> super.cleanup();<a name="line.186"></a>
-<span class="sourceLineNo">187</span> stopHFileDeleteThreads();<a name="line.187"></a>
-<span class="sourceLineNo">188</span> }<a name="line.188"></a>
-<span class="sourceLineNo">189</span><a name="line.189"></a>
-<span class="sourceLineNo">190</span> /**<a name="line.190"></a>
-<span class="sourceLineNo">191</span> * Start threads for hfile deletion<a name="line.191"></a>
-<span class="sourceLineNo">192</span> */<a name="line.192"></a>
-<span class="sourceLineNo">193</span> private void startHFileDeleteThreads() {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> final String n = Thread.currentThread().getName();<a name="line.194"></a>
-<span class="sourceLineNo">195</span> running = true;<a name="line.195"></a>
-<span class="sourceLineNo">196</span> // start thread for large file deletion<a name="line.196"></a>
-<span class="sourceLineNo">197</span> for (int i = 0; i < largeFileDeleteThreadNumber; i++) {<a name="line.197"></a>
-<span class="sourceLineNo">198</span> Thread large = new Thread() {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> @Override<a name="line.199"></a>
-<span class="sourceLineNo">200</span> public void run() {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> consumerLoop(largeFileQueue);<a name="line.201"></a>
-<span class="sourceLineNo">202</span> }<a name="line.202"></a>
-<span class="sourceLineNo">203</span> };<a name="line.203"></a>
-<span class="sourceLineNo">204</span> large.setDaemon(true);<a name="line.204"></a>
-<span class="sourceLineNo">205</span> large.setName(n + "-HFileCleaner.large." + i + "-" + System.currentTimeMillis());<a name="line.205"></a>
-<span class="sourceLineNo">206</span> large.start();<a name="line.206"></a>
-<span class="sourceLineNo">207</span> LOG.debug("Starting for large file={}", large);<a name="line.207"></a>
-<span class="sourceLineNo">208</span> threads.add(large);<a name="line.208"></a>
-<span class="sourceLineNo">209</span> }<a name="line.209"></a>
-<span class="sourceLineNo">210</span><a name="line.210"></a>
-<span class="sourceLineNo">211</span> // start thread for small file deletion<a name="line.211"></a>
-<span class="sourceLineNo">212</span> for (int i = 0; i < smallFileDeleteThreadNumber; i++) {<a name="line.212"></a>
-<span class="sourceLineNo">213</span> Thread small = new Thread() {<a name="line.213"></a>
-<span class="sourceLineNo">214</span> @Override<a name="line.214"></a>
-<span class="sourceLineNo">215</span> public void run() {<a name="line.215"></a>
-<span class="sourceLineNo">216</span> consumerLoop(smallFileQueue);<a name="line.216"></a>
-<span class="sourceLineNo">217</span> }<a name="line.217"></a>
-<span class="sourceLineNo">218</span> };<a name="line.218"></a>
-<span class="sourceLineNo">219</span> small.setDaemon(true);<a name="line.219"></a>
-<span class="sourceLineNo">220</span> small.setName(n + "-HFileCleaner.small." + i + "-" + System.currentTimeMillis());<a name="line.220"></a>
-<span class="sourceLineNo">221</span> small.start();<a name="line.221"></a>
-<span class="sourceLineNo">222</span> LOG.debug("Starting for small files={}", small);<a name="line.222"></a>
-<span class="sourceLineNo">223</span> threads.add(small);<a name="line.223"></a>
-<span class="sourceLineNo">224</span> }<a name="line.224"></a>
-<span class="sourceLineNo">225</span> }<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span> protected void consumerLoop(BlockingQueue<HFileDeleteTask> queue) {<a name="line.227"></a>
-<span class="sourceLineNo">228</span> try {<a name="line.228"></a>
-<span class="sourceLineNo">229</span> while (running) {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> HFileDeleteTask task = null;<a name="line.230"></a>
-<span class="sourceLineNo">231</span> try {<a name="line.231"></a>
-<span class="sourceLineNo">232</span> task = queue.take();<a name="line.232"></a>
-<span class="sourceLineNo">233</span> } catch (InterruptedException e) {<a name="line.233"></a>
-<span class="sourceLineNo">234</span> LOG.trace("Interrupted while trying to take a task from queue", e);<a name="line.234"></a>
-<span class="sourceLineNo">235</span> break;<a name="line.235"></a>
-<span class="sourceLineNo">236</span> }<a name="line.236"></a>
-<span class="sourceLineNo">237</span> if (task != null) {<a name="line.237"></a>
-<span class="sourceLineNo">238</span> LOG.trace("Removing {}", task.filePath);<a name="line.238"></a>
-<span class="sourceLineNo">239</span> boolean succeed;<a name="line.239"></a>
-<span class="sourceLineNo">240</span> try {<a name="line.240"></a>
-<span class="sourceLineNo">241</span> succeed = this.fs.delete(task.filePath, false);<a name="line.241"></a>
-<span class="sourceLineNo">242</span> } catch (IOException e) {<a name="line.242"></a>
-<span class="sourceLineNo">243</span> LOG.warn("Failed to delete {}", task.filePath, e);<a name="line.243"></a>
-<span class="sourceLineNo">244</span> succeed = false;<a name="line.244"></a>
-<span class="sourceLineNo">245</span> }<a name="line.245"></a>
-<span class="sourceLineNo">246</span> task.setResult(succeed);<a name="line.246"></a>
-<span class="sourceLineNo">247</span> if (succeed) {<a name="line.247"></a>
-<span class="sourceLineNo">248</span> countDeletedFiles(task.fileLength >= throttlePoint, queue == largeFileQueue);<a name="line.248"></a>
-<span class="sourceLineNo">249</span> }<a name="line.249"></a>
-<span class="sourceLineNo">250</span> }<a name="line.250"></a>
-<span class="sourceLineNo">251</span> }<a name="line.251"></a>
-<span class="sourceLineNo">252</span> } finally {<a name="line.252"></a>
-<span class="sourceLineNo">253</span> LOG.debug("Exit {}", Thread.currentThread());<a name="line.253"></a>
-<span class="sourceLineNo">254</span> }<a name="line.254"></a>
-<span class="sourceLineNo">255</span> }<a name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span> // Currently only for testing purpose<a name="line.257"></a>
-<span class="sourceLineNo">258</span> private void countDeletedFiles(boolean isLargeFile, boolean fromLargeQueue) {<a name="line.258"></a>
-<span class="sourceLineNo">259</span> if (isLargeFile) {<a name="line.259"></a>
-<span class="sourceLineNo">260</span> if (deletedLargeFiles.get() == Long.MAX_VALUE) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> LOG.debug("Deleted more than Long.MAX_VALUE large files, reset counter to 0");<a name="line.261"></a>
-<span class="sourceLineNo">262</span> deletedLargeFiles.set(0L);<a name="line.262"></a>
-<span class="sourceLineNo">263</span> }<a name="line.263"></a>
-<span class="sourceLineNo">264</span> deletedLargeFiles.incrementAndGet();<a name="line.264"></a>
-<span class="sourceLineNo">265</span> } else {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> if (deletedSmallFiles.get() == Long.MAX_VALUE) {<a name="line.266"></a>
-<span class="sourceLineNo">267</span> LOG.debug("Deleted more than Long.MAX_VALUE small files, reset counter to 0");<a name="line.267"></a>
-<span class="sourceLineNo">268</span> deletedSmallFiles.set(0L);<a name="line.268"></a>
+<span class="sourceLineNo">026</span>import java.util.concurrent.TimeUnit;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import java.util.concurrent.atomic.AtomicLong;<a name="line.27"></a>
+<span class="sourceLineNo">028</span><a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.conf.Configuration;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.fs.FileStatus;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.fs.FileSystem;<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.Stoppable;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.io.HFileLink;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.regionserver.StoreFileInfo;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.util.StealJobQueue;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.slf4j.Logger;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.slf4j.LoggerFactory;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>/**<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * This Chore, every time it runs, will clear the HFiles in the hfile archive<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * folder that are deletable for each HFile cleaner in the chain.<a name="line.43"></a>
+<span class="sourceLineNo">044</span> */<a name="line.44"></a>
+<span class="sourceLineNo">045</span>@InterfaceAudience.Private<a name="line.45"></a>
+<span class="sourceLineNo">046</span>public class HFileCleaner extends CleanerChore<BaseHFileCleanerDelegate> {<a name="line.46"></a>
+<span class="sourceLineNo">047</span><a name="line.47"></a>
+<span class="sourceLineNo">048</span> public static final String MASTER_HFILE_CLEANER_PLUGINS = "hbase.master.hfilecleaner.plugins";<a name="line.48"></a>
+<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">050</span> public HFileCleaner(final int period, final Stoppable stopper, Configuration conf, FileSystem fs,<a name="line.50"></a>
+<span class="sourceLineNo">051</span> Path directory) {<a name="line.51"></a>
+<span class="sourceLineNo">052</span> this(period, stopper, conf, fs, directory, null);<a name="line.52"></a>
+<span class="sourceLineNo">053</span> }<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span> // Configuration key for large/small throttle point<a name="line.55"></a>
+<span class="sourceLineNo">056</span> public final static String HFILE_DELETE_THROTTLE_THRESHOLD =<a name="line.56"></a>
+<span class="sourceLineNo">057</span> "hbase.regionserver.thread.hfilecleaner.throttle";<a name="line.57"></a>
+<span class="sourceLineNo">058</span> public final static int DEFAULT_HFILE_DELETE_THROTTLE_THRESHOLD = 64 * 1024 * 1024;// 64M<a name="line.58"></a>
+<span class="sourceLineNo">059</span><a name="line.59"></a>
+<span class="sourceLineNo">060</span> // Configuration key for large queue initial size<a name="line.60"></a>
+<span class="sourceLineNo">061</span> public final static String LARGE_HFILE_QUEUE_INIT_SIZE =<a name="line.61"></a>
+<span class="sourceLineNo">062</span> "hbase.regionserver.hfilecleaner.large.queue.size";<a name="line.62"></a>
+<span class="sourceLineNo">063</span> public final static int DEFAULT_LARGE_HFILE_QUEUE_INIT_SIZE = 10240;<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span> // Configuration key for small queue initial size<a name="line.65"></a>
+<span class="sourceLineNo">066</span> public final static String SMALL_HFILE_QUEUE_INIT_SIZE =<a name="line.66"></a>
+<span class="sourceLineNo">067</span> "hbase.regionserver.hfilecleaner.small.queue.size";<a name="line.67"></a>
+<span class="sourceLineNo">068</span> public final static int DEFAULT_SMALL_HFILE_QUEUE_INIT_SIZE = 10240;<a name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span> // Configuration key for large file delete thread number<a name="line.70"></a>
+<span class="sourceLineNo">071</span> public final static String LARGE_HFILE_DELETE_THREAD_NUMBER =<a name="line.71"></a>
+<span class="sourceLineNo">072</span> "hbase.regionserver.hfilecleaner.large.thread.count";<a name="line.72"></a>
+<span class="sourceLineNo">073</span> public final static int DEFAULT_LARGE_HFILE_DELETE_THREAD_NUMBER = 1;<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span> // Configuration key for small file delete thread number<a name="line.75"></a>
+<span class="sourceLineNo">076</span> public final static String SMALL_HFILE_DELETE_THREAD_NUMBER =<a name="line.76"></a>
+<span class="sourceLineNo">077</span> "hbase.regionserver.hfilecleaner.small.thread.count";<a name="line.77"></a>
+<span class="sourceLineNo">078</span> public final static int DEFAULT_SMALL_HFILE_DELETE_THREAD_NUMBER = 1;<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span> public static final String HFILE_DELETE_THREAD_TIMEOUT_MSEC =<a name="line.80"></a>
+<span class="sourceLineNo">081</span> "hbase.regionserver.hfilecleaner.thread.timeout.msec";<a name="line.81"></a>
+<span class="sourceLineNo">082</span> @VisibleForTesting<a name="line.82"></a>
+<span class="sourceLineNo">083</span> static final long DEFAULT_HFILE_DELETE_THREAD_TIMEOUT_MSEC = 60 * 1000L;<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span> public static final String HFILE_DELETE_THREAD_CHECK_INTERVAL_MSEC =<a name="line.85"></a>
+<span class="sourceLineNo">086</span> "hbase.regionserver.hfilecleaner.thread.check.interval.msec";<a name="line.86"></a>
+<span class="sourceLineNo">087</span> @VisibleForTesting<a name="line.87"></a>
+<span class="sourceLineNo">088</span> static final long DEFAULT_HFILE_DELETE_THREAD_CHECK_INTERVAL_MSEC = 1000L;<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span> private static final Logger LOG = LoggerFactory.getLogger(HFileCleaner.class);<a name="line.90"></a>
+<span class="sourceLineNo">091</span><a name="line.91"></a>
+<span class="sourceLineNo">092</span> StealJobQueue<HFileDeleteTask> largeFileQueue;<a name="line.92"></a>
+<span class="sourceLineNo">093</span> BlockingQueue<HFileDeleteTask> smallFileQueue;<a name="line.93"></a>
+<span class="sourceLineNo">094</span> private int throttlePoint;<a name="line.94"></a>
+<span class="sourceLineNo">095</span> private int largeQueueInitSize;<a name="line.95"></a>
+<span class="sourceLineNo">096</span> private int smallQueueInitSize;<a name="line.96"></a>
+<span class="sourceLineNo">097</span> private int largeFileDeleteThreadNumber;<a name="line.97"></a>
+<span class="sourceLineNo">098</span> private int smallFileDeleteThreadNumber;<a name="line.98"></a>
+<span class="sourceLineNo">099</span> private long cleanerThreadTimeoutMsec;<a name="line.99"></a>
+<span class="sourceLineNo">100</span> private long cleanerThreadCheckIntervalMsec;<a name="line.100"></a>
+<span class="sourceLineNo">101</span> private List<Thread> threads = new ArrayList<Thread>();<a name="line.101"></a>
+<span class="sourceLineNo">102</span> private boolean running;<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span> private AtomicLong deletedLargeFiles = new AtomicLong();<a name="line.104"></a>
+<span class="sourceLineNo">105</span> private AtomicLong deletedSmallFiles = new AtomicLong();<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span> /**<a name="line.107"></a>
+<span class="sourceLineNo">108</span> * @param period the period of time to sleep between each run<a name="line.108"></a>
+<span class="sourceLineNo">109</span> * @param stopper the stopper<a name="line.109"></a>
+<span class="sourceLineNo">110</span> * @param conf configuration to use<a name="line.110"></a>
+<span class="sourceLineNo">111</span> * @param fs handle to the FS<a name="line.111"></a>
+<span class="sourceLineNo">112</span> * @param directory directory to be cleaned<a name="line.112"></a>
+<span class="sourceLineNo">113</span> * @param params params could be used in subclass of BaseHFileCleanerDelegate<a name="line.113"></a>
+<span class="sourceLineNo">114</span> */<a name="line.114"></a>
+<span class="sourceLineNo">115</span> public HFileCleaner(final int period, final Stoppable stopper, Configuration conf, FileSystem fs,<a name="line.115"></a>
+<span class="sourceLineNo">116</span> Path directory, Map<String, Object> params) {<a name="line.116"></a>
+<span class="sourceLineNo">117</span> super("HFileCleaner", period, stopper, conf, fs,<a name="line.117"></a>
+<span class="sourceLineNo">118</span> directory, MASTER_HFILE_CLEANER_PLUGINS, params);<a name="line.118"></a>
+<span class="sourceLineNo">119</span> throttlePoint =<a name="line.119"></a>
+<span class="sourceLineNo">120</span> conf.getInt(HFILE_DELETE_THROTTLE_THRESHOLD, DEFAULT_HFILE_DELETE_THROTTLE_THRESHOLD);<a name="line.120"></a>
+<span class="sourceLineNo">121</span> largeQueueInitSize =<a name="line.121"></a>
+<span class="sourceLineNo">122</span> conf.getInt(LARGE_HFILE_QUEUE_INIT_SIZE, DEFAULT_LARGE_HFILE_QUEUE_INIT_SIZE);<a name="line.122"></a>
+<span class="sourceLineNo">123</span> smallQueueInitSize =<a name="line.123"></a>
+<span class="sourceLineNo">124</span> conf.getInt(SMALL_HFILE_QUEUE_INIT_SIZE, DEFAULT_SMALL_HFILE_QUEUE_INIT_SIZE);<a name="line.124"></a>
+<span class="sourceLineNo">125</span> largeFileQueue = new StealJobQueue<>(largeQueueInitSize, smallQueueInitSize, COMPARATOR);<a name="line.125"></a>
+<span class="sourceLineNo">126</span> smallFileQueue = largeFileQueue.getStealFromQueue();<a name="line.126"></a>
+<span class="sourceLineNo">127</span> largeFileDeleteThreadNumber =<a name="line.127"></a>
+<span class="sourceLineNo">128</span> conf.getInt(LARGE_HFILE_DELETE_THREAD_NUMBER, DEFAULT_LARGE_HFILE_DELETE_THREAD_NUMBER);<a name="line.128"></a>
+<span class="sourceLineNo">129</span> smallFileDeleteThreadNumber =<a name="line.129"></a>
+<span class="sourceLineNo">130</span> conf.getInt(SMALL_HFILE_DELETE_THREAD_NUMBER, DEFAULT_SMALL_HFILE_DELETE_THREAD_NUMBER);<a name="line.130"></a>
+<span class="sourceLineNo">131</span> cleanerThreadTimeoutMsec =<a name="line.131"></a>
+<span class="sourceLineNo">132</span> conf.getLong(HFILE_DELETE_THREAD_TIMEOUT_MSEC, DEFAULT_HFILE_DELETE_THREAD_TIMEOUT_MSEC);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> cleanerThreadCheckIntervalMsec =<a name="line.133"></a>
+<span class="sourceLineNo">134</span> conf.getLong(HFILE_DELETE_THREAD_CHECK_INTERVAL_MSEC,<a name="line.134"></a>
+<span class="sourceLineNo">135</span> DEFAULT_HFILE_DELETE_THREAD_CHECK_INTERVAL_MSEC);<a name="line.135"></a>
+<span class="sourceLineNo">136</span> startHFileDeleteThreads();<a name="line.136"></a>
+<span class="sourceLineNo">137</span> }<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span> @Override<a name="line.139"></a>
+<span class="sourceLineNo">140</span> protected boolean validate(Path file) {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> if (HFileLink.isBackReferencesDir(file) || HFileLink.isBackReferencesDir(file.getParent())) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> return true;<a name="line.142"></a>
+<span class="sourceLineNo">143</span> }<a name="line.143"></a>
+<span class="sourceLineNo">144</span> return StoreFileInfo.validateStoreFileName(file.getName());<a name="line.144"></a>
+<span class="sourceLineNo">145</span> }<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span> /**<a name="line.147"></a>
+<span class="sourceLineNo">148</span> * Exposed for TESTING!<a name="line.148"></a>
+<span class="sourceLineNo">149</span> */<a name="line.149"></a>
+<span class="sourceLineNo">150</span> public List<BaseHFileCleanerDelegate> getDelegatesForTesting() {<a name="line.150"></a>
+<span class="sourceLineNo">151</span> return this.cleanersChain;<a name="line.151"></a>
+<span class="sourceLineNo">152</span> }<a name="line.152"></a>
+<span class="sourceLineNo">153</span><a name="line.153"></a>
+<span class="sourceLineNo">154</span> @Override<a name="line.154"></a>
+<span class="sourceLineNo">155</span> public int deleteFiles(Iterable<FileStatus> filesToDelete) {<a name="line.155"></a>
+<span class="sourceLineNo">156</span> int deletedFiles = 0;<a name="line.156"></a>
+<span class="sourceLineNo">157</span> List<HFileDeleteTask> tasks = new ArrayList<HFileDeleteTask>();<a name="line.157"></a>
+<span class="sourceLineNo">158</span> // construct delete tasks and add into relative queue<a name="line.158"></a>
+<span class="sourceLineNo">159</span> for (FileStatus file : filesToDelete) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span> HFileDeleteTask task = deleteFile(file);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> if (task != null) {<a name="line.161"></a>
+<span class="sourceLineNo">162</span> tasks.add(task);<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> // wait for each submitted task to finish<a name="line.165"></a>
+<span class="sourceLineNo">166</span> for (HFileDeleteTask task : tasks) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span> if (task.getResult(cleanerThreadCheckIntervalMsec)) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> deletedFiles++;<a name="line.168"></a>
+<span class="sourceLineNo">169</span> }<a name="line.169"></a>
+<span class="sourceLineNo">170</span> }<a name="line.170"></a>
+<span class="sourceLineNo">171</span> return deletedFiles;<a name="line.171"></a>
+<span class="sourceLineNo">172</span> }<a name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span> /**<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * Construct an {@link HFileDeleteTask} for each file to delete and add into the correct queue<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * @param file the file to delete<a name="line.176"></a>
+<span class="sourceLineNo">177</span> * @return HFileDeleteTask to track progress<a name="line.177"></a>
+<span class="sourceLineNo">178</span> */<a name="line.178"></a>
+<span class="sourceLineNo">179</span> private HFileDeleteTask deleteFile(FileStatus file) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> HFileDeleteTask task = new HFileDeleteTask(file, cleanerThreadTimeoutMsec);<a name="line.180"></a>
+<span class="sourceLineNo">181</span> boolean enqueued = dispatch(task);<a name="line.181"></a>
+<span class="sourceLineNo">182</span> return enqueued ? task : null;<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> private boolean dispatch(HFileDeleteTask task) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span> if (task.fileLength >= this.throttlePoint) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span> if (!this.largeFileQueue.offer(task)) {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> // should never arrive here as long as we use PriorityQueue<a name="line.188"></a>
+<span class="sourceLineNo">189</span> LOG.trace("Large file deletion queue is full");<a name="line.189"></a>
+<span class="sourceLineNo">190</span> return false;<a name="line.190"></a>
+<span class="sourceLineNo">191</span> }<a name="line.191"></a>
+<span class="sourceLineNo">192</span> } else {<a name="line.192"></a>
+<span class="sourceLineNo">193</span> if (!this.smallFileQueue.offer(task)) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span> // should never arrive here as long as we use PriorityQueue<a name="line.194"></a>
+<span class="sourceLineNo">195</span> LOG.trace("Small file deletion queue is full");<a name="line.195"></a>
+<span class="sourceLineNo">196</span> return false;<a name="line.196"></a>
+<span class="sourceLineNo">197</span> }<a name="line.197"></a>
+<span class="sourceLineNo">198</span> }<a name="line.198"></a>
+<span class="sourceLineNo">199</span> return true;<a name="line.199"></a>
+<span class="sourceLineNo">200</span> }<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span> @Override<a name="line.202"></a>
+<span class="sourceLineNo">203</span> public synchronized void cleanup() {<a name="line.203"></a>
+<span class="sourceLineNo">204</span> super.cleanup();<a name="line.204"></a>
+<span class="sourceLineNo">205</span> stopHFileDeleteThreads();<a name="line.205"></a>
+<span class="sourceLineNo">206</span> }<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span> /**<a name="line.208"></a>
+<span class="sourceLineNo">209</span> * Start threads for hfile deletion<a name="line.209"></a>
+<span class="sourceLineNo">210</span> */<a name="line.210"></a>
+<span class="sourceLineNo">211</span> private void startHFileDeleteThreads() {<a name="line.211"></a>
+<span class="sourceLineNo">212</span> final String n = Thread.currentThread().getName();<a name="line.212"></a>
+<span class="sourceLineNo">213</span> running = true;<a name="line.213"></a>
+<span class="sourceLineNo">214</span> // start thread for large file deletion<a name="line.214"></a>
+<span class="sourceLineNo">215</span> for (int i = 0; i < largeFileDeleteThreadNumber; i++) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> Thread large = new Thread() {<a name="line.216"></a>
+<span class="sourceLineNo">217</span> @Override<a name="line.217"></a>
+<span class="sourceLineNo">218</span> public void run() {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> consumerLoop(largeFileQueue);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> }<a name="line.220"></a>
+<span class="sourceLineNo">221</span> };<a name="line.221"></a>
+<span class="sourceLineNo">222</span> large.setDaemon(true);<a name="line.222"></a>
+<span class="sourceLineNo">223</span> large.setName(n + "-HFileCleaner.large." + i + "-" + System.currentTimeMillis());<a name="line.223"></a>
+<span class="sourceLineNo">224</span> large.start();<a name="line.224"></a>
+<span class="sourceLineNo">225</span> LOG.debug("Starting for large file={}", large);<a name="line.225"></a>
+<span class="sourceLineNo">226</span> threads.add(large);<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> // start thread for small file deletion<a name="line.229"></a>
+<span class="sourceLineNo">230</span> for (int i = 0; i < smallFileDeleteThreadNumber; i++) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> Thread small = new Thread() {<a name="line.231"></a>
+<span class="sourceLineNo">232</span> @Override<a name="line.232"></a>
+<span class="sourceLineNo">233</span> public void run() {<a name="line.233"></a>
+<span class="sourceLineNo">234</span> consumerLoop(smallFileQueue);<a name="line.234"></a>
+<span class="sourceLineNo">235</span> }<a name="line.235"></a>
+<span class="sourceLineNo">236</span> };<a name="line.236"></a>
+<span class="sourceLineNo">237</span> small.setDaemon(true);<a name="line.237"></a>
+<span class="sourceLineNo">238</span> small.setName(n + "-HFileCleaner.small." + i + "-" + System.currentTimeMillis());<a name="line.238"></a>
+<span class="sourceLineNo">239</span> small.start();<a name="line.239"></a>
+<span class="sourceLineNo">240</span> LOG.debug("Starting for small files={}", small);<a name="line.240"></a>
+<span class="sourceLineNo">241</span> threads.add(small);<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><a name="line.244"></a>
+<span class="sourceLineNo">245</span> protected void consumerLoop(BlockingQueue<HFileDeleteTask> queue) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span> try {<a name="line.246"></a>
+<span class="sourceLineNo">247</span> while (running) {<a name="line.247"></a>
+<span class="sourceLineNo">248</span> HFileDeleteTask task = null;<a name="line.248"></a>
+<span class="sourceLineNo">249</span> try {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> task = queue.take();<a name="line.250"></a>
+<span class="sourceLineNo">251</span> } catch (InterruptedException e) {<a name="line.251"></a>
+<span class="sourceLineNo">252</span> LOG.trace("Interrupted while trying to take a task from queue", e);<a name="line.252"></a>
+<span class="sourceLineNo">253</span> break;<a name="line.253"></a>
+<span class="sourceLineNo">254</span> }<a name="line.254"></a>
+<span class="sourceLineNo">255</span> if (task != null) {<a name="line.255"></a>
+<span class="sourceLineNo">256</span> LOG.trace("Removing {}", task.filePath);<a name="line.256"></a>
+<span class="sourceLineNo">257</span> boolean succeed;<a name="line.257"></a>
+<span class="sourceLineNo">258</span> try {<a name="line.258"></a>
+<span class="sourceLineNo">259</span> succeed = this.fs.delete(task.filePath, false);<a name="line.259"></a>
+<span class="sourceLineNo">260</span> } catch (IOException e) {<a name="line.260"></a>
+<span class="sourceLineNo">261</span> LOG.warn("Failed to delete {}", task.filePath, e);<a name="line.261"></a>
+<span class="sourceLineNo">262</span> succeed = false;<a name="line.262"></a>
+<span class="sourceLineNo">263</span> }<a name="line.263"></a>
+<span class="sourceLineNo">264</span> task.setResult(succeed);<a name="line.264"></a>
+<span class="sourceLineNo">265</span> if (succeed) {<a name="line.265"></a>
+<span class="sourceLineNo">266</span> countDeletedFiles(task.fileLength >= throttlePoint, queue == largeFileQueue);<a name="line.266"></a>
+<span class="sourceLineNo">267</span> }<a name="line.267"></a>
+<span class="sourceLineNo">268</span> }<a name="line.268"></a>
<span class="sourceLineNo">269</span> }<a name="line.269"></a>
-<span class="sourceLineNo">270</span> if (fromLargeQueue) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> LOG.trace("Stolen a small file deletion task in large file thread");<a name="line.271"></a>
-<span class="sourceLineNo">272</span> }<a name="line.272"></a>
-<span class="sourceLineNo">273</span> deletedSmallFiles.incrementAndGet();<a name="line.273"></a>
-<span class="sourceLineNo">274</span> }<a name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span><a name="line.276"></a>
-<span class="sourceLineNo">277</span> /**<a name="line.277"></a>
-<span class="sourceLineNo">278</span> * Stop threads for hfile deletion<a name="line.278"></a>
-<span class="sourceLineNo">279</span> */<a name="line.279"></a>
-<span class="sourceLineNo">280</span> private void stopHFileDeleteThreads() {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> running = false;<a name="line.281"></a>
-<span class="sourceLineNo">282</span> LOG.debug("Stopping file delete threads");<a name="line.282"></a>
-<span class="sourceLineNo">283</span> for(Thread thread: threads){<a name="line.283"></a>
-<span class="sourceLineNo">284</span> thread.interrupt();<a name="line.284"></a>
-<span class="sourceLineNo">285</span> }<a name="line.285"></a>
-<span class="sourceLineNo">286</span> }<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span> private static final Comparator<HFileDeleteTask> COMPARATOR = new Comparator<HFileDeleteTask>() {<a name="line.288"></a>
-<span class="sourceLineNo">289</span><a name="line.289"></a>
-<span class="sourceLineNo">290</span> @Override<a name="line.290"></a>
-<span class="sourceLineNo">291</span> public int compare(HFileDeleteTask o1, HFileDeleteTask o2) {<a name="line.291"></a>
-<span class="sourceLineNo">292</span> // larger file first so reverse compare<a name="line.292"></a>
-<span class="sourceLineNo">293</span> int cmp = Long.compare(o2.fileLength, o1.fileLength);<a name="line.293"></a>
-<span class="sourceLineNo">294</span> if (cmp != 0) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> return cmp;<a name="line.295"></a>
-<span class="sourceLineNo">296</span> }<a name="line.296"></a>
-<span class="sourceLineNo">297</span> // just use hashCode to generate a stable result.<a name="line.297"></a>
-<span class="sourceLineNo">298</span> return System.identityHashCode(o1) - System.identityHashCode(o2);<a name="line.298"></a>
-<span class="sourceLineNo">299</span> }<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">302</span> private static final class HFileDeleteTask {<a name="line.302"></a>
-<span class="sourceLineNo">303</span> private static final long MAX_WAIT = 60 * 1000L;<a name="line.303"></a>
-<span class="sourceLineNo">304</span> private static final long WAIT_UNIT = 1000L;<a name="line.304"></a>
+<span class="sourceLineNo">270</span> } finally {<a name="line.270"></a>
+<span class="sourceLineNo">271</span> LOG.debug("Exit {}", Thread.currentThread());<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><a name="line.274"></a>
+<span class="sourceLineNo">275</span> // Currently only for testing purpose<a name="line.275"></a>
+<span class="sourceLineNo">276</span> private void countDeletedFiles(boolean isLargeFile, boolean fromLargeQueue) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span> if (isLargeFile) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> if (deletedLargeFiles.get() == Long.MAX_VALUE) {<a name="line.278"></a>
+<span class="sourceLineNo">279</span> LOG.debug("Deleted more than Long.MAX_VALUE large files, reset counter to 0");<a name="line.279"></a>
+<span class="sourceLineNo">280</span> deletedLargeFiles.set(0L);<a name="line.280"></a>
+<span class="sourceLineNo">281</span> }<a name="line.281"></a>
+<span class="sourceLineNo">282</span> deletedLargeFiles.incrementAndGet();<a name="line.282"></a>
+<span class="sourceLineNo">283</span> } else {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> if (deletedSmallFiles.get() == Long.MAX_VALUE) {<a name="line.284"></a>
+<span class="sourceLineNo">285</span> LOG.debug("Deleted more than Long.MAX_VALUE small files, reset counter to 0");<a name="line.285"></a>
+<span class="sourceLineNo">286</span> deletedSmallFiles.set(0L);<a name="line.286"></a>
+<span class="sourceLineNo">287</span> }<a name="line.287"></a>
+<span class="sourceLineNo">288</span> if (fromLargeQueue) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> LOG.trace("Stolen a small file deletion task in large file thread");<a name="line.289"></a>
+<span class="sourceLineNo">290</span> }<a name="line.290"></a>
+<span class="sourceLineNo">291</span> deletedSmallFiles.incrementAndGet();<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><a name="line.294"></a>
+<span class="sourceLineNo">295</span> /**<a name="line.295"></a>
+<span class="sourceLineNo">296</span> * Stop threads for hfile deletion<a name="line.296"></a>
+<span class="sourceLineNo">297</span> */<a name="line.297"></a>
+<span class="sourceLineNo">298</span> private void stopHFileDeleteThreads() {<a name="line.298"></a>
+<span class="sourceLineNo">299</span> running = false;<a name="line.299"></a>
+<span class="sourceLineNo">300</span> LOG.debug("Stopping file delete threads");<a name="line.300"></a>
+<span class="sourceLineNo">301</span> for(Thread thread: threads){<a name="line.301"></a>
+<span class="sourceLineNo">302</span> thread.interrupt();<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> boolean done = false;<a name="line.306"></a>
-<span class="sourceLineNo">307</span> boolean result;<a name="line.307"></a>
-<span class="sourceLineNo">308</span> final Path filePath;<a name="line.308"></a>
-<span class="sourceLineNo">309</span> final long fileLength;<a name="line.309"></a>
-<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span> public HFileDeleteTask(FileStatus file) {<a name="line.311"></a>
-<span class="sourceLineNo">312</span> this.filePath = file.getPath();<a name="line.312"></a>
-<span class="sourceLineNo">313</span> this.fileLength = file.getLen();<a name="line.313"></a>
-<span class="sourceLineNo">314</span> }<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span> public synchronized void setResult(boolean result) {<a name="line.316"></a>
-<span class="sourceLineNo">317</span> this.done = true;<a name="line.317"></a>
-<span class="sourceLineNo">318</span> this.result = result;<a name="line.318"></a>
-<span class="sourceLineNo">319</span> notify();<a name="line.319"></a>
-<span class="sourceLineNo">320</span> }<a name="line.320"></a>
+<span class="sourceLineNo">306</span> private static final Comparator<HFileDeleteTask> COMPARATOR = new Comparator<HFileDeleteTask>() {<a name="line.306"></a>
+<span class="sourceLineNo">307</span><a name="line.307"></a>
+<span class="sourceLineNo">308</span> @Override<a name="line.308"></a>
+<span class="sourceLineNo">309</span> public int compare(HFileDeleteTask o1, HFileDeleteTask o2) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> // larger file first so reverse compare<a name="line.310"></a>
+<span class="sourceLineNo">311</span> int cmp = Long.compare(o2.fileLength, o1.fileLength);<a name="line.311"></a>
+<span class="sourceLineNo">312</span> if (cmp != 0) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span> return cmp;<a name="line.313"></a>
+<span class="sourceLineNo">314</span> }<a name="line.314"></a>
+<span class="sourceLineNo">315</span> // just use hashCode to generate a stable result.<a name="line.315"></a>
+<span class="sourceLineNo">316</span> return System.identityHashCode(o1) - System.identityHashCode(o2);<a name="line.316"></a>
+<span class="sourceLineNo">317</span> }<a name="line.317"></a>
+<span class="sourceLineNo">318</span> };<a name="line.318"></a>
+<span class="sourceLineNo">319</span><a name="line.319"></a>
+<span class="sourceLineNo">320</span> private static final class HFileDeleteTask {<a name="line.320"></a>
<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> public synchronized boolean getResult() {<a name="line.322"></a>
-<span class="sourceLineNo">323</span> long waitTime = 0;<a name="line.323"></a>
-<span class="sourceLineNo">324</span> try {<a name="line.324"></a>
-<span class="sourceLineNo">325</span> while (!done) {<a name="line.325"></a>
-<span class="sourceLineNo">326</span> wait(WAIT_UNIT);<a name="line.326"></a>
-<span class="sourceLineNo">327</span> waitTime += WAIT_UNIT;<a name="line.327"></a>
-<span class="sourceLineNo">328</span> if (done) {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> return this.result;<a name="line.329"></a>
-<span class="sourceLineNo">330</span> }<a name="line.330"></a>
-<span class="sourceLineNo">331</span> if (waitTime > MAX_WAIT) {<a name="line.331"></a>
-<span class="sourceLineNo">332</span> LOG.warn("Wait more than " + MAX_WAIT + " ms for deleting " + this.filePath<a name="line.332"></a>
-<span class="sourceLineNo">333</span> + ", exit...");<a name="line.333"></a>
-<span class="sourceLineNo">334</span> return false;<a name="line.334"></a>
-<span class="sourceLineNo">335</span> }<a name="line.335"></a>
-<span class="sourceLineNo">336</span> }<a name="line.336"></a>
-<span class="sourceLineNo">337</span> } catch (InterruptedException e) {<a name="line.337"></a>
-<span class="sourceLineNo">338</span> LOG.warn("Interrupted while waiting for result of deleting " + filePath<a name="line.338"></a>
-<span class="sourceLineNo">339</span> + ", will return false", e);<a name="line.339"></a>
-<span class="sourceLineNo">340</span> return false;<a name="line.340"></a>
-<span class="sourceLineNo">341</span> }<a name="line.341"></a>
-<span class="sourceLineNo">342</span> return this.result;<a name="line.342"></a>
-<span class="sourceLineNo">343</span> }<a name="line.343"></a>
-<span class="sourceLineNo">344</span> }<a name="line.344"></a>
-<span class="sourceLineNo">345</span><a name="line.345"></a>
-<span class="sourceLineNo">346</span> @VisibleForTesting<a name="line.346"></a>
-<span class="sourceLineNo">347</span> public List<Thread> getCleanerThreads() {<a name="line.347"></a>
-<span class="sourceLineNo">348</span> return threads;<a name="line.348"></a>
-<span class="sourceLineNo">349</span> }<a name="line.349"></a>
-<span class="sourceLineNo">350</span><a name="line.350"></a>
-<span class="sourceLineNo">351</span> @VisibleForTesting<a name="line.351"></a>
-<span class="sourceLineNo">352</span> public long getNumOfDeletedLargeFiles() {<a name="line.352"></a>
-<span class="sourceLineNo">353</span> return deletedLargeFiles.get();<a name="line.353"></a>
-<span class="sourceLineNo">354</span> }<a name="line.354"></a>
-<span class="sourceLineNo">355</span><a name="line.355"></a>
-<span class="sourceLineNo">356</span> @VisibleForTesting<a name="line.356"></a>
-<span class="sourceLineNo">357</span> public long getNumOfDeletedSmallFiles() {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> return deletedSmallFiles.get();<a name="line.358"></a>
-<span class="sourceLineNo">359</span> }<a name="line.359"></a>
-<span class="sourceLineNo">360</span><a name="line.360"></a>
-<span class="sourceLineNo">361</span> @VisibleForTesting<a name="line.361"></a>
-<span class="sourceLineNo">362</span> public long getLargeQueueInitSize() {<a name="line.362"></a>
-<span class="sourceLineNo">363</span> return largeQueueInitSize;<a name="line.363"></a>
+<span class="sourceLineNo">322</span> boolean done = false;<a name="line.322"></a>
+<span class="sourceLineNo">323</span> boolean result;<a name="line.323"></a>
+<span class="sourceLineNo">324</span> final Path filePath;<a name="line.324"></a>
+<span class="sourceLineNo">325</span> final long fileLength;<a name="line.325"></a>
+<span class="sourceLineNo">326</span> final long timeoutMsec;<a name="line.326"></a>
+<span class="sourceLineNo">327</span><a name="line.327"></a>
+<span class="sourceLineNo">328</span> public HFileDeleteTask(FileStatus file, long timeoutMsec) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span> this.filePath = file.getPath();<a name="line.329"></a>
+<span class="sourceLineNo">330</span> this.fileLength = file.getLen();<a name="line.330"></a>
+<span class="sourceLineNo">331</span> this.timeoutMsec = timeoutMsec;<a name="line.331"></a>
+<span class="sourceLineNo">332</span> }<a name="line.332"></a>
+<span class="sourceLineNo">333</span><a name="line.333"></a>
+<span class="sourceLineNo">334</span> public synchronized void setResult(boolean result) {<a name="line.334"></a>
+<span class="sourceLineNo">335</span> this.done = true;<a name="line.335"></a>
+<span class="sourceLineNo">336</span> this.result = result;<a name="line.336"></a>
+<span class="sourceLineNo">337</span> notify();<a name="line.337"></a>
+<span class="sourceLineNo">338</span> }<a name="line.338"></a>
+<span class="sourceLineNo">339</span><a name="line.339"></a>
+<span class="sourceLineNo">340</span> public synchronized boolean getResult(long waitIfNotFinished) {<a name="line.340"></a>
+<span class="sourceLineNo">341</span> long waitTimeMsec = 0;<a name="line.341"></a>
+<span class="sourceLineNo">342</span> try {<a name="line.342"></a>
+<span class="sourceLineNo">343</span> while (!done) {<a name="line.343"></a>
+<span class="sourceLineNo">344</span> long startTimeNanos = System.nanoTime();<a name="line.344"></a>
+<span class="sourceLineNo">345</span> wait(waitIfNotFinished);<a name="line.345"></a>
+<span class="sourceLineNo">346</span> waitTimeMsec += TimeUnit.MILLISECONDS.convert(System.nanoTime() - startTimeNanos,<a name="line.346"></a>
+<span class="sourceLineNo">347</span> TimeUnit.NANOSECONDS);<a name="line.347"></a>
+<span class="sourceLineNo">348</span> if (done) {<a name="line.348"></a>
+<span class="sourceLineNo">349</span> return this.result;<a name="line.349"></a>
+<span class="sourceLineNo">350</span> }<a name="line.350"></a>
+<span class="sourceLineNo">351</span> if (waitTimeMsec > timeoutMsec) {<a name="line.351"></a>
+<span class="sourceLineNo">352</span> LOG.warn("Wait more than " + timeoutMsec + " ms for deleting " + this.filePath<a name="line.352"></a>
+<span class="sourceLineNo">353</span> + ", exit...");<a name="line.353"></a>
+<span class="sourceLineNo">354</span> return false;<a name="line.354"></a>
+<span class="sourceLineNo">355</span> }<a name="line.355"></a>
+<span class="sourceLineNo">356</span> }<a name="line.356"></a>
+<span class="sourceLineNo">357</span> } catch (InterruptedException e) {<a name="line.357"></a>
+<span class="sourceLineNo">358</span> LOG.warn("Interrupted while waiting for result of deleting " + filePath<a name="line.358"></a>
+<span class="sourceLineNo">359</span> + ", will return false", e);<a name="line.359"></a>
+<span class="sourceLineNo">360</span> return false;<a name="line.360"></a>
+<span class="sourceLineNo">361</span> }<a name="line.361"></a>
+<span class="sourceLineNo">362</span> return this.result;<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> @VisibleForTesting<a name="line.366"></a>
-<span class="sourceLineNo">367</span> public long getSmallQueueInitSize() {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> return smallQueueInitSize;<a name="line.368"></a>
+<span class="sourceLineNo">367</span> public List<Thread> getCleanerThreads() {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> return threads;<a name="line.368"></a>
<span class="sourceLineNo">369</span> }<a name="line.369"></a>
<span class="sourceLineNo">370</span><a name="line.370"></a>
<span class="sourceLineNo">371</span> @VisibleForTesting<a name="line.371"></a>
-<span class="sourceLineNo">372</span> public long getThrottlePoint() {<a name="line.372"></a>
-<span class="sourceLineNo">373</span> return throttlePoint;<a name="line.373"></a>
+<span class="sourceLineNo">372</span> public long getNumOfDeletedLargeFiles() {<a name="line.372"></a>
+<span class="sourceLineNo">373</span> return deletedLargeFiles.get();<a name="line.373"></a>
<span class="sourceLineNo">374</span> }<a name="line.374"></a>
<span class="sourceLineNo">375</span><a name="line.375"></a>
-<span class="sourceLineNo">376</span> @Override<a name="line.376"></a>
-<span class="sourceLineNo">377</span> public void onConfigurationChange(Configuration conf) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span> super.onConfigurationChange(conf);<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span> if (!checkAndUpdateConfigurations(conf)) {<a name="line.380"></a>
-<span class="sourceLineNo">381</span> LOG.debug("Update configuration triggered but nothing changed for this cleaner");<a name="line.381"></a>
-<span class="sourceLineNo">382</span> return;<a name="line.382"></a>
-<span class="sourceLineNo">383</span> }<a name="line.383"></a>
-<span class="sourceLineNo">384</span> stopHFileDeleteThreads();<a name="line.384"></a>
-<span class="sourceLineNo">385</span> // record the left over tasks<a name="line.385"></a>
-<span class="sourceLineNo">386</span> List<HFileDeleteTask> leftOverTasks =<a name="line.386"></a>
-<span class="sourceLineNo">387</span> new ArrayList<>(largeFileQueue.size() + smallFileQueue.size());<a name="line.387"></a>
-<span class="sourceLineNo">388</span> leftOverTasks.addAll(largeFileQueue);<a name="line.388"></a>
-<span class="sourceLineNo">389</span> leftOverTasks.addAll(smallFileQueue);<a name="line.389"></a>
-<span class="sourceLineNo">390</span> largeFileQueue = new StealJobQueue<>(largeQueueInitSize, smallQueueInitSize, COMPARATOR);<a name="line.390"></a>
-<span class="sourceLineNo">391</span> smallFileQueue = largeFileQueue.getStealFromQueue();<a name="line.391"></a>
-<span class="sourceLineNo">392</span> threads.clear();<a name="line.392"></a>
-<span class="sourceLineNo">393</span> startHFileDeleteThreads();<a name="line.393"></a>
-<span class="sourceLineNo">394</span> // re-dispatch the left over tasks<a name="line.394"></a>
-<span class="sourceLineNo">395</span> for (HFileDeleteTask task : leftOverTasks) {<a name="line.395"></a>
-<span class="sourceLineNo">396</span> dispatch(task);<a name="line.396"></a>
-<span class="sourceLineNo">397</span> }<a name="line.397"></a>
-<span class="sourceLineNo">398</span> }<a name="line.398"></a>
-<span class="sourceLineNo">399</span><a name="line.399"></a>
-<span class="sourceLineNo">400</span> /**<a name="line.400"></a>
-<span class="sourceLineNo">401</span> * Check new configuration and update settings if value changed<a name="line.401"></a>
-<span class="sourceLineNo">402</span> * @param conf The new configuration<a name="line.402"></a>
-<span class="sourceLineNo">403</span> * @return true if any configuration for HFileCleaner changes, false if no change<a name="line.403"></a>
-<span class="sourceLineNo">404</span> */<a name="line.404"></a>
-<span class="sourceLineNo">405</span> private boolean checkAndUpdateConfigurations(Configuration conf) {<a name="line.405"></a>
-<span class="sourceLineNo">406</span> boolean updated = false;<a name="line.406"></a>
-<span class="sourceLineNo">407</span> int throttlePoint =<a name="line.407"></a>
-<span class="sourceLineNo">408</span> conf.getInt(HFILE_DELETE_THROTTLE_THRESHOLD, DEFAULT_HFILE_DELETE_THROTTLE_THRESHOLD);<a name="line.408"></a>
-<span class="sourceLineNo">409</span> if (throttlePoint != this.throttlePoint) {<a name="line.409"></a>
-<span class="sourceLineNo">410</span> LOG.debug("Updating throttle point, from {} to {}", this.throttlePoint, throttlePoint);<a name="line.410"></a>
-<span class="sourceLineNo">411</span> this.throttlePoint = throttlePoint;<a name="line.411"></a>
-<span class="sourceLineNo">412</span> updated = true;<a name="line.412"></a>
+<span class="sourceLineNo">376</span> @VisibleForTesting<a name="line.376"></a>
+<span class="sourceLineNo">377</span> public long getNumOfDeletedSmallFiles() {<a name="line.377"></a>
+<span class="sourceLineNo">378</span> return deletedSmallFiles.get();<a name="line.378"></a>
+<span class="sourceLineNo">379</span> }<a name="line.379"></a>
+<span class="sourceLineNo">380</span><a name="line.380"></a>
+<span class="sourceLineNo">381</span> @VisibleForTesting<a name="line.381"></a>
+<span class="sourceLineNo">382</span> public long getLargeQueueInitSize() {<a name="line.382"></a>
+<span class="sourceLineNo">383</span> return largeQueueInitSize;<a name="line.383"></a>
+<span class="sourceLineNo">384</span> }<a name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span> @VisibleForTesting<a name="line.386"></a>
+<span class="sourceLineNo">387</span> public long getSmallQueueInitSize() {<a name="line.387"></a>
+<span class="sourceLineNo">388</span> return smallQueueInitSize;<a name="line.388"></a>
+<span class="sourceLineNo">389</span> }<a name="line.389"></a>
+<span class="sourceLineNo">390</span><a name="line.390"></a>
+<span class="sourceLineNo">391</span> @VisibleForTesting<a name="line.391"></a>
+<span class="sourceLineNo">392</span> public long getThrottlePoint() {<a name="line.392"></a>
+<span class="sourceLineNo">393</span> return throttlePoint;<a name="line.393"></a>
+<span class="sourceLineNo">394</span> }<a name="line.394"></a>
+<span class="sourceLineNo">395</span><a name="line.395"></a>
+<span class="sourceLineNo">396</span> @VisibleForTesting<a name="line.396"></a>
+<span class="sourceLineNo">397</span> long getCleanerThreadTimeoutMsec() {<a name="line.397"></a>
+<span class="sourceLineNo">398</span> return cleanerThreadTimeoutMsec;<a name="line.398"></a>
+<span class="sourceLineNo">399</span> }<a name="line.399"></a>
+<span class="sourceLineNo">400</span><a name="line.400"></a>
+<span class="sourceLineNo">401</span> @VisibleForTesting<a name="line.401"></a>
+<span class="sourceLineNo">402</span> long getCleanerThreadCheckIntervalMsec() {<a name="line.402"></a>
+<span class="sourceLineNo">403</span> return cleanerThreadCheckIntervalMsec;<a name="line.403"></a>
+<span class="sourceLineNo">404</span> }<a name="line.404"></a>
+<span class="sourceLineNo">405</span><a name="line.405"></a>
+<span class="sourceLineNo">406</span> @Override<a name="line.406"></a>
+<span class="sourceLineNo">407</span> public void onConfigurationChange(Configuration conf) {<a name="line.407"></a>
+<span class="sourceLineNo">408</span> super.onConfigurationChange(conf);<a name="line.408"></a>
+<span class="sourceLineNo">409</span><a name="line.409"></a>
+<span class="sourceLineNo">410</span> if (!checkAndUpdateConfigurations(conf)) {<a name="line.410"></a>
+<span class="sourceLineNo">411</span> LOG.debug("Update configuration triggered but nothing changed for this cleaner");<a name="line.411"></a>
+<span class="sourceLineNo">412</span> return;<a name="line.412"></a>
<span class="sourceLineNo">413</span> }<a name="line.413"></a>
-<span class="sourceLineNo">414</span> int largeQueueInitSize =<a name="line.414"></a>
-<span class="sourceLineNo">415</span> conf.getInt(LARGE_HFILE_QUEUE_INIT_SIZE, DEFAULT_LARGE_HFILE_QUEUE_INIT_SIZE);<a name="line.415"></a>
-<span class="sourceLineNo">416</span> if (largeQueueInitSize != this.largeQueueInitSize) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span> LOG.debug("Updating largeQueueInitSize, from {} to {}", this.largeQueueInitSize,<a name="line.417"></a>
-<span class="sourceLineNo">418</span> largeQueueInitSize);<a name="line.418"></a>
-<span class="sourceLineNo">419</span> this.largeQueueInitSize = largeQueueInitSize;<a name="line.419"></a>
-<span class="sourceLineNo">420</span> updated = true;<a name="line.420"></a>
-<span class="sourceLineNo">421</span> }<a name="line.421"></a>
-<span class="sourceLineNo">422</span> int smallQueueInitSize =<a name="line.422"></a>
-<span class="sourceLineNo">423</span> conf.getInt(SMALL_HFILE_QUEUE_INIT_SIZE, DEFAULT_SMALL_HFILE_QUEUE_INIT_SIZE);<a name="line.423"></a>
-<span class="sourceLineNo">424</span> if (smallQueueInitSize != this.smallQueueInitSize) {<a name="line.424"></a>
-<span class="sourceLineNo">425</span> LOG.debug("Updating smallQueueInitSize, from {} to {}", this.smallQueueInitSize,<a name="line.425"></a>
-<span class="sourceLineNo">426</span> smallQueueInitSize);<a name="line.426"></a>
-<span class="sourceLineNo">427</span> this.smallQueueInitSize = smallQueueInitSize;<a name="line.427"></a>
-<span class="sourceLineNo">428</span> updated = true;<a name="line.428"></a>
-<span class="sourceLineNo">429</span> }<a name="line.429"></a>
-<span class="sourceLineNo">430</span> int largeFileDeleteThreadNumber =<a name="line.430"></a>
-<span class="sourceLineNo">431</span> conf.getInt(LARGE_HFILE_DELETE_THREAD_NUMBER, DEFAULT_LARGE_HFILE_DELETE_THREAD_NUMBER);<a name="line.431"></a>
-<span class="sourceLineNo">432</span> if (largeFileDeleteThreadNumber != this.largeFileDeleteThreadNumber) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> LOG.debug("Updating largeFileDeleteThreadNumber, from {} to {}",<a name="line.433"></a>
-<span class="sourceLineNo">434</span> this.largeFileDeleteThreadNumber, largeFileDeleteThreadNumber);<a name="line.434"></a>
-<span class="sourceLineNo">435</span> this.largeFileDeleteThreadNumber = largeFileDeleteThreadNumber;<a name="line.435"></a>
-<span class="sourceLineNo">436</span> updated = true;<a name="line.436"></a>
-<span class="sourceLineNo">437</span> }<a name="line.437"></a>
-<span class="sourceLineNo">438</span> int smallFileDeleteThreadNumber =<a name="line.438"></a>
-<span class="sourceLineNo">439</span> conf.getInt(SMALL_HFILE_DELETE_THREAD_NUMBER, DEFAULT_SMALL_HFILE_DELETE_THREAD_NUMBER);<a name="line.439"></a>
-<span class="sourceLineNo">440</span> if (smallFileDeleteThreadNumber != this.smallFileDeleteThreadNumber) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span> LOG.debug("Updating smallFileDeleteThreadNumber, from {} to {}",<a name="line.441"></a>
-<span class="sourceLineNo">442</span> this.smallFileDeleteThreadNumber, smallFileDeleteThreadNumber);<a name="line.442"></a>
-<span class="sourceLineNo">443</span> this.smallFileDeleteThreadNumber = smallFileDeleteThreadNumber;<a name="line.443"></a>
-<span class="sourceLineNo">444</span> updated = true;<a name="line.444"></a>
-<span class="sourceLineNo">445</span> }<a name="line.445"></a>
-<span class="sourceLineNo">446</span> return updated;<a name="line.446"></a>
-<span class="sourceLineNo">447</span> }<a name="line.447"></a>
-<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span> @Override<a name="line.449"></a>
-<span class="sourceLineNo">450</span> public synchronized void cancel(boolean mayInterruptIfRunning) {<a name="line.450"></a>
-<span class="sourceLineNo">451</span> super.cancel(mayInterruptIfRunning);<a name="line.451"></a>
-<span class="sourceLineNo">452</span> for (Thread t: this.threads) {<a name="line.452"></a>
-<span class="sourceLineNo">453</span> t.interrupt();<a name="line.453"></a>
-<span class="sourceLineNo">454</span> }<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">414</span> stopHFileDeleteThreads();<a name="line.414"></a>
+<span class="sourceLineNo">415</span> // record the left over tasks<a name="line.415"></a>
+<span class="sourceLineNo">416</span> List<HFileDeleteTask> leftOverTasks =<a name="line.416"></a>
+<span class="sourceLineNo">417</span> new ArrayList<>(largeFileQueue.size() + smallFileQueue.size());<a name="line.417"></a>
+<span class="sourceLineNo">418</span> leftOverTasks.addAll(largeFileQueue);<a name="line.418"></a>
+<span class="sourceLineNo">419</span> leftOverTasks.addAll(smallFileQueue);<a name="line.419"></a>
+<span class="sourceLineNo">420</span> largeFileQueue = new StealJobQueue<>(largeQueueInitSize, smallQueueInitSize, COMPARATOR);<a name="line.420"></a>
+<span class="sourceLineNo">421</span> smallFileQueue = largeFileQueue.getStealFromQueue();<a name="line.421"></a>
+<span class="sourceLineNo">422</span> threads.clear();<a name="line.422"></a>
+<span class="sourceLineNo">423</span> startHFileDeleteThreads();<a name="line.423"></a>
+<span class="sourceLineNo">424</span> // re-dispatch the left over tasks<a name="line.424"></a>
+<span class="sourceLineNo">425</span> for (HFileDeleteTask task : leftOverTasks) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span> dispatch(task);<a name="line.426"></a>
+<span class="sourceLineNo">427</span> }<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> * Check new configuration and update settings if value changed<a name="line.431"></a>
+<span class="sourceLineNo">432</span> * @param conf The new configuration<a name="line.432"></a>
+<span class="sourceLineNo">433</span> * @return true if any configuration for HFileCleaner changes, false if no change<a name="line.433"></a>
+<span class="sourceLineNo">434</span> */<a name="line.434"></a>
+<span class="sourceLineNo">435</span> private boolean checkAndUpdateConfigurations(Configuration conf) {<a name="line.435"></a>
+<span class="sourceLineNo">436</span> boolean updated = false;<a name="line.436"></a>
+<span class="sourceLineNo">437</span> int throttlePoint =<a name="line.437"></a>
+<span class="sourceLineNo">438</span> conf.getInt(HFILE_DELETE_THROTTLE_THRESHOLD, DEFAULT_HFILE_DELETE_THROTTLE_THRESHOLD);<a name="line.438"></a>
+<span class="sourceLineNo">439</span> if (throttlePoint != this.throttlePoint) {<a name="line.439"></a>
+<span class="sourceLineNo">440</span> LOG.debug("Updating throttle point, from {} to {}", this.throttlePoint, throttlePoint);<a name="line.440"></a>
+<span class="sourceLineNo">441</span> this.throttlePoint = throttlePoint;<a name="line.441"></a>
+<span class="sourceLineNo">442</span> updated = true;<a name="line.442"></a>
+<span class="sourceLineNo">443</span> }<a name="line.443"></a>
+<span class="sourceLineNo">444</span> int largeQueueInitSize =<a name="line.444"></a>
+<span class="sourceLineNo">445</span> conf.getInt(LARGE_HFILE_QUEUE_INIT_SIZE, DEFAULT_LARGE_HFILE_QUEUE_INIT_SIZE);<a name="line.445"></a>
+<span class="sourceLineNo">446</span> if (largeQueueInitSize != this.largeQueueInitSize) {<a name="line.446"></a>
+<span class="sourceLineNo">447</span> LOG.debug("Updating largeQueueInitSize, from {} to {}", this.largeQueueInitSize,<a name="line.447"></a>
+<span class="sourceLineNo">448</span> largeQueueInitSize);<a name="line.448"></a>
+<span class="sourceLineNo">449</span> this.largeQueueInitSize = largeQueueInitSize;<a name="line.449"></a>
+<span class="sourceLineNo">450</span> updated = true;<a name="line.450"></a>
+<span class="sourceLineNo">451</span> }<a name="line.451"></a>
+<span class="sourceLineNo">452</span> int smallQueueInitSize =<a name="line.452"></a>
+<span class="sourceLineNo">453</span> conf.getInt(SMALL_HFILE_QUEUE_INIT_SIZE, DEFAULT_SMALL_HFILE_QUEUE_INIT_SIZE);<a name="line.453"></a>
+<span class="sourceLineNo">454</span> if (smallQueueInitSize != this.smallQueueInitSize) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span> LOG.debug("Updating smallQueueInitSize, from {} to {}", this.smallQueueInitSize,<a name="line.455"></a>
+<span class="sourceLineNo">456</span> smallQueueInitSize);<a name="line.456"></a>
+<span class="sourceLineNo">457</span> this.smallQueueInitSize = smallQueueInitSize;<a name="line.457"></a>
+<span class="sourceLineNo">458</span> updated = true;<a name="line.458"></a>
+<span class="sourceLineNo">459</span> }<a name="line.459"></a>
+<span class="sourceLineNo">460</span> int largeFileDeleteThreadNumber =<a name="line.460"></a>
+<span class="sourceLineNo">461</span> conf.getInt(LARGE_HFILE_DELETE_THREAD_NUMBER, DEFAULT_LARGE_HFILE_DELETE_THREAD_NUMBER);<a name="line.461"></a>
+<span class="sourceLineNo">462</span> if (largeFileDeleteThreadNumber != this.largeFileDeleteThreadNumber) {<a name="line.462"></a>
+<span class="sourceLineNo">463</span> LOG.debug("Updating largeFileDeleteThreadNumber, from {} to {}",<a name="line.463"></a>
+<span class="sourceLineNo">464</span> this.largeFileDeleteThreadNumber, largeFileDeleteThreadNumber);<a name="line.464"></a>
+<span class="sourceLineNo">465</span> this.largeFileDeleteThreadNumber = largeFileDeleteThreadNumber;<a name="line.465"></a>
+<span class="sourceLineNo">466</span> updated = true;<a name="line.466"></a>
+<span class="sourceLineNo">467</span> }<a name="line.467"></a>
+<span class="sourceLineNo">468</span> int smallFileDeleteThreadNumber =<a name="line.468"></a>
+<span class="sourceLineNo">469</span> conf.getInt(SMALL_HFILE_DELETE_THREAD_NUMBER, DEFAULT_SMALL_HFILE_DELETE_THREAD_NUMBER);<a name="line.469"></a>
+<span class="sourceLineNo">470</span> if (smallFileDeleteThreadNumber != this.smallFileDeleteThreadNumber) {<a name="line.470"></a>
+<span class="sourceLineNo">471</span> LOG.debug("Updating smallFileDeleteThreadNumber, from {} to {}",<a name="line.471"></a>
+<span class="sourceLineNo">472</span> this.smallFileDeleteThreadNumber, smallFileDeleteThreadNumber);<a name="line.472"></a>
+<span class="sourceLineNo">473</span> this.smallFileDeleteThreadNumber = smallFileDeleteThreadNumber;<a name="line.473"></a>
+<span class="sourceLineNo">474</span> updated = true;<a name="line.474"></a>
+<span class="sourceLineNo">475</span> }<a name="line.475"></a>
+<span class="sourceLineNo">476</span> long cleanerThreadTimeoutMsec =<a name="line.476"></a>
+<span class="sourceLineNo">477</span> conf.getLong(HFILE_DELETE_THREAD_TIMEOUT_MSEC, DEFAULT_HFILE_DELETE_THREAD_TIMEOUT_MSEC);<a name="line.477"></a>
+<span class="sourceLineNo">478</span> if (cleanerThreadTimeoutMsec != this.cleanerThreadTimeoutMsec) {<a name="line.478"></a>
+<span class="sourceLineNo">479</span> this.cleanerThreadTimeoutMsec = cleanerThreadTimeoutMsec;<a name="line.479"></a>
+<span class="sourceLineNo">480</span> updated = true;<a name="line.480"></a>
+<span class="sourceLineNo">481</span> }<a name="line.481"></a>
+<span class="sourceLineNo">482</span> long cleanerThreadCheckIntervalMsec =<a name="line.482"></a>
+<span class="sourceLineNo">483</span> conf.getLong(HFILE_DELETE_THREAD_CHECK_INTERVAL_MSEC,<a name="line.483"></a>
+<span class="sourceLineNo">484</span> DEFAULT_HFILE_DELETE_THREAD_CHECK_INTERVAL_MSEC);<a name="line.484"></a>
+<span class="sourceLineNo">485</span> if (cleanerThreadCheckIntervalMsec != this.cleanerThreadCheckIntervalMsec) {<a name="line.485"></a>
+<span class="sourceLineNo">486</span> this.cleanerThreadCheckIntervalMsec = cleanerThreadCheckIntervalMsec;<a name="line.486"></a>
+<span class="sourceLineNo">487</span> updated = true;<a name="line.487"></a>
+<span class="sourceLineNo">488</span> }<a name="line.488"></a>
+<span class="sourceLineNo">489</span> return updated;<a name="line.489"></a>
+<span class="sourceLineNo">490</span> }<a name="line.490"></a>
+<span class="sourceLineNo">491</span><a name="line.491"></a>
+<span class="sourceLineNo">492</span> @Override<a name="line.492"></a>
+<span class="sourceLineNo">493</span> public synchronized void cancel(boolean mayInterruptIfRunning) {<a name="line.493"></a>
+<span class="sourceLineNo">494</span> super.cancel(mayInterruptIfRunning);<a name="line.494"></a>
+<span class="sourceLineNo">495</span> for (Thread t: this.threads) {<a name="line.495"></a>
+<span class="sourceLineNo">496</span> t.interrupt();<a name="line.496"></a>
+<span class="sourceLineNo">497</span> }<a name="line.497"></a>
+<span class="sourceLineNo">498</span> }<a name="line.498"></a>
+<span class="sourceLineNo">499</span>}<a name="line.499"></a>