http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b248f175/devapidocs/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html
 
b/devapidocs/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html
index cc0c78e..0a72cd3 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html
@@ -113,7 +113,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>private static final class <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.302">HFileCleaner.HFileDeleteTask</a>
+<pre>private static final class <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.320">HFileCleaner.HFileDeleteTask</a>
 extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a></pre>
 </li>
 </ul>
@@ -146,16 +146,12 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#filePath">filePath</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>private static long</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#MAX_WAIT">MAX_WAIT</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
 <td class="colFirst"><code>(package private) boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#result">result</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
-<td class="colFirst"><code>private static long</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#WAIT_UNIT">WAIT_UNIT</a></span></code>&nbsp;</td>
+<tr class="altColor">
+<td class="colFirst"><code>(package private) long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#timeoutMsec">timeoutMsec</a></span></code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -172,7 +168,8 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#HFileDeleteTask-org.apache.hadoop.fs.FileStatus-">HFileDeleteTask</a></span>(org.apache.hadoop.fs.FileStatus&nbsp;file)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#HFileDeleteTask-org.apache.hadoop.fs.FileStatus-long-">HFileDeleteTask</a></span>(org.apache.hadoop.fs.FileStatus&nbsp;file,
+               long&nbsp;timeoutMsec)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -191,7 +188,7 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#getResult--">getResult</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#getResult-long-">getResult</a></span>(long&nbsp;waitIfNotFinished)</code>&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>void</code></td>
@@ -219,39 +216,13 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <!--   -->
 </a>
 <h3>Field Detail</h3>
-<a name="MAX_WAIT">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>MAX_WAIT</h4>
-<pre>private static final&nbsp;long <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#line.303">MAX_WAIT</a></pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a 
href="../../../../../../constant-values.html#org.apache.hadoop.hbase.master.cleaner.HFileCleaner.HFileDeleteTask.MAX_WAIT">Constant
 Field Values</a></dd>
-</dl>
-</li>
-</ul>
-<a name="WAIT_UNIT">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>WAIT_UNIT</h4>
-<pre>private static final&nbsp;long <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#line.304">WAIT_UNIT</a></pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a 
href="../../../../../../constant-values.html#org.apache.hadoop.hbase.master.cleaner.HFileCleaner.HFileDeleteTask.WAIT_UNIT">Constant
 Field Values</a></dd>
-</dl>
-</li>
-</ul>
 <a name="done">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>done</h4>
-<pre>boolean <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#line.306">done</a></pre>
+<pre>boolean <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#line.322">done</a></pre>
 </li>
 </ul>
 <a name="result">
@@ -260,7 +231,7 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>result</h4>
-<pre>boolean <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#line.307">result</a></pre>
+<pre>boolean <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#line.323">result</a></pre>
 </li>
 </ul>
 <a name="filePath">
@@ -269,16 +240,25 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>filePath</h4>
-<pre>final&nbsp;org.apache.hadoop.fs.Path <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#line.308">filePath</a></pre>
+<pre>final&nbsp;org.apache.hadoop.fs.Path <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#line.324">filePath</a></pre>
 </li>
 </ul>
 <a name="fileLength">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>fileLength</h4>
-<pre>final&nbsp;long <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#line.309">fileLength</a></pre>
+<pre>final&nbsp;long <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#line.325">fileLength</a></pre>
+</li>
+</ul>
+<a name="timeoutMsec">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>timeoutMsec</h4>
+<pre>final&nbsp;long <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#line.326">timeoutMsec</a></pre>
 </li>
 </ul>
 </li>
@@ -289,13 +269,14 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="HFileDeleteTask-org.apache.hadoop.fs.FileStatus-">
+<a name="HFileDeleteTask-org.apache.hadoop.fs.FileStatus-long-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>HFileDeleteTask</h4>
-<pre>public&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#line.311">HFileDeleteTask</a>(org.apache.hadoop.fs.FileStatus&nbsp;file)</pre>
+<pre>public&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#line.328">HFileDeleteTask</a>(org.apache.hadoop.fs.FileStatus&nbsp;file,
+                       long&nbsp;timeoutMsec)</pre>
 </li>
 </ul>
 </li>
@@ -312,16 +293,16 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>setResult</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#line.316">setResult</a>(boolean&nbsp;result)</pre>
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#line.334">setResult</a>(boolean&nbsp;result)</pre>
 </li>
 </ul>
-<a name="getResult--">
+<a name="getResult-long-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getResult</h4>
-<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#line.322">getResult</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html#line.340">getResult</a>(long&nbsp;waitIfNotFinished)</pre>
 </li>
 </ul>
 </li>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b248f175/devapidocs/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html 
b/devapidocs/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html
index 34f3720..a68b57e 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = 
{"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10};
+var methods = 
{"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance 
Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -124,7 +124,7 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>@InterfaceAudience.Private
-public class <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.45">HFileCleaner</a>
+public class <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.46">HFileCleaner</a>
 extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/CleanerChore.html"
 title="class in org.apache.hadoop.hbase.master.cleaner">CleanerChore</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/BaseHFileCleanerDelegate.html"
 title="class in 
org.apache.hadoop.hbase.master.cleaner">BaseHFileCleanerDelegate</a>&gt;</pre>
 <div class="block">This Chore, every time it runs, will clear the HFiles in 
the hfile archive
  folder that are deletable for each HFile cleaner in the chain.</div>
@@ -166,10 +166,26 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <th class="colLast" scope="col">Field and Description</th>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>private long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#cleanerThreadCheckIntervalMsec">cleanerThreadCheckIntervalMsec</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>private long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#cleanerThreadTimeoutMsec">cleanerThreadTimeoutMsec</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>private static <a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/Comparator.html?is-external=true";
 title="class or interface in java.util">Comparator</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html"
 title="class in 
org.apache.hadoop.hbase.master.cleaner">HFileCleaner.HFileDeleteTask</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#COMPARATOR">COMPARATOR</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code>(package private) static long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#DEFAULT_HFILE_DELETE_THREAD_CHECK_INTERVAL_MSEC">DEFAULT_HFILE_DELETE_THREAD_CHECK_INTERVAL_MSEC</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>(package private) static long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#DEFAULT_HFILE_DELETE_THREAD_TIMEOUT_MSEC">DEFAULT_HFILE_DELETE_THREAD_TIMEOUT_MSEC</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>static int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#DEFAULT_HFILE_DELETE_THROTTLE_THRESHOLD">DEFAULT_HFILE_DELETE_THROTTLE_THRESHOLD</a></span></code>&nbsp;</td>
 </tr>
@@ -199,6 +215,14 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#HFILE_DELETE_THREAD_CHECK_INTERVAL_MSEC">HFILE_DELETE_THREAD_CHECK_INTERVAL_MSEC</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#HFILE_DELETE_THREAD_TIMEOUT_MSEC">HFILE_DELETE_THREAD_TIMEOUT_MSEC</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#HFILE_DELETE_THROTTLE_THRESHOLD">HFILE_DELETE_THROTTLE_THRESHOLD</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
@@ -354,55 +378,63 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#dispatch-org.apache.hadoop.hbase.master.cleaner.HFileCleaner.HFileDeleteTask-">dispatch</a></span>(<a
 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html"
 title="class in 
org.apache.hadoop.hbase.master.cleaner">HFileCleaner.HFileDeleteTask</a>&nbsp;task)</code>&nbsp;</td>
 </tr>
 <tr id="i8" class="altColor">
+<td class="colFirst"><code>(package private) long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#getCleanerThreadCheckIntervalMsec--">getCleanerThreadCheckIntervalMsec</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code><a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true";
 title="class or interface in java.lang">Thread</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#getCleanerThreads--">getCleanerThreads</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>(package private) long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#getCleanerThreadTimeoutMsec--">getCleanerThreadTimeoutMsec</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code><a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/BaseHFileCleanerDelegate.html"
 title="class in 
org.apache.hadoop.hbase.master.cleaner">BaseHFileCleanerDelegate</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#getDelegatesForTesting--">getDelegatesForTesting</a></span>()</code>
 <div class="block">Exposed for TESTING!</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr id="i12" class="altColor">
 <td class="colFirst"><code>long</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#getLargeQueueInitSize--">getLargeQueueInitSize</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr id="i13" class="rowColor">
 <td class="colFirst"><code>long</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#getNumOfDeletedLargeFiles--">getNumOfDeletedLargeFiles</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i14" class="altColor">
 <td class="colFirst"><code>long</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#getNumOfDeletedSmallFiles--">getNumOfDeletedSmallFiles</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr id="i15" class="rowColor">
 <td class="colFirst"><code>long</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#getSmallQueueInitSize--">getSmallQueueInitSize</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i16" class="altColor">
 <td class="colFirst"><code>long</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#getThrottlePoint--">getThrottlePoint</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr id="i17" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#onConfigurationChange-org.apache.hadoop.conf.Configuration-">onConfigurationChange</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf)</code>
 <div class="block">This method would be called by the <a 
href="../../../../../../org/apache/hadoop/hbase/conf/ConfigurationManager.html" 
title="class in 
org.apache.hadoop.hbase.conf"><code>ConfigurationManager</code></a>
  object when the <code>Configuration</code> object is reloaded from disk.</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr id="i18" class="altColor">
 <td class="colFirst"><code>private void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#startHFileDeleteThreads--">startHFileDeleteThreads</a></span>()</code>
 <div class="block">Start threads for hfile deletion</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i19" class="rowColor">
 <td class="colFirst"><code>private void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#stopHFileDeleteThreads--">stopHFileDeleteThreads</a></span>()</code>
 <div class="block">Stop threads for hfile deletion</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i20" class="altColor">
 <td class="colFirst"><code>protected boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#validate-org.apache.hadoop.fs.Path-">validate</a></span>(org.apache.hadoop.fs.Path&nbsp;file)</code>
 <div class="block">Validate the file to see if it even belongs in the 
directory.</div>
@@ -450,7 +482,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>MASTER_HFILE_CLEANER_PLUGINS</h4>
-<pre>public static final&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.47">MASTER_HFILE_CLEANER_PLUGINS</a></pre>
+<pre>public static final&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.48">MASTER_HFILE_CLEANER_PLUGINS</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a 
href="../../../../../../constant-values.html#org.apache.hadoop.hbase.master.cleaner.HFileCleaner.MASTER_HFILE_CLEANER_PLUGINS">Constant
 Field Values</a></dd>
@@ -463,7 +495,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>HFILE_DELETE_THROTTLE_THRESHOLD</h4>
-<pre>public static final&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.55">HFILE_DELETE_THROTTLE_THRESHOLD</a></pre>
+<pre>public static final&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.56">HFILE_DELETE_THROTTLE_THRESHOLD</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a 
href="../../../../../../constant-values.html#org.apache.hadoop.hbase.master.cleaner.HFileCleaner.HFILE_DELETE_THROTTLE_THRESHOLD">Constant
 Field Values</a></dd>
@@ -476,7 +508,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>DEFAULT_HFILE_DELETE_THROTTLE_THRESHOLD</h4>
-<pre>public static final&nbsp;int <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.57">DEFAULT_HFILE_DELETE_THROTTLE_THRESHOLD</a></pre>
+<pre>public static final&nbsp;int <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.58">DEFAULT_HFILE_DELETE_THROTTLE_THRESHOLD</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a 
href="../../../../../../constant-values.html#org.apache.hadoop.hbase.master.cleaner.HFileCleaner.DEFAULT_HFILE_DELETE_THROTTLE_THRESHOLD">Constant
 Field Values</a></dd>
@@ -489,7 +521,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>LARGE_HFILE_QUEUE_INIT_SIZE</h4>
-<pre>public static final&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.60">LARGE_HFILE_QUEUE_INIT_SIZE</a></pre>
+<pre>public static final&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.61">LARGE_HFILE_QUEUE_INIT_SIZE</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a 
href="../../../../../../constant-values.html#org.apache.hadoop.hbase.master.cleaner.HFileCleaner.LARGE_HFILE_QUEUE_INIT_SIZE">Constant
 Field Values</a></dd>
@@ -502,7 +534,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>DEFAULT_LARGE_HFILE_QUEUE_INIT_SIZE</h4>
-<pre>public static final&nbsp;int <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.62">DEFAULT_LARGE_HFILE_QUEUE_INIT_SIZE</a></pre>
+<pre>public static final&nbsp;int <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.63">DEFAULT_LARGE_HFILE_QUEUE_INIT_SIZE</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a 
href="../../../../../../constant-values.html#org.apache.hadoop.hbase.master.cleaner.HFileCleaner.DEFAULT_LARGE_HFILE_QUEUE_INIT_SIZE">Constant
 Field Values</a></dd>
@@ -515,7 +547,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>SMALL_HFILE_QUEUE_INIT_SIZE</h4>
-<pre>public static final&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.65">SMALL_HFILE_QUEUE_INIT_SIZE</a></pre>
+<pre>public static final&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.66">SMALL_HFILE_QUEUE_INIT_SIZE</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a 
href="../../../../../../constant-values.html#org.apache.hadoop.hbase.master.cleaner.HFileCleaner.SMALL_HFILE_QUEUE_INIT_SIZE">Constant
 Field Values</a></dd>
@@ -528,7 +560,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>DEFAULT_SMALL_HFILE_QUEUE_INIT_SIZE</h4>
-<pre>public static final&nbsp;int <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.67">DEFAULT_SMALL_HFILE_QUEUE_INIT_SIZE</a></pre>
+<pre>public static final&nbsp;int <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.68">DEFAULT_SMALL_HFILE_QUEUE_INIT_SIZE</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a 
href="../../../../../../constant-values.html#org.apache.hadoop.hbase.master.cleaner.HFileCleaner.DEFAULT_SMALL_HFILE_QUEUE_INIT_SIZE">Constant
 Field Values</a></dd>
@@ -541,7 +573,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>LARGE_HFILE_DELETE_THREAD_NUMBER</h4>
-<pre>public static final&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.70">LARGE_HFILE_DELETE_THREAD_NUMBER</a></pre>
+<pre>public static final&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.71">LARGE_HFILE_DELETE_THREAD_NUMBER</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a 
href="../../../../../../constant-values.html#org.apache.hadoop.hbase.master.cleaner.HFileCleaner.LARGE_HFILE_DELETE_THREAD_NUMBER">Constant
 Field Values</a></dd>
@@ -554,7 +586,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>DEFAULT_LARGE_HFILE_DELETE_THREAD_NUMBER</h4>
-<pre>public static final&nbsp;int <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.72">DEFAULT_LARGE_HFILE_DELETE_THREAD_NUMBER</a></pre>
+<pre>public static final&nbsp;int <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.73">DEFAULT_LARGE_HFILE_DELETE_THREAD_NUMBER</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a 
href="../../../../../../constant-values.html#org.apache.hadoop.hbase.master.cleaner.HFileCleaner.DEFAULT_LARGE_HFILE_DELETE_THREAD_NUMBER">Constant
 Field Values</a></dd>
@@ -567,7 +599,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>SMALL_HFILE_DELETE_THREAD_NUMBER</h4>
-<pre>public static final&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.75">SMALL_HFILE_DELETE_THREAD_NUMBER</a></pre>
+<pre>public static final&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.76">SMALL_HFILE_DELETE_THREAD_NUMBER</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a 
href="../../../../../../constant-values.html#org.apache.hadoop.hbase.master.cleaner.HFileCleaner.SMALL_HFILE_DELETE_THREAD_NUMBER">Constant
 Field Values</a></dd>
@@ -580,20 +612,72 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>DEFAULT_SMALL_HFILE_DELETE_THREAD_NUMBER</h4>
-<pre>public static final&nbsp;int <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.77">DEFAULT_SMALL_HFILE_DELETE_THREAD_NUMBER</a></pre>
+<pre>public static final&nbsp;int <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.78">DEFAULT_SMALL_HFILE_DELETE_THREAD_NUMBER</a></pre>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
 <dd><a 
href="../../../../../../constant-values.html#org.apache.hadoop.hbase.master.cleaner.HFileCleaner.DEFAULT_SMALL_HFILE_DELETE_THREAD_NUMBER">Constant
 Field Values</a></dd>
 </dl>
 </li>
 </ul>
+<a name="HFILE_DELETE_THREAD_TIMEOUT_MSEC">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>HFILE_DELETE_THREAD_TIMEOUT_MSEC</h4>
+<pre>public static final&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.80">HFILE_DELETE_THREAD_TIMEOUT_MSEC</a></pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a 
href="../../../../../../constant-values.html#org.apache.hadoop.hbase.master.cleaner.HFileCleaner.HFILE_DELETE_THREAD_TIMEOUT_MSEC">Constant
 Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="DEFAULT_HFILE_DELETE_THREAD_TIMEOUT_MSEC">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>DEFAULT_HFILE_DELETE_THREAD_TIMEOUT_MSEC</h4>
+<pre>static final&nbsp;long <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.83">DEFAULT_HFILE_DELETE_THREAD_TIMEOUT_MSEC</a></pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a 
href="../../../../../../constant-values.html#org.apache.hadoop.hbase.master.cleaner.HFileCleaner.DEFAULT_HFILE_DELETE_THREAD_TIMEOUT_MSEC">Constant
 Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="HFILE_DELETE_THREAD_CHECK_INTERVAL_MSEC">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>HFILE_DELETE_THREAD_CHECK_INTERVAL_MSEC</h4>
+<pre>public static final&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.85">HFILE_DELETE_THREAD_CHECK_INTERVAL_MSEC</a></pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a 
href="../../../../../../constant-values.html#org.apache.hadoop.hbase.master.cleaner.HFileCleaner.HFILE_DELETE_THREAD_CHECK_INTERVAL_MSEC">Constant
 Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="DEFAULT_HFILE_DELETE_THREAD_CHECK_INTERVAL_MSEC">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>DEFAULT_HFILE_DELETE_THREAD_CHECK_INTERVAL_MSEC</h4>
+<pre>static final&nbsp;long <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.88">DEFAULT_HFILE_DELETE_THREAD_CHECK_INTERVAL_MSEC</a></pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a 
href="../../../../../../constant-values.html#org.apache.hadoop.hbase.master.cleaner.HFileCleaner.DEFAULT_HFILE_DELETE_THREAD_CHECK_INTERVAL_MSEC">Constant
 Field Values</a></dd>
+</dl>
+</li>
+</ul>
 <a name="LOG">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>LOG</h4>
-<pre>private static final&nbsp;org.slf4j.Logger <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.79">LOG</a></pre>
+<pre>private static final&nbsp;org.slf4j.Logger <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.90">LOG</a></pre>
 </li>
 </ul>
 <a name="largeFileQueue">
@@ -602,7 +686,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>largeFileQueue</h4>
-<pre><a 
href="../../../../../../org/apache/hadoop/hbase/util/StealJobQueue.html" 
title="class in org.apache.hadoop.hbase.util">StealJobQueue</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html"
 title="class in 
org.apache.hadoop.hbase.master.cleaner">HFileCleaner.HFileDeleteTask</a>&gt; <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.81">largeFileQueue</a></pre>
+<pre><a 
href="../../../../../../org/apache/hadoop/hbase/util/StealJobQueue.html" 
title="class in org.apache.hadoop.hbase.util">StealJobQueue</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html"
 title="class in 
org.apache.hadoop.hbase.master.cleaner">HFileCleaner.HFileDeleteTask</a>&gt; <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.92">largeFileQueue</a></pre>
 </li>
 </ul>
 <a name="smallFileQueue">
@@ -611,7 +695,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>smallFileQueue</h4>
-<pre><a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/BlockingQueue.html?is-external=true";
 title="class or interface in java.util.concurrent">BlockingQueue</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html"
 title="class in 
org.apache.hadoop.hbase.master.cleaner">HFileCleaner.HFileDeleteTask</a>&gt; <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.82">smallFileQueue</a></pre>
+<pre><a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/BlockingQueue.html?is-external=true";
 title="class or interface in java.util.concurrent">BlockingQueue</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html"
 title="class in 
org.apache.hadoop.hbase.master.cleaner">HFileCleaner.HFileDeleteTask</a>&gt; <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.93">smallFileQueue</a></pre>
 </li>
 </ul>
 <a name="throttlePoint">
@@ -620,7 +704,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>throttlePoint</h4>
-<pre>private&nbsp;int <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.83">throttlePoint</a></pre>
+<pre>private&nbsp;int <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.94">throttlePoint</a></pre>
 </li>
 </ul>
 <a name="largeQueueInitSize">
@@ -629,7 +713,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>largeQueueInitSize</h4>
-<pre>private&nbsp;int <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.84">largeQueueInitSize</a></pre>
+<pre>private&nbsp;int <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.95">largeQueueInitSize</a></pre>
 </li>
 </ul>
 <a name="smallQueueInitSize">
@@ -638,7 +722,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>smallQueueInitSize</h4>
-<pre>private&nbsp;int <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.85">smallQueueInitSize</a></pre>
+<pre>private&nbsp;int <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.96">smallQueueInitSize</a></pre>
 </li>
 </ul>
 <a name="largeFileDeleteThreadNumber">
@@ -647,7 +731,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>largeFileDeleteThreadNumber</h4>
-<pre>private&nbsp;int <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.86">largeFileDeleteThreadNumber</a></pre>
+<pre>private&nbsp;int <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.97">largeFileDeleteThreadNumber</a></pre>
 </li>
 </ul>
 <a name="smallFileDeleteThreadNumber">
@@ -656,7 +740,25 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>smallFileDeleteThreadNumber</h4>
-<pre>private&nbsp;int <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.87">smallFileDeleteThreadNumber</a></pre>
+<pre>private&nbsp;int <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.98">smallFileDeleteThreadNumber</a></pre>
+</li>
+</ul>
+<a name="cleanerThreadTimeoutMsec">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>cleanerThreadTimeoutMsec</h4>
+<pre>private&nbsp;long <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.99">cleanerThreadTimeoutMsec</a></pre>
+</li>
+</ul>
+<a name="cleanerThreadCheckIntervalMsec">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>cleanerThreadCheckIntervalMsec</h4>
+<pre>private&nbsp;long <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.100">cleanerThreadCheckIntervalMsec</a></pre>
 </li>
 </ul>
 <a name="threads">
@@ -665,7 +767,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>threads</h4>
-<pre>private&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true";
 title="class or interface in java.lang">Thread</a>&gt; <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.88">threads</a></pre>
+<pre>private&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true";
 title="class or interface in java.lang">Thread</a>&gt; <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.101">threads</a></pre>
 </li>
 </ul>
 <a name="running">
@@ -674,7 +776,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>running</h4>
-<pre>private&nbsp;boolean <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.89">running</a></pre>
+<pre>private&nbsp;boolean <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.102">running</a></pre>
 </li>
 </ul>
 <a name="deletedLargeFiles">
@@ -683,7 +785,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>deletedLargeFiles</h4>
-<pre>private&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicLong.html?is-external=true";
 title="class or interface in java.util.concurrent.atomic">AtomicLong</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.91">deletedLargeFiles</a></pre>
+<pre>private&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicLong.html?is-external=true";
 title="class or interface in java.util.concurrent.atomic">AtomicLong</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.104">deletedLargeFiles</a></pre>
 </li>
 </ul>
 <a name="deletedSmallFiles">
@@ -692,7 +794,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>deletedSmallFiles</h4>
-<pre>private&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicLong.html?is-external=true";
 title="class or interface in java.util.concurrent.atomic">AtomicLong</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.92">deletedSmallFiles</a></pre>
+<pre>private&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/atomic/AtomicLong.html?is-external=true";
 title="class or interface in java.util.concurrent.atomic">AtomicLong</a> <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.105">deletedSmallFiles</a></pre>
 </li>
 </ul>
 <a name="COMPARATOR">
@@ -701,7 +803,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockListLast">
 <li class="blockList">
 <h4>COMPARATOR</h4>
-<pre>private static final&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/Comparator.html?is-external=true";
 title="class or interface in java.util">Comparator</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html"
 title="class in 
org.apache.hadoop.hbase.master.cleaner">HFileCleaner.HFileDeleteTask</a>&gt; <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.288">COMPARATOR</a></pre>
+<pre>private static final&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/Comparator.html?is-external=true";
 title="class or interface in java.util">Comparator</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html"
 title="class in 
org.apache.hadoop.hbase.master.cleaner">HFileCleaner.HFileDeleteTask</a>&gt; <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.306">COMPARATOR</a></pre>
 </li>
 </ul>
 </li>
@@ -718,7 +820,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>HFileCleaner</h4>
-<pre>public&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.49">HFileCleaner</a>(int&nbsp;period,
+<pre>public&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.50">HFileCleaner</a>(int&nbsp;period,
                     <a 
href="../../../../../../org/apache/hadoop/hbase/Stoppable.html" 
title="interface in org.apache.hadoop.hbase">Stoppable</a>&nbsp;stopper,
                     org.apache.hadoop.conf.Configuration&nbsp;conf,
                     org.apache.hadoop.fs.FileSystem&nbsp;fs,
@@ -731,7 +833,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockListLast">
 <li class="blockList">
 <h4>HFileCleaner</h4>
-<pre>public&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.102">HFileCleaner</a>(int&nbsp;period,
+<pre>public&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.115">HFileCleaner</a>(int&nbsp;period,
                     <a 
href="../../../../../../org/apache/hadoop/hbase/Stoppable.html" 
title="interface in org.apache.hadoop.hbase">Stoppable</a>&nbsp;stopper,
                     org.apache.hadoop.conf.Configuration&nbsp;conf,
                     org.apache.hadoop.fs.FileSystem&nbsp;fs,
@@ -762,7 +864,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>validate</h4>
-<pre>protected&nbsp;boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.122">validate</a>(org.apache.hadoop.fs.Path&nbsp;file)</pre>
+<pre>protected&nbsp;boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.140">validate</a>(org.apache.hadoop.fs.Path&nbsp;file)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
class:&nbsp;<code><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/CleanerChore.html#validate-org.apache.hadoop.fs.Path-">CleanerChore</a></code></span></div>
 <div class="block">Validate the file to see if it even belongs in the 
directory. If it is valid, then the file
  will go through the cleaner delegates, but otherwise the file is just 
deleted.</div>
@@ -782,7 +884,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>getDelegatesForTesting</h4>
-<pre>public&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/BaseHFileCleanerDelegate.html"
 title="class in 
org.apache.hadoop.hbase.master.cleaner">BaseHFileCleanerDelegate</a>&gt;&nbsp;<a
 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.132">getDelegatesForTesting</a>()</pre>
+<pre>public&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/BaseHFileCleanerDelegate.html"
 title="class in 
org.apache.hadoop.hbase.master.cleaner">BaseHFileCleanerDelegate</a>&gt;&nbsp;<a
 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.150">getDelegatesForTesting</a>()</pre>
 <div class="block">Exposed for TESTING!</div>
 </li>
 </ul>
@@ -792,7 +894,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>deleteFiles</h4>
-<pre>public&nbsp;int&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.137">deleteFiles</a>(<a
 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Iterable.html?is-external=true";
 title="class or interface in 
java.lang">Iterable</a>&lt;org.apache.hadoop.fs.FileStatus&gt;&nbsp;filesToDelete)</pre>
+<pre>public&nbsp;int&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.155">deleteFiles</a>(<a
 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Iterable.html?is-external=true";
 title="class or interface in 
java.lang">Iterable</a>&lt;org.apache.hadoop.fs.FileStatus&gt;&nbsp;filesToDelete)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
class:&nbsp;<code><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/CleanerChore.html#deleteFiles-java.lang.Iterable-">CleanerChore</a></code></span></div>
 <div class="block">Delete the given files</div>
 <dl>
@@ -811,7 +913,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>deleteFile</h4>
-<pre>private&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html"
 title="class in 
org.apache.hadoop.hbase.master.cleaner">HFileCleaner.HFileDeleteTask</a>&nbsp;<a
 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.161">deleteFile</a>(org.apache.hadoop.fs.FileStatus&nbsp;file)</pre>
+<pre>private&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html"
 title="class in 
org.apache.hadoop.hbase.master.cleaner">HFileCleaner.HFileDeleteTask</a>&nbsp;<a
 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.179">deleteFile</a>(org.apache.hadoop.fs.FileStatus&nbsp;file)</pre>
 <div class="block">Construct an <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html"
 title="class in 
org.apache.hadoop.hbase.master.cleaner"><code>HFileCleaner.HFileDeleteTask</code></a>
 for each file to delete and add into the correct queue</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -827,7 +929,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>dispatch</h4>
-<pre>private&nbsp;boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.167">dispatch</a>(<a
 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html"
 title="class in 
org.apache.hadoop.hbase.master.cleaner">HFileCleaner.HFileDeleteTask</a>&nbsp;task)</pre>
+<pre>private&nbsp;boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.185">dispatch</a>(<a
 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html"
 title="class in 
org.apache.hadoop.hbase.master.cleaner">HFileCleaner.HFileDeleteTask</a>&nbsp;task)</pre>
 </li>
 </ul>
 <a name="cleanup--">
@@ -836,7 +938,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>cleanup</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.185">cleanup</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.203">cleanup</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
class:&nbsp;<code><a 
href="../../../../../../org/apache/hadoop/hbase/ScheduledChore.html#cleanup--">ScheduledChore</a></code></span></div>
 <div class="block">Override to run cleanup tasks when the Chore encounters an 
error and must stop running</div>
 <dl>
@@ -851,7 +953,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>startHFileDeleteThreads</h4>
-<pre>private&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.193">startHFileDeleteThreads</a>()</pre>
+<pre>private&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.211">startHFileDeleteThreads</a>()</pre>
 <div class="block">Start threads for hfile deletion</div>
 </li>
 </ul>
@@ -861,7 +963,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>consumerLoop</h4>
-<pre>protected&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.227">consumerLoop</a>(<a
 
href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/BlockingQueue.html?is-external=true";
 title="class or interface in java.util.concurrent">BlockingQueue</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html"
 title="class in 
org.apache.hadoop.hbase.master.cleaner">HFileCleaner.HFileDeleteTask</a>&gt;&nbsp;queue)</pre>
+<pre>protected&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.245">consumerLoop</a>(<a
 
href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/BlockingQueue.html?is-external=true";
 title="class or interface in java.util.concurrent">BlockingQueue</a>&lt;<a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/HFileCleaner.HFileDeleteTask.html"
 title="class in 
org.apache.hadoop.hbase.master.cleaner">HFileCleaner.HFileDeleteTask</a>&gt;&nbsp;queue)</pre>
 </li>
 </ul>
 <a name="countDeletedFiles-boolean-boolean-">
@@ -870,7 +972,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>countDeletedFiles</h4>
-<pre>private&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.258">countDeletedFiles</a>(boolean&nbsp;isLargeFile,
+<pre>private&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.276">countDeletedFiles</a>(boolean&nbsp;isLargeFile,
                                boolean&nbsp;fromLargeQueue)</pre>
 </li>
 </ul>
@@ -880,7 +982,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>stopHFileDeleteThreads</h4>
-<pre>private&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.280">stopHFileDeleteThreads</a>()</pre>
+<pre>private&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.298">stopHFileDeleteThreads</a>()</pre>
 <div class="block">Stop threads for hfile deletion</div>
 </li>
 </ul>
@@ -890,7 +992,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>getCleanerThreads</h4>
-<pre>public&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true";
 title="class or interface in java.lang">Thread</a>&gt;&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.347">getCleanerThreads</a>()</pre>
+<pre>public&nbsp;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Thread.html?is-external=true";
 title="class or interface in java.lang">Thread</a>&gt;&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.367">getCleanerThreads</a>()</pre>
 </li>
 </ul>
 <a name="getNumOfDeletedLargeFiles--">
@@ -899,7 +1001,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>getNumOfDeletedLargeFiles</h4>
-<pre>public&nbsp;long&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.352">getNumOfDeletedLargeFiles</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.372">getNumOfDeletedLargeFiles</a>()</pre>
 </li>
 </ul>
 <a name="getNumOfDeletedSmallFiles--">
@@ -908,7 +1010,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>getNumOfDeletedSmallFiles</h4>
-<pre>public&nbsp;long&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.357">getNumOfDeletedSmallFiles</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.377">getNumOfDeletedSmallFiles</a>()</pre>
 </li>
 </ul>
 <a name="getLargeQueueInitSize--">
@@ -917,7 +1019,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>getLargeQueueInitSize</h4>
-<pre>public&nbsp;long&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.362">getLargeQueueInitSize</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.382">getLargeQueueInitSize</a>()</pre>
 </li>
 </ul>
 <a name="getSmallQueueInitSize--">
@@ -926,7 +1028,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>getSmallQueueInitSize</h4>
-<pre>public&nbsp;long&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.367">getSmallQueueInitSize</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.387">getSmallQueueInitSize</a>()</pre>
 </li>
 </ul>
 <a name="getThrottlePoint--">
@@ -935,7 +1037,25 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>getThrottlePoint</h4>
-<pre>public&nbsp;long&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.372">getThrottlePoint</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.392">getThrottlePoint</a>()</pre>
+</li>
+</ul>
+<a name="getCleanerThreadTimeoutMsec--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getCleanerThreadTimeoutMsec</h4>
+<pre>long&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.397">getCleanerThreadTimeoutMsec</a>()</pre>
+</li>
+</ul>
+<a name="getCleanerThreadCheckIntervalMsec--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getCleanerThreadCheckIntervalMsec</h4>
+<pre>long&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.402">getCleanerThreadCheckIntervalMsec</a>()</pre>
 </li>
 </ul>
 <a name="onConfigurationChange-org.apache.hadoop.conf.Configuration-">
@@ -944,7 +1064,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>onConfigurationChange</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.377">onConfigurationChange</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.407">onConfigurationChange</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from 
interface:&nbsp;<code><a 
href="../../../../../../org/apache/hadoop/hbase/conf/ConfigurationObserver.html#onConfigurationChange-org.apache.hadoop.conf.Configuration-">ConfigurationObserver</a></code></span></div>
 <div class="block">This method would be called by the <a 
href="../../../../../../org/apache/hadoop/hbase/conf/ConfigurationManager.html" 
title="class in 
org.apache.hadoop.hbase.conf"><code>ConfigurationManager</code></a>
  object when the <code>Configuration</code> object is reloaded from disk.</div>
@@ -962,7 +1082,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockList">
 <li class="blockList">
 <h4>checkAndUpdateConfigurations</h4>
-<pre>private&nbsp;boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.405">checkAndUpdateConfigurations</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
+<pre>private&nbsp;boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.435">checkAndUpdateConfigurations</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
 <div class="block">Check new configuration and update settings if value 
changed</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -978,7 +1098,7 @@ extends <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/Cleane
 <ul class="blockListLast">
 <li class="blockList">
 <h4>cancel</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.450">cancel</a>(boolean&nbsp;mayInterruptIfRunning)</pre>
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html#line.493">cancel</a>(boolean&nbsp;mayInterruptIfRunning)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a 
href="../../../../../../org/apache/hadoop/hbase/ScheduledChore.html#cancel-boolean-">cancel</a></code>&nbsp;in
 class&nbsp;<code><a 
href="../../../../../../org/apache/hadoop/hbase/ScheduledChore.html" 
title="class in org.apache.hadoop.hbase">ScheduledChore</a></code></dd>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b248f175/devapidocs/org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html
 
b/devapidocs/org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html
index 821bf7d..ea5ffd6 100644
--- 
a/devapidocs/org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html
+++ 
b/devapidocs/org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html
@@ -113,7 +113,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>private static final class <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/LogCleaner.html#line.188">LogCleaner.CleanerContext</a>
+<pre>private static final class <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/LogCleaner.html#line.221">LogCleaner.CleanerContext</a>
 extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a></pre>
 </li>
 </ul>
@@ -134,21 +134,21 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <th class="colLast" scope="col">Field and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>(package private) static long</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#MAX_WAIT">MAX_WAIT</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>(package private) boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#result">result</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>(package private) boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#setFromCleaner">setFromCleaner</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>(package private) 
org.apache.hadoop.fs.FileStatus</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#target">target</a></span></code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>(package private) long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#timeoutMsec">timeoutMsec</a></span></code>&nbsp;</td>
+</tr>
 </table>
 </li>
 </ul>
@@ -166,7 +166,8 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>private </code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#CleanerContext-org.apache.hadoop.fs.FileStatus-">CleanerContext</a></span>(org.apache.hadoop.fs.FileStatus&nbsp;status)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#CleanerContext-org.apache.hadoop.fs.FileStatus-long-">CleanerContext</a></span>(org.apache.hadoop.fs.FileStatus&nbsp;status,
+              long&nbsp;timeoutMsec)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -185,7 +186,8 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>(package private) static <a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html"
 title="class in 
org.apache.hadoop.hbase.master.cleaner">LogCleaner.CleanerContext</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#createCleanerContext-org.apache.hadoop.fs.FileStatus-">createCleanerContext</a></span>(org.apache.hadoop.fs.FileStatus&nbsp;status)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#createCleanerContext-org.apache.hadoop.fs.FileStatus-long-">createCleanerContext</a></span>(org.apache.hadoop.fs.FileStatus&nbsp;status,
+                    long&nbsp;timeoutMsec)</code>&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>(package private) boolean</code></td>
@@ -221,44 +223,40 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <!--   -->
 </a>
 <h3>Field Detail</h3>
-<a name="MAX_WAIT">
+<a name="target">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>MAX_WAIT</h4>
-<pre>static final&nbsp;long <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#line.190">MAX_WAIT</a></pre>
-<dl>
-<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a 
href="../../../../../../constant-values.html#org.apache.hadoop.hbase.master.cleaner.LogCleaner.CleanerContext.MAX_WAIT">Constant
 Field Values</a></dd>
-</dl>
+<h4>target</h4>
+<pre>final&nbsp;org.apache.hadoop.fs.FileStatus <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#line.223">target</a></pre>
 </li>
 </ul>
-<a name="target">
+<a name="result">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>target</h4>
-<pre>final&nbsp;org.apache.hadoop.fs.FileStatus <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#line.192">target</a></pre>
+<h4>result</h4>
+<pre>volatile&nbsp;boolean <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#line.224">result</a></pre>
 </li>
 </ul>
-<a name="result">
+<a name="setFromCleaner">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>result</h4>
-<pre>volatile&nbsp;boolean <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#line.193">result</a></pre>
+<h4>setFromCleaner</h4>
+<pre>volatile&nbsp;boolean <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#line.225">setFromCleaner</a></pre>
 </li>
 </ul>
-<a name="setFromCleaner">
+<a name="timeoutMsec">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>setFromCleaner</h4>
-<pre>volatile&nbsp;boolean <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#line.194">setFromCleaner</a></pre>
+<h4>timeoutMsec</h4>
+<pre>long <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#line.226">timeoutMsec</a></pre>
 </li>
 </ul>
 </li>
@@ -269,13 +267,14 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="CleanerContext-org.apache.hadoop.fs.FileStatus-">
+<a name="CleanerContext-org.apache.hadoop.fs.FileStatus-long-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>CleanerContext</h4>
-<pre>private&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#line.200">CleanerContext</a>(org.apache.hadoop.fs.FileStatus&nbsp;status)</pre>
+<pre>private&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#line.232">CleanerContext</a>(org.apache.hadoop.fs.FileStatus&nbsp;status,
+                       long&nbsp;timeoutMsec)</pre>
 </li>
 </ul>
 </li>
@@ -286,13 +285,14 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="createCleanerContext-org.apache.hadoop.fs.FileStatus-">
+<a name="createCleanerContext-org.apache.hadoop.fs.FileStatus-long-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createCleanerContext</h4>
-<pre>static&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html"
 title="class in 
org.apache.hadoop.hbase.master.cleaner">LogCleaner.CleanerContext</a>&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#line.196">createCleanerContext</a>(org.apache.hadoop.fs.FileStatus&nbsp;status)</pre>
+<pre>static&nbsp;<a 
href="../../../../../../org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html"
 title="class in 
org.apache.hadoop.hbase.master.cleaner">LogCleaner.CleanerContext</a>&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#line.228">createCleanerContext</a>(org.apache.hadoop.fs.FileStatus&nbsp;status,
+                                                      
long&nbsp;timeoutMsec)</pre>
 </li>
 </ul>
 <a name="setResult-boolean-">
@@ -301,7 +301,7 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>setResult</h4>
-<pre>void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#line.205">setResult</a>(boolean&nbsp;res)</pre>
+<pre>void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#line.238">setResult</a>(boolean&nbsp;res)</pre>
 </li>
 </ul>
 <a name="getResult-long-">
@@ -310,7 +310,7 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getResult</h4>
-<pre>boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#line.211">getResult</a>(long&nbsp;waitIfNotFinished)</pre>
+<pre>boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#line.244">getResult</a>(long&nbsp;waitIfNotFinished)</pre>
 </li>
 </ul>
 <a name="getTargetToClean--">
@@ -319,7 +319,7 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getTargetToClean</h4>
-<pre>org.apache.hadoop.fs.FileStatus&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#line.229">getTargetToClean</a>()</pre>
+<pre>org.apache.hadoop.fs.FileStatus&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html#line.264">getTargetToClean</a>()</pre>
 </li>
 </ul>
 </li>

Reply via email to