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

Reply via email to