http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b248f175/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.html
index 6bde7e3..5dffac8 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.html
@@ -360,102 +360,114 @@
 <span class="sourceLineNo">352</span>    final int SMALL_FILE_NUM = 20;<a 
name="line.352"></a>
 <span class="sourceLineNo">353</span>    final int LARGE_THREAD_NUM = 2;<a 
name="line.353"></a>
 <span class="sourceLineNo">354</span>    final int SMALL_THREAD_NUM = 4;<a 
name="line.354"></a>
-<span class="sourceLineNo">355</span><a name="line.355"></a>
-<span class="sourceLineNo">356</span>    Configuration conf = 
UTIL.getConfiguration();<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    // no cleaner policies = delete all 
files<a name="line.357"></a>
-<span class="sourceLineNo">358</span>    
conf.setStrings(HFileCleaner.MASTER_HFILE_CLEANER_PLUGINS, "");<a 
name="line.358"></a>
-<span class="sourceLineNo">359</span>    
conf.setInt(HFileCleaner.HFILE_DELETE_THROTTLE_THRESHOLD, 
ORIGINAL_THROTTLE_POINT);<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    
conf.setInt(HFileCleaner.LARGE_HFILE_QUEUE_INIT_SIZE, 
ORIGINAL_QUEUE_INIT_SIZE);<a name="line.360"></a>
-<span class="sourceLineNo">361</span>    
conf.setInt(HFileCleaner.SMALL_HFILE_QUEUE_INIT_SIZE, 
ORIGINAL_QUEUE_INIT_SIZE);<a name="line.361"></a>
-<span class="sourceLineNo">362</span>    Server server = new DummyServer();<a 
name="line.362"></a>
-<span class="sourceLineNo">363</span>    Path archivedHfileDir =<a 
name="line.363"></a>
-<span class="sourceLineNo">364</span>        new 
Path(UTIL.getDataTestDirOnTestFS(), HConstants.HFILE_ARCHIVE_DIRECTORY);<a 
name="line.364"></a>
-<span class="sourceLineNo">365</span><a name="line.365"></a>
-<span class="sourceLineNo">366</span>    // setup the cleaner<a 
name="line.366"></a>
-<span class="sourceLineNo">367</span>    FileSystem fs = 
UTIL.getDFSCluster().getFileSystem();<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    final HFileCleaner cleaner = new 
HFileCleaner(1000, server, conf, fs, archivedHfileDir);<a name="line.368"></a>
-<span class="sourceLineNo">369</span>    
Assert.assertEquals(ORIGINAL_THROTTLE_POINT, cleaner.getThrottlePoint());<a 
name="line.369"></a>
-<span class="sourceLineNo">370</span>    
Assert.assertEquals(ORIGINAL_QUEUE_INIT_SIZE, 
cleaner.getLargeQueueInitSize());<a name="line.370"></a>
-<span class="sourceLineNo">371</span>    
Assert.assertEquals(ORIGINAL_QUEUE_INIT_SIZE, 
cleaner.getSmallQueueInitSize());<a name="line.371"></a>
-<span class="sourceLineNo">372</span><a name="line.372"></a>
-<span class="sourceLineNo">373</span>    // clean up archive directory and 
create files for testing<a name="line.373"></a>
-<span class="sourceLineNo">374</span>    fs.delete(archivedHfileDir, true);<a 
name="line.374"></a>
-<span class="sourceLineNo">375</span>    fs.mkdirs(archivedHfileDir);<a 
name="line.375"></a>
-<span class="sourceLineNo">376</span>    createFilesForTesting(LARGE_FILE_NUM, 
SMALL_FILE_NUM, fs, archivedHfileDir);<a name="line.376"></a>
-<span class="sourceLineNo">377</span><a name="line.377"></a>
-<span class="sourceLineNo">378</span>    // call cleaner, run as daemon to 
test the interrupt-at-middle case<a name="line.378"></a>
-<span class="sourceLineNo">379</span>    Thread t = new Thread() {<a 
name="line.379"></a>
-<span class="sourceLineNo">380</span>      @Override<a name="line.380"></a>
-<span class="sourceLineNo">381</span>      public void run() {<a 
name="line.381"></a>
-<span class="sourceLineNo">382</span>        cleaner.chore();<a 
name="line.382"></a>
-<span class="sourceLineNo">383</span>      }<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    };<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    t.setDaemon(true);<a 
name="line.385"></a>
-<span class="sourceLineNo">386</span>    t.start();<a name="line.386"></a>
-<span class="sourceLineNo">387</span>    // wait until file clean started<a 
name="line.387"></a>
-<span class="sourceLineNo">388</span>    while 
(cleaner.getNumOfDeletedSmallFiles() == 0) {<a name="line.388"></a>
-<span class="sourceLineNo">389</span>      Thread.yield();<a 
name="line.389"></a>
-<span class="sourceLineNo">390</span>    }<a name="line.390"></a>
-<span class="sourceLineNo">391</span><a name="line.391"></a>
-<span class="sourceLineNo">392</span>    // trigger configuration change<a 
name="line.392"></a>
-<span class="sourceLineNo">393</span>    Configuration newConf = new 
Configuration(conf);<a name="line.393"></a>
-<span class="sourceLineNo">394</span>    
newConf.setInt(HFileCleaner.HFILE_DELETE_THROTTLE_THRESHOLD, 
UPDATE_THROTTLE_POINT);<a name="line.394"></a>
-<span class="sourceLineNo">395</span>    
newConf.setInt(HFileCleaner.LARGE_HFILE_QUEUE_INIT_SIZE, 
UPDATE_QUEUE_INIT_SIZE);<a name="line.395"></a>
-<span class="sourceLineNo">396</span>    
newConf.setInt(HFileCleaner.SMALL_HFILE_QUEUE_INIT_SIZE, 
UPDATE_QUEUE_INIT_SIZE);<a name="line.396"></a>
-<span class="sourceLineNo">397</span>    
newConf.setInt(HFileCleaner.LARGE_HFILE_DELETE_THREAD_NUMBER, 
LARGE_THREAD_NUM);<a name="line.397"></a>
-<span class="sourceLineNo">398</span>    
newConf.setInt(HFileCleaner.SMALL_HFILE_DELETE_THREAD_NUMBER, 
SMALL_THREAD_NUM);<a name="line.398"></a>
-<span class="sourceLineNo">399</span>    LOG.debug("File deleted from large 
queue: " + cleaner.getNumOfDeletedLargeFiles()<a name="line.399"></a>
-<span class="sourceLineNo">400</span>        + "; from small queue: " + 
cleaner.getNumOfDeletedSmallFiles());<a name="line.400"></a>
-<span class="sourceLineNo">401</span>    
cleaner.onConfigurationChange(newConf);<a name="line.401"></a>
-<span class="sourceLineNo">402</span><a name="line.402"></a>
-<span class="sourceLineNo">403</span>    // check values after change<a 
name="line.403"></a>
-<span class="sourceLineNo">404</span>    
Assert.assertEquals(UPDATE_THROTTLE_POINT, cleaner.getThrottlePoint());<a 
name="line.404"></a>
-<span class="sourceLineNo">405</span>    
Assert.assertEquals(UPDATE_QUEUE_INIT_SIZE, cleaner.getLargeQueueInitSize());<a 
name="line.405"></a>
-<span class="sourceLineNo">406</span>    
Assert.assertEquals(UPDATE_QUEUE_INIT_SIZE, cleaner.getSmallQueueInitSize());<a 
name="line.406"></a>
-<span class="sourceLineNo">407</span>    Assert.assertEquals(LARGE_THREAD_NUM 
+ SMALL_THREAD_NUM, cleaner.getCleanerThreads().size());<a name="line.407"></a>
+<span class="sourceLineNo">355</span>    final long THREAD_TIMEOUT_MSEC = 30 * 
1000L;<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    final long THREAD_CHECK_INTERVAL_MSEC 
= 500L;<a name="line.356"></a>
+<span class="sourceLineNo">357</span><a name="line.357"></a>
+<span class="sourceLineNo">358</span>    Configuration conf = 
UTIL.getConfiguration();<a name="line.358"></a>
+<span class="sourceLineNo">359</span>    // no cleaner policies = delete all 
files<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    
conf.setStrings(HFileCleaner.MASTER_HFILE_CLEANER_PLUGINS, "");<a 
name="line.360"></a>
+<span class="sourceLineNo">361</span>    
conf.setInt(HFileCleaner.HFILE_DELETE_THROTTLE_THRESHOLD, 
ORIGINAL_THROTTLE_POINT);<a name="line.361"></a>
+<span class="sourceLineNo">362</span>    
conf.setInt(HFileCleaner.LARGE_HFILE_QUEUE_INIT_SIZE, 
ORIGINAL_QUEUE_INIT_SIZE);<a name="line.362"></a>
+<span class="sourceLineNo">363</span>    
conf.setInt(HFileCleaner.SMALL_HFILE_QUEUE_INIT_SIZE, 
ORIGINAL_QUEUE_INIT_SIZE);<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    Server server = new DummyServer();<a 
name="line.364"></a>
+<span class="sourceLineNo">365</span>    Path archivedHfileDir =<a 
name="line.365"></a>
+<span class="sourceLineNo">366</span>        new 
Path(UTIL.getDataTestDirOnTestFS(), HConstants.HFILE_ARCHIVE_DIRECTORY);<a 
name="line.366"></a>
+<span class="sourceLineNo">367</span><a name="line.367"></a>
+<span class="sourceLineNo">368</span>    // setup the cleaner<a 
name="line.368"></a>
+<span class="sourceLineNo">369</span>    FileSystem fs = 
UTIL.getDFSCluster().getFileSystem();<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    final HFileCleaner cleaner = new 
HFileCleaner(1000, server, conf, fs, archivedHfileDir);<a name="line.370"></a>
+<span class="sourceLineNo">371</span>    
Assert.assertEquals(ORIGINAL_THROTTLE_POINT, cleaner.getThrottlePoint());<a 
name="line.371"></a>
+<span class="sourceLineNo">372</span>    
Assert.assertEquals(ORIGINAL_QUEUE_INIT_SIZE, 
cleaner.getLargeQueueInitSize());<a name="line.372"></a>
+<span class="sourceLineNo">373</span>    
Assert.assertEquals(ORIGINAL_QUEUE_INIT_SIZE, 
cleaner.getSmallQueueInitSize());<a name="line.373"></a>
+<span class="sourceLineNo">374</span>    
Assert.assertEquals(HFileCleaner.DEFAULT_HFILE_DELETE_THREAD_TIMEOUT_MSEC,<a 
name="line.374"></a>
+<span class="sourceLineNo">375</span>        
cleaner.getCleanerThreadTimeoutMsec());<a name="line.375"></a>
+<span class="sourceLineNo">376</span>    
Assert.assertEquals(HFileCleaner.DEFAULT_HFILE_DELETE_THREAD_CHECK_INTERVAL_MSEC,<a
 name="line.376"></a>
+<span class="sourceLineNo">377</span>        
cleaner.getCleanerThreadCheckIntervalMsec());<a name="line.377"></a>
+<span class="sourceLineNo">378</span><a name="line.378"></a>
+<span class="sourceLineNo">379</span>    // clean up archive directory and 
create files for testing<a name="line.379"></a>
+<span class="sourceLineNo">380</span>    fs.delete(archivedHfileDir, true);<a 
name="line.380"></a>
+<span class="sourceLineNo">381</span>    fs.mkdirs(archivedHfileDir);<a 
name="line.381"></a>
+<span class="sourceLineNo">382</span>    createFilesForTesting(LARGE_FILE_NUM, 
SMALL_FILE_NUM, fs, archivedHfileDir);<a name="line.382"></a>
+<span class="sourceLineNo">383</span><a name="line.383"></a>
+<span class="sourceLineNo">384</span>    // call cleaner, run as daemon to 
test the interrupt-at-middle case<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    Thread t = new Thread() {<a 
name="line.385"></a>
+<span class="sourceLineNo">386</span>      @Override<a name="line.386"></a>
+<span class="sourceLineNo">387</span>      public void run() {<a 
name="line.387"></a>
+<span class="sourceLineNo">388</span>        cleaner.chore();<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>    t.setDaemon(true);<a 
name="line.391"></a>
+<span class="sourceLineNo">392</span>    t.start();<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    // wait until file clean started<a 
name="line.393"></a>
+<span class="sourceLineNo">394</span>    while 
(cleaner.getNumOfDeletedSmallFiles() == 0) {<a name="line.394"></a>
+<span class="sourceLineNo">395</span>      Thread.yield();<a 
name="line.395"></a>
+<span class="sourceLineNo">396</span>    }<a name="line.396"></a>
+<span class="sourceLineNo">397</span><a name="line.397"></a>
+<span class="sourceLineNo">398</span>    // trigger configuration change<a 
name="line.398"></a>
+<span class="sourceLineNo">399</span>    Configuration newConf = new 
Configuration(conf);<a name="line.399"></a>
+<span class="sourceLineNo">400</span>    
newConf.setInt(HFileCleaner.HFILE_DELETE_THROTTLE_THRESHOLD, 
UPDATE_THROTTLE_POINT);<a name="line.400"></a>
+<span class="sourceLineNo">401</span>    
newConf.setInt(HFileCleaner.LARGE_HFILE_QUEUE_INIT_SIZE, 
UPDATE_QUEUE_INIT_SIZE);<a name="line.401"></a>
+<span class="sourceLineNo">402</span>    
newConf.setInt(HFileCleaner.SMALL_HFILE_QUEUE_INIT_SIZE, 
UPDATE_QUEUE_INIT_SIZE);<a name="line.402"></a>
+<span class="sourceLineNo">403</span>    
newConf.setInt(HFileCleaner.LARGE_HFILE_DELETE_THREAD_NUMBER, 
LARGE_THREAD_NUM);<a name="line.403"></a>
+<span class="sourceLineNo">404</span>    
newConf.setInt(HFileCleaner.SMALL_HFILE_DELETE_THREAD_NUMBER, 
SMALL_THREAD_NUM);<a name="line.404"></a>
+<span class="sourceLineNo">405</span>    
newConf.setLong(HFileCleaner.HFILE_DELETE_THREAD_TIMEOUT_MSEC, 
THREAD_TIMEOUT_MSEC);<a name="line.405"></a>
+<span class="sourceLineNo">406</span>    
newConf.setLong(HFileCleaner.HFILE_DELETE_THREAD_CHECK_INTERVAL_MSEC,<a 
name="line.406"></a>
+<span class="sourceLineNo">407</span>        THREAD_CHECK_INTERVAL_MSEC);<a 
name="line.407"></a>
 <span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span>    // make sure no cost when 
onConfigurationChange called with no change<a name="line.409"></a>
-<span class="sourceLineNo">410</span>    List&lt;Thread&gt; oldThreads = 
cleaner.getCleanerThreads();<a name="line.410"></a>
+<span class="sourceLineNo">409</span>    LOG.debug("File deleted from large 
queue: " + cleaner.getNumOfDeletedLargeFiles()<a name="line.409"></a>
+<span class="sourceLineNo">410</span>        + "; from small queue: " + 
cleaner.getNumOfDeletedSmallFiles());<a name="line.410"></a>
 <span class="sourceLineNo">411</span>    
cleaner.onConfigurationChange(newConf);<a name="line.411"></a>
-<span class="sourceLineNo">412</span>    List&lt;Thread&gt; newThreads = 
cleaner.getCleanerThreads();<a name="line.412"></a>
-<span class="sourceLineNo">413</span>    
Assert.assertArrayEquals(oldThreads.toArray(), newThreads.toArray());<a 
name="line.413"></a>
-<span class="sourceLineNo">414</span><a name="line.414"></a>
-<span class="sourceLineNo">415</span>    // wait until clean done and check<a 
name="line.415"></a>
-<span class="sourceLineNo">416</span>    t.join();<a name="line.416"></a>
-<span class="sourceLineNo">417</span>    LOG.debug("File deleted from large 
queue: " + cleaner.getNumOfDeletedLargeFiles()<a name="line.417"></a>
-<span class="sourceLineNo">418</span>        + "; from small queue: " + 
cleaner.getNumOfDeletedSmallFiles());<a name="line.418"></a>
-<span class="sourceLineNo">419</span>    Assert.assertTrue("Should delete more 
than " + LARGE_FILE_NUM<a name="line.419"></a>
-<span class="sourceLineNo">420</span>        + " files from large queue but 
actually " + cleaner.getNumOfDeletedLargeFiles(),<a name="line.420"></a>
-<span class="sourceLineNo">421</span>      cleaner.getNumOfDeletedLargeFiles() 
&gt; LARGE_FILE_NUM);<a name="line.421"></a>
-<span class="sourceLineNo">422</span>    Assert.assertTrue("Should delete less 
than " + SMALL_FILE_NUM<a name="line.422"></a>
-<span class="sourceLineNo">423</span>        + " files from small queue but 
actually " + cleaner.getNumOfDeletedSmallFiles(),<a name="line.423"></a>
-<span class="sourceLineNo">424</span>      cleaner.getNumOfDeletedSmallFiles() 
&lt; SMALL_FILE_NUM);<a name="line.424"></a>
-<span class="sourceLineNo">425</span>  }<a name="line.425"></a>
+<span class="sourceLineNo">412</span><a name="line.412"></a>
+<span class="sourceLineNo">413</span>    // check values after change<a 
name="line.413"></a>
+<span class="sourceLineNo">414</span>    
Assert.assertEquals(UPDATE_THROTTLE_POINT, cleaner.getThrottlePoint());<a 
name="line.414"></a>
+<span class="sourceLineNo">415</span>    
Assert.assertEquals(UPDATE_QUEUE_INIT_SIZE, cleaner.getLargeQueueInitSize());<a 
name="line.415"></a>
+<span class="sourceLineNo">416</span>    
Assert.assertEquals(UPDATE_QUEUE_INIT_SIZE, cleaner.getSmallQueueInitSize());<a 
name="line.416"></a>
+<span class="sourceLineNo">417</span>    Assert.assertEquals(LARGE_THREAD_NUM 
+ SMALL_THREAD_NUM, cleaner.getCleanerThreads().size());<a name="line.417"></a>
+<span class="sourceLineNo">418</span>    
Assert.assertEquals(THREAD_TIMEOUT_MSEC, 
cleaner.getCleanerThreadTimeoutMsec());<a name="line.418"></a>
+<span class="sourceLineNo">419</span>    
Assert.assertEquals(THREAD_CHECK_INTERVAL_MSEC, 
cleaner.getCleanerThreadCheckIntervalMsec());<a name="line.419"></a>
+<span class="sourceLineNo">420</span><a name="line.420"></a>
+<span class="sourceLineNo">421</span>    // make sure no cost when 
onConfigurationChange called with no change<a name="line.421"></a>
+<span class="sourceLineNo">422</span>    List&lt;Thread&gt; oldThreads = 
cleaner.getCleanerThreads();<a name="line.422"></a>
+<span class="sourceLineNo">423</span>    
cleaner.onConfigurationChange(newConf);<a name="line.423"></a>
+<span class="sourceLineNo">424</span>    List&lt;Thread&gt; newThreads = 
cleaner.getCleanerThreads();<a name="line.424"></a>
+<span class="sourceLineNo">425</span>    
Assert.assertArrayEquals(oldThreads.toArray(), newThreads.toArray());<a 
name="line.425"></a>
 <span class="sourceLineNo">426</span><a name="line.426"></a>
-<span class="sourceLineNo">427</span>  private void createFilesForTesting(int 
largeFileNum, int smallFileNum, FileSystem fs,<a name="line.427"></a>
-<span class="sourceLineNo">428</span>      Path archivedHfileDir) throws 
IOException {<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    final Random rand = new Random();<a 
name="line.429"></a>
-<span class="sourceLineNo">430</span>    final byte[] large = new byte[1024 * 
1024];<a name="line.430"></a>
-<span class="sourceLineNo">431</span>    for (int i = 0; i &lt; large.length; 
i++) {<a name="line.431"></a>
-<span class="sourceLineNo">432</span>      large[i] = (byte) 
rand.nextInt(128);<a name="line.432"></a>
-<span class="sourceLineNo">433</span>    }<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    final byte[] small = new 
byte[1024];<a name="line.434"></a>
-<span class="sourceLineNo">435</span>    for (int i = 0; i &lt; small.length; 
i++) {<a name="line.435"></a>
-<span class="sourceLineNo">436</span>      small[i] = (byte) 
rand.nextInt(128);<a name="line.436"></a>
-<span class="sourceLineNo">437</span>    }<a name="line.437"></a>
-<span class="sourceLineNo">438</span>    // create large and small files<a 
name="line.438"></a>
-<span class="sourceLineNo">439</span>    for (int i = 1; i &lt;= largeFileNum; 
i++) {<a name="line.439"></a>
-<span class="sourceLineNo">440</span>      FSDataOutputStream out = 
fs.create(new Path(archivedHfileDir, "large-file-" + i));<a name="line.440"></a>
-<span class="sourceLineNo">441</span>      out.write(large);<a 
name="line.441"></a>
-<span class="sourceLineNo">442</span>      out.close();<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    }<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    for (int i = 1; i &lt;= smallFileNum; 
i++) {<a name="line.444"></a>
-<span class="sourceLineNo">445</span>      FSDataOutputStream out = 
fs.create(new Path(archivedHfileDir, "small-file-" + i));<a name="line.445"></a>
-<span class="sourceLineNo">446</span>      out.write(small);<a 
name="line.446"></a>
-<span class="sourceLineNo">447</span>      out.close();<a name="line.447"></a>
-<span class="sourceLineNo">448</span>    }<a name="line.448"></a>
-<span class="sourceLineNo">449</span>  }<a name="line.449"></a>
-<span class="sourceLineNo">450</span>}<a name="line.450"></a>
+<span class="sourceLineNo">427</span>    // wait until clean done and check<a 
name="line.427"></a>
+<span class="sourceLineNo">428</span>    t.join();<a name="line.428"></a>
+<span class="sourceLineNo">429</span>    LOG.debug("File deleted from large 
queue: " + cleaner.getNumOfDeletedLargeFiles()<a name="line.429"></a>
+<span class="sourceLineNo">430</span>        + "; from small queue: " + 
cleaner.getNumOfDeletedSmallFiles());<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    Assert.assertTrue("Should delete more 
than " + LARGE_FILE_NUM<a name="line.431"></a>
+<span class="sourceLineNo">432</span>        + " files from large queue but 
actually " + cleaner.getNumOfDeletedLargeFiles(),<a name="line.432"></a>
+<span class="sourceLineNo">433</span>      cleaner.getNumOfDeletedLargeFiles() 
&gt; LARGE_FILE_NUM);<a name="line.433"></a>
+<span class="sourceLineNo">434</span>    Assert.assertTrue("Should delete less 
than " + SMALL_FILE_NUM<a name="line.434"></a>
+<span class="sourceLineNo">435</span>        + " files from small queue but 
actually " + cleaner.getNumOfDeletedSmallFiles(),<a name="line.435"></a>
+<span class="sourceLineNo">436</span>      cleaner.getNumOfDeletedSmallFiles() 
&lt; SMALL_FILE_NUM);<a name="line.436"></a>
+<span class="sourceLineNo">437</span>  }<a name="line.437"></a>
+<span class="sourceLineNo">438</span><a name="line.438"></a>
+<span class="sourceLineNo">439</span>  private void createFilesForTesting(int 
largeFileNum, int smallFileNum, FileSystem fs,<a name="line.439"></a>
+<span class="sourceLineNo">440</span>      Path archivedHfileDir) throws 
IOException {<a name="line.440"></a>
+<span class="sourceLineNo">441</span>    final Random rand = new Random();<a 
name="line.441"></a>
+<span class="sourceLineNo">442</span>    final byte[] large = new byte[1024 * 
1024];<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    for (int i = 0; i &lt; large.length; 
i++) {<a name="line.443"></a>
+<span class="sourceLineNo">444</span>      large[i] = (byte) 
rand.nextInt(128);<a name="line.444"></a>
+<span class="sourceLineNo">445</span>    }<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    final byte[] small = new 
byte[1024];<a name="line.446"></a>
+<span class="sourceLineNo">447</span>    for (int i = 0; i &lt; small.length; 
i++) {<a name="line.447"></a>
+<span class="sourceLineNo">448</span>      small[i] = (byte) 
rand.nextInt(128);<a name="line.448"></a>
+<span class="sourceLineNo">449</span>    }<a name="line.449"></a>
+<span class="sourceLineNo">450</span>    // create large and small files<a 
name="line.450"></a>
+<span class="sourceLineNo">451</span>    for (int i = 1; i &lt;= largeFileNum; 
i++) {<a name="line.451"></a>
+<span class="sourceLineNo">452</span>      FSDataOutputStream out = 
fs.create(new Path(archivedHfileDir, "large-file-" + i));<a name="line.452"></a>
+<span class="sourceLineNo">453</span>      out.write(large);<a 
name="line.453"></a>
+<span class="sourceLineNo">454</span>      out.close();<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    }<a name="line.455"></a>
+<span class="sourceLineNo">456</span>    for (int i = 1; i &lt;= smallFileNum; 
i++) {<a name="line.456"></a>
+<span class="sourceLineNo">457</span>      FSDataOutputStream out = 
fs.create(new Path(archivedHfileDir, "small-file-" + i));<a name="line.457"></a>
+<span class="sourceLineNo">458</span>      out.write(small);<a 
name="line.458"></a>
+<span class="sourceLineNo">459</span>      out.close();<a name="line.459"></a>
+<span class="sourceLineNo">460</span>    }<a name="line.460"></a>
+<span class="sourceLineNo">461</span>  }<a name="line.461"></a>
+<span class="sourceLineNo">462</span>}<a name="line.462"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b248f175/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.DummyServer.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.DummyServer.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.DummyServer.html
index f5e01ff..4b3889d 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.DummyServer.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.DummyServer.html
@@ -287,149 +287,165 @@
 <span class="sourceLineNo">279</span>  @Test<a name="line.279"></a>
 <span class="sourceLineNo">280</span>  public void testOnConfigurationChange() 
throws Exception {<a name="line.280"></a>
 <span class="sourceLineNo">281</span>    Configuration conf = 
TEST_UTIL.getConfiguration();<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    
conf.setInt(LogCleaner.OLD_WALS_CLEANER_SIZE, 
LogCleaner.OLD_WALS_CLEANER_DEFAULT_SIZE);<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    // Prepare environments<a 
name="line.283"></a>
-<span class="sourceLineNo">284</span>    Server server = new DummyServer();<a 
name="line.284"></a>
-<span class="sourceLineNo">285</span>    Path oldWALsDir = new 
Path(TEST_UTIL.getDefaultRootDirPath(),<a name="line.285"></a>
-<span class="sourceLineNo">286</span>        
HConstants.HREGION_OLDLOGDIR_NAME);<a name="line.286"></a>
-<span class="sourceLineNo">287</span>    FileSystem fs = 
TEST_UTIL.getDFSCluster().getFileSystem();<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    LogCleaner cleaner = new 
LogCleaner(3000, server, conf, fs, oldWALsDir);<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    
assertEquals(LogCleaner.OLD_WALS_CLEANER_DEFAULT_SIZE, 
cleaner.getSizeOfCleaners());<a name="line.289"></a>
-<span class="sourceLineNo">290</span>    // Create dir and files for test<a 
name="line.290"></a>
-<span class="sourceLineNo">291</span>    fs.delete(oldWALsDir, true);<a 
name="line.291"></a>
-<span class="sourceLineNo">292</span>    fs.mkdirs(oldWALsDir);<a 
name="line.292"></a>
-<span class="sourceLineNo">293</span>    int numOfFiles = 10;<a 
name="line.293"></a>
-<span class="sourceLineNo">294</span>    createFiles(fs, oldWALsDir, 
numOfFiles);<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    FileStatus[] status = 
fs.listStatus(oldWALsDir);<a name="line.295"></a>
-<span class="sourceLineNo">296</span>    assertEquals(numOfFiles, 
status.length);<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    // Start cleaner chore<a 
name="line.297"></a>
-<span class="sourceLineNo">298</span>    Thread thread = new Thread(() -&gt; 
cleaner.chore());<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    thread.setDaemon(true);<a 
name="line.299"></a>
-<span class="sourceLineNo">300</span>    thread.start();<a name="line.300"></a>
-<span class="sourceLineNo">301</span>    // change size of cleaners 
dynamically<a name="line.301"></a>
-<span class="sourceLineNo">302</span>    int sizeToChange = 4;<a 
name="line.302"></a>
-<span class="sourceLineNo">303</span>    
conf.setInt(LogCleaner.OLD_WALS_CLEANER_SIZE, sizeToChange);<a 
name="line.303"></a>
-<span class="sourceLineNo">304</span>    
cleaner.onConfigurationChange(conf);<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    assertEquals(sizeToChange, 
cleaner.getSizeOfCleaners());<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    // Stop chore<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    thread.join();<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    status = fs.listStatus(oldWALsDir);<a 
name="line.308"></a>
-<span class="sourceLineNo">309</span>    assertEquals(0, status.length);<a 
name="line.309"></a>
-<span class="sourceLineNo">310</span>  }<a name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span>  private void createFiles(FileSystem fs, 
Path parentDir, int numOfFiles) throws IOException {<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    Random random = new Random();<a 
name="line.313"></a>
-<span class="sourceLineNo">314</span>    for (int i = 0; i &lt; numOfFiles; 
i++) {<a name="line.314"></a>
-<span class="sourceLineNo">315</span>      int xMega = 1 + random.nextInt(3); 
// size of each file is between 1~3M<a name="line.315"></a>
-<span class="sourceLineNo">316</span>      try (FSDataOutputStream fsdos = 
fs.create(new Path(parentDir, "file-" + i))) {<a name="line.316"></a>
-<span class="sourceLineNo">317</span>        for (int m = 0; m &lt; xMega; 
m++) {<a name="line.317"></a>
-<span class="sourceLineNo">318</span>          byte[] M = new byte[1024 * 
1024];<a name="line.318"></a>
-<span class="sourceLineNo">319</span>          random.nextBytes(M);<a 
name="line.319"></a>
-<span class="sourceLineNo">320</span>          fsdos.write(M);<a 
name="line.320"></a>
-<span class="sourceLineNo">321</span>        }<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>  }<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span>  static class DummyServer implements 
Server {<a name="line.326"></a>
+<span class="sourceLineNo">282</span>    
conf.setInt(LogCleaner.OLD_WALS_CLEANER_THREAD_SIZE,<a name="line.282"></a>
+<span class="sourceLineNo">283</span>        
LogCleaner.DEFAULT_OLD_WALS_CLEANER_THREAD_SIZE);<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    
conf.setLong(LogCleaner.OLD_WALS_CLEANER_THREAD_TIMEOUT_MSEC,<a 
name="line.284"></a>
+<span class="sourceLineNo">285</span>        
LogCleaner.DEFAULT_OLD_WALS_CLEANER_THREAD_TIMEOUT_MSEC);<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    
conf.setLong(LogCleaner.OLD_WALS_CLEANER_THREAD_CHECK_INTERVAL_MSEC,<a 
name="line.286"></a>
+<span class="sourceLineNo">287</span>        
LogCleaner.DEFAULT_OLD_WALS_CLEANER_THREAD_CHECK_INTERVAL_MSEC);<a 
name="line.287"></a>
+<span class="sourceLineNo">288</span>    // Prepare environments<a 
name="line.288"></a>
+<span class="sourceLineNo">289</span>    Server server = new DummyServer();<a 
name="line.289"></a>
+<span class="sourceLineNo">290</span>    Path oldWALsDir = new 
Path(TEST_UTIL.getDefaultRootDirPath(),<a name="line.290"></a>
+<span class="sourceLineNo">291</span>        
HConstants.HREGION_OLDLOGDIR_NAME);<a name="line.291"></a>
+<span class="sourceLineNo">292</span>    FileSystem fs = 
TEST_UTIL.getDFSCluster().getFileSystem();<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    LogCleaner cleaner = new 
LogCleaner(3000, server, conf, fs, oldWALsDir);<a name="line.293"></a>
+<span class="sourceLineNo">294</span>    
assertEquals(LogCleaner.DEFAULT_OLD_WALS_CLEANER_THREAD_SIZE, 
cleaner.getSizeOfCleaners());<a name="line.294"></a>
+<span class="sourceLineNo">295</span>    
assertEquals(LogCleaner.DEFAULT_OLD_WALS_CLEANER_THREAD_TIMEOUT_MSEC,<a 
name="line.295"></a>
+<span class="sourceLineNo">296</span>        
cleaner.getCleanerThreadTimeoutMsec());<a name="line.296"></a>
+<span class="sourceLineNo">297</span>    
assertEquals(LogCleaner.DEFAULT_OLD_WALS_CLEANER_THREAD_CHECK_INTERVAL_MSEC,<a 
name="line.297"></a>
+<span class="sourceLineNo">298</span>        
cleaner.getCleanerThreadCheckIntervalMsec());<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    // Create dir and files for test<a 
name="line.299"></a>
+<span class="sourceLineNo">300</span>    fs.delete(oldWALsDir, true);<a 
name="line.300"></a>
+<span class="sourceLineNo">301</span>    fs.mkdirs(oldWALsDir);<a 
name="line.301"></a>
+<span class="sourceLineNo">302</span>    int numOfFiles = 10;<a 
name="line.302"></a>
+<span class="sourceLineNo">303</span>    createFiles(fs, oldWALsDir, 
numOfFiles);<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    FileStatus[] status = 
fs.listStatus(oldWALsDir);<a name="line.304"></a>
+<span class="sourceLineNo">305</span>    assertEquals(numOfFiles, 
status.length);<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    // Start cleaner chore<a 
name="line.306"></a>
+<span class="sourceLineNo">307</span>    Thread thread = new Thread(() -&gt; 
cleaner.chore());<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    thread.setDaemon(true);<a 
name="line.308"></a>
+<span class="sourceLineNo">309</span>    thread.start();<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    // change size of cleaners 
dynamically<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    int sizeToChange = 4;<a 
name="line.311"></a>
+<span class="sourceLineNo">312</span>    long threadTimeoutToChange = 30 * 
1000L;<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    long threadCheckIntervalToChange = 
250L;<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    
conf.setInt(LogCleaner.OLD_WALS_CLEANER_THREAD_SIZE, sizeToChange);<a 
name="line.314"></a>
+<span class="sourceLineNo">315</span>    
conf.setLong(LogCleaner.OLD_WALS_CLEANER_THREAD_TIMEOUT_MSEC, 
threadTimeoutToChange);<a name="line.315"></a>
+<span class="sourceLineNo">316</span>    
conf.setLong(LogCleaner.OLD_WALS_CLEANER_THREAD_CHECK_INTERVAL_MSEC,<a 
name="line.316"></a>
+<span class="sourceLineNo">317</span>        threadCheckIntervalToChange);<a 
name="line.317"></a>
+<span class="sourceLineNo">318</span>    
cleaner.onConfigurationChange(conf);<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    assertEquals(sizeToChange, 
cleaner.getSizeOfCleaners());<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    assertEquals(threadTimeoutToChange, 
cleaner.getCleanerThreadTimeoutMsec());<a name="line.320"></a>
+<span class="sourceLineNo">321</span>    
assertEquals(threadCheckIntervalToChange, 
cleaner.getCleanerThreadCheckIntervalMsec());<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    // Stop chore<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    thread.join();<a name="line.323"></a>
+<span class="sourceLineNo">324</span>    status = fs.listStatus(oldWALsDir);<a 
name="line.324"></a>
+<span class="sourceLineNo">325</span>    assertEquals(0, status.length);<a 
name="line.325"></a>
+<span class="sourceLineNo">326</span>  }<a name="line.326"></a>
 <span class="sourceLineNo">327</span><a name="line.327"></a>
-<span class="sourceLineNo">328</span>    @Override<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    public Configuration 
getConfiguration() {<a name="line.329"></a>
-<span class="sourceLineNo">330</span>      return 
TEST_UTIL.getConfiguration();<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    }<a name="line.331"></a>
-<span class="sourceLineNo">332</span><a name="line.332"></a>
-<span class="sourceLineNo">333</span>    @Override<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    public ZKWatcher getZooKeeper() {<a 
name="line.334"></a>
-<span class="sourceLineNo">335</span>      try {<a name="line.335"></a>
-<span class="sourceLineNo">336</span>        return new 
ZKWatcher(getConfiguration(), "dummy server", this);<a name="line.336"></a>
-<span class="sourceLineNo">337</span>      } catch (IOException e) {<a 
name="line.337"></a>
-<span class="sourceLineNo">338</span>        e.printStackTrace();<a 
name="line.338"></a>
-<span class="sourceLineNo">339</span>      }<a name="line.339"></a>
-<span class="sourceLineNo">340</span>      return null;<a name="line.340"></a>
-<span class="sourceLineNo">341</span>    }<a name="line.341"></a>
-<span class="sourceLineNo">342</span><a name="line.342"></a>
-<span class="sourceLineNo">343</span>    @Override<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    public CoordinatedStateManager 
getCoordinatedStateManager() {<a name="line.344"></a>
-<span class="sourceLineNo">345</span>      return null;<a name="line.345"></a>
-<span class="sourceLineNo">346</span>    }<a name="line.346"></a>
-<span class="sourceLineNo">347</span><a name="line.347"></a>
-<span class="sourceLineNo">348</span>    @Override<a name="line.348"></a>
-<span class="sourceLineNo">349</span>    public ClusterConnection 
getConnection() {<a name="line.349"></a>
-<span class="sourceLineNo">350</span>      return null;<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 MetaTableLocator 
getMetaTableLocator() {<a name="line.354"></a>
-<span class="sourceLineNo">355</span>      return null;<a name="line.355"></a>
-<span class="sourceLineNo">356</span>    }<a name="line.356"></a>
-<span class="sourceLineNo">357</span><a name="line.357"></a>
-<span class="sourceLineNo">358</span>    @Override<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    public ServerName getServerName() {<a 
name="line.359"></a>
-<span class="sourceLineNo">360</span>      return 
ServerName.valueOf("regionserver,60020,000000");<a name="line.360"></a>
-<span class="sourceLineNo">361</span>    }<a name="line.361"></a>
-<span class="sourceLineNo">362</span><a name="line.362"></a>
-<span class="sourceLineNo">363</span>    @Override<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    public void abort(String why, 
Throwable e) {}<a name="line.364"></a>
-<span class="sourceLineNo">365</span><a name="line.365"></a>
-<span class="sourceLineNo">366</span>    @Override<a name="line.366"></a>
-<span class="sourceLineNo">367</span>    public boolean isAborted() {<a 
name="line.367"></a>
-<span class="sourceLineNo">368</span>      return false;<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>    @Override<a name="line.371"></a>
-<span class="sourceLineNo">372</span>    public void stop(String why) {}<a 
name="line.372"></a>
+<span class="sourceLineNo">328</span>  private void createFiles(FileSystem fs, 
Path parentDir, int numOfFiles) throws IOException {<a name="line.328"></a>
+<span class="sourceLineNo">329</span>    Random random = new Random();<a 
name="line.329"></a>
+<span class="sourceLineNo">330</span>    for (int i = 0; i &lt; numOfFiles; 
i++) {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      int xMega = 1 + random.nextInt(3); 
// size of each file is between 1~3M<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      try (FSDataOutputStream fsdos = 
fs.create(new Path(parentDir, "file-" + i))) {<a name="line.332"></a>
+<span class="sourceLineNo">333</span>        for (int m = 0; m &lt; xMega; 
m++) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span>          byte[] M = new byte[1024 * 
1024];<a name="line.334"></a>
+<span class="sourceLineNo">335</span>          random.nextBytes(M);<a 
name="line.335"></a>
+<span class="sourceLineNo">336</span>          fsdos.write(M);<a 
name="line.336"></a>
+<span class="sourceLineNo">337</span>        }<a name="line.337"></a>
+<span class="sourceLineNo">338</span>      }<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    }<a name="line.339"></a>
+<span class="sourceLineNo">340</span>  }<a name="line.340"></a>
+<span class="sourceLineNo">341</span><a name="line.341"></a>
+<span class="sourceLineNo">342</span>  static class DummyServer implements 
Server {<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 Configuration 
getConfiguration() {<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      return 
TEST_UTIL.getConfiguration();<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>    @Override<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    public ZKWatcher getZooKeeper() {<a 
name="line.350"></a>
+<span class="sourceLineNo">351</span>      try {<a name="line.351"></a>
+<span class="sourceLineNo">352</span>        return new 
ZKWatcher(getConfiguration(), "dummy server", this);<a name="line.352"></a>
+<span class="sourceLineNo">353</span>      } catch (IOException e) {<a 
name="line.353"></a>
+<span class="sourceLineNo">354</span>        e.printStackTrace();<a 
name="line.354"></a>
+<span class="sourceLineNo">355</span>      }<a name="line.355"></a>
+<span class="sourceLineNo">356</span>      return null;<a name="line.356"></a>
+<span class="sourceLineNo">357</span>    }<a name="line.357"></a>
+<span class="sourceLineNo">358</span><a name="line.358"></a>
+<span class="sourceLineNo">359</span>    @Override<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    public CoordinatedStateManager 
getCoordinatedStateManager() {<a name="line.360"></a>
+<span class="sourceLineNo">361</span>      return null;<a name="line.361"></a>
+<span class="sourceLineNo">362</span>    }<a name="line.362"></a>
+<span class="sourceLineNo">363</span><a name="line.363"></a>
+<span class="sourceLineNo">364</span>    @Override<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    public ClusterConnection 
getConnection() {<a name="line.365"></a>
+<span class="sourceLineNo">366</span>      return null;<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    }<a name="line.367"></a>
+<span class="sourceLineNo">368</span><a name="line.368"></a>
+<span class="sourceLineNo">369</span>    @Override<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    public MetaTableLocator 
getMetaTableLocator() {<a name="line.370"></a>
+<span class="sourceLineNo">371</span>      return null;<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    }<a name="line.372"></a>
 <span class="sourceLineNo">373</span><a name="line.373"></a>
 <span class="sourceLineNo">374</span>    @Override<a name="line.374"></a>
-<span class="sourceLineNo">375</span>    public boolean isStopped() {<a 
name="line.375"></a>
-<span class="sourceLineNo">376</span>      return false;<a name="line.376"></a>
+<span class="sourceLineNo">375</span>    public ServerName getServerName() {<a 
name="line.375"></a>
+<span class="sourceLineNo">376</span>      return 
ServerName.valueOf("regionserver,60020,000000");<a name="line.376"></a>
 <span class="sourceLineNo">377</span>    }<a name="line.377"></a>
 <span class="sourceLineNo">378</span><a name="line.378"></a>
 <span class="sourceLineNo">379</span>    @Override<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    public ChoreService getChoreService() 
{<a name="line.380"></a>
-<span class="sourceLineNo">381</span>      return null;<a name="line.381"></a>
-<span class="sourceLineNo">382</span>    }<a name="line.382"></a>
-<span class="sourceLineNo">383</span><a name="line.383"></a>
-<span class="sourceLineNo">384</span>    @Override<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    public ClusterConnection 
getClusterConnection() {<a name="line.385"></a>
-<span class="sourceLineNo">386</span>      return null;<a name="line.386"></a>
-<span class="sourceLineNo">387</span>    }<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span>    @Override<a name="line.389"></a>
-<span class="sourceLineNo">390</span>    public FileSystem getFileSystem() {<a 
name="line.390"></a>
-<span class="sourceLineNo">391</span>      return null;<a name="line.391"></a>
-<span class="sourceLineNo">392</span>    }<a name="line.392"></a>
-<span class="sourceLineNo">393</span><a name="line.393"></a>
-<span class="sourceLineNo">394</span>    @Override<a name="line.394"></a>
-<span class="sourceLineNo">395</span>    public boolean isStopping() {<a 
name="line.395"></a>
-<span class="sourceLineNo">396</span>      return false;<a name="line.396"></a>
-<span class="sourceLineNo">397</span>    }<a name="line.397"></a>
-<span class="sourceLineNo">398</span><a name="line.398"></a>
-<span class="sourceLineNo">399</span>    @Override<a name="line.399"></a>
-<span class="sourceLineNo">400</span>    public Connection 
createConnection(Configuration conf) throws IOException {<a name="line.400"></a>
-<span class="sourceLineNo">401</span>      return null;<a name="line.401"></a>
-<span class="sourceLineNo">402</span>    }<a name="line.402"></a>
-<span class="sourceLineNo">403</span>  }<a name="line.403"></a>
+<span class="sourceLineNo">380</span>    public void abort(String why, 
Throwable e) {}<a name="line.380"></a>
+<span class="sourceLineNo">381</span><a name="line.381"></a>
+<span class="sourceLineNo">382</span>    @Override<a name="line.382"></a>
+<span class="sourceLineNo">383</span>    public boolean isAborted() {<a 
name="line.383"></a>
+<span class="sourceLineNo">384</span>      return false;<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    }<a name="line.385"></a>
+<span class="sourceLineNo">386</span><a name="line.386"></a>
+<span class="sourceLineNo">387</span>    @Override<a name="line.387"></a>
+<span class="sourceLineNo">388</span>    public void stop(String why) {}<a 
name="line.388"></a>
+<span class="sourceLineNo">389</span><a name="line.389"></a>
+<span class="sourceLineNo">390</span>    @Override<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    public boolean isStopped() {<a 
name="line.391"></a>
+<span class="sourceLineNo">392</span>      return false;<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    }<a name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span>    @Override<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    public ChoreService getChoreService() 
{<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      return null;<a name="line.397"></a>
+<span class="sourceLineNo">398</span>    }<a name="line.398"></a>
+<span class="sourceLineNo">399</span><a name="line.399"></a>
+<span class="sourceLineNo">400</span>    @Override<a name="line.400"></a>
+<span class="sourceLineNo">401</span>    public ClusterConnection 
getClusterConnection() {<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      return null;<a name="line.402"></a>
+<span class="sourceLineNo">403</span>    }<a name="line.403"></a>
 <span class="sourceLineNo">404</span><a name="line.404"></a>
-<span class="sourceLineNo">405</span>  static class FaultyZooKeeperWatcher 
extends ZKWatcher {<a name="line.405"></a>
-<span class="sourceLineNo">406</span>    private RecoverableZooKeeper zk;<a 
name="line.406"></a>
-<span class="sourceLineNo">407</span><a name="line.407"></a>
-<span class="sourceLineNo">408</span>    public 
FaultyZooKeeperWatcher(Configuration conf, String identifier, Abortable 
abortable)<a name="line.408"></a>
-<span class="sourceLineNo">409</span>        throws 
ZooKeeperConnectionException, IOException {<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      super(conf, identifier, 
abortable);<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>    public void init() throws Exception 
{<a name="line.413"></a>
-<span class="sourceLineNo">414</span>      this.zk = 
spy(super.getRecoverableZooKeeper());<a name="line.414"></a>
-<span class="sourceLineNo">415</span>      doThrow(new 
KeeperException.ConnectionLossException())<a name="line.415"></a>
-<span class="sourceLineNo">416</span>        
.when(zk).getChildren("/hbase/replication/rs", null);<a name="line.416"></a>
-<span class="sourceLineNo">417</span>    }<a name="line.417"></a>
-<span class="sourceLineNo">418</span><a name="line.418"></a>
-<span class="sourceLineNo">419</span>    @Override<a name="line.419"></a>
-<span class="sourceLineNo">420</span>    public RecoverableZooKeeper 
getRecoverableZooKeeper() {<a name="line.420"></a>
-<span class="sourceLineNo">421</span>      return zk;<a name="line.421"></a>
-<span class="sourceLineNo">422</span>    }<a name="line.422"></a>
-<span class="sourceLineNo">423</span>  }<a name="line.423"></a>
-<span class="sourceLineNo">424</span>}<a name="line.424"></a>
+<span class="sourceLineNo">405</span>    @Override<a name="line.405"></a>
+<span class="sourceLineNo">406</span>    public FileSystem getFileSystem() {<a 
name="line.406"></a>
+<span class="sourceLineNo">407</span>      return null;<a name="line.407"></a>
+<span class="sourceLineNo">408</span>    }<a name="line.408"></a>
+<span class="sourceLineNo">409</span><a name="line.409"></a>
+<span class="sourceLineNo">410</span>    @Override<a name="line.410"></a>
+<span class="sourceLineNo">411</span>    public boolean isStopping() {<a 
name="line.411"></a>
+<span class="sourceLineNo">412</span>      return false;<a name="line.412"></a>
+<span class="sourceLineNo">413</span>    }<a name="line.413"></a>
+<span class="sourceLineNo">414</span><a name="line.414"></a>
+<span class="sourceLineNo">415</span>    @Override<a name="line.415"></a>
+<span class="sourceLineNo">416</span>    public Connection 
createConnection(Configuration conf) throws IOException {<a name="line.416"></a>
+<span class="sourceLineNo">417</span>      return null;<a name="line.417"></a>
+<span class="sourceLineNo">418</span>    }<a name="line.418"></a>
+<span class="sourceLineNo">419</span>  }<a name="line.419"></a>
+<span class="sourceLineNo">420</span><a name="line.420"></a>
+<span class="sourceLineNo">421</span>  static class FaultyZooKeeperWatcher 
extends ZKWatcher {<a name="line.421"></a>
+<span class="sourceLineNo">422</span>    private RecoverableZooKeeper zk;<a 
name="line.422"></a>
+<span class="sourceLineNo">423</span><a name="line.423"></a>
+<span class="sourceLineNo">424</span>    public 
FaultyZooKeeperWatcher(Configuration conf, String identifier, Abortable 
abortable)<a name="line.424"></a>
+<span class="sourceLineNo">425</span>        throws 
ZooKeeperConnectionException, IOException {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>      super(conf, identifier, 
abortable);<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    }<a name="line.427"></a>
+<span class="sourceLineNo">428</span><a name="line.428"></a>
+<span class="sourceLineNo">429</span>    public void init() throws Exception 
{<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      this.zk = 
spy(super.getRecoverableZooKeeper());<a name="line.430"></a>
+<span class="sourceLineNo">431</span>      doThrow(new 
KeeperException.ConnectionLossException())<a name="line.431"></a>
+<span class="sourceLineNo">432</span>        
.when(zk).getChildren("/hbase/replication/rs", null);<a name="line.432"></a>
+<span class="sourceLineNo">433</span>    }<a name="line.433"></a>
+<span class="sourceLineNo">434</span><a name="line.434"></a>
+<span class="sourceLineNo">435</span>    @Override<a name="line.435"></a>
+<span class="sourceLineNo">436</span>    public RecoverableZooKeeper 
getRecoverableZooKeeper() {<a name="line.436"></a>
+<span class="sourceLineNo">437</span>      return zk;<a name="line.437"></a>
+<span class="sourceLineNo">438</span>    }<a name="line.438"></a>
+<span class="sourceLineNo">439</span>  }<a name="line.439"></a>
+<span class="sourceLineNo">440</span>}<a name="line.440"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b248f175/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.FaultyZooKeeperWatcher.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.FaultyZooKeeperWatcher.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.FaultyZooKeeperWatcher.html
index f5e01ff..4b3889d 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.FaultyZooKeeperWatcher.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.FaultyZooKeeperWatcher.html
@@ -287,149 +287,165 @@
 <span class="sourceLineNo">279</span>  @Test<a name="line.279"></a>
 <span class="sourceLineNo">280</span>  public void testOnConfigurationChange() 
throws Exception {<a name="line.280"></a>
 <span class="sourceLineNo">281</span>    Configuration conf = 
TEST_UTIL.getConfiguration();<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    
conf.setInt(LogCleaner.OLD_WALS_CLEANER_SIZE, 
LogCleaner.OLD_WALS_CLEANER_DEFAULT_SIZE);<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    // Prepare environments<a 
name="line.283"></a>
-<span class="sourceLineNo">284</span>    Server server = new DummyServer();<a 
name="line.284"></a>
-<span class="sourceLineNo">285</span>    Path oldWALsDir = new 
Path(TEST_UTIL.getDefaultRootDirPath(),<a name="line.285"></a>
-<span class="sourceLineNo">286</span>        
HConstants.HREGION_OLDLOGDIR_NAME);<a name="line.286"></a>
-<span class="sourceLineNo">287</span>    FileSystem fs = 
TEST_UTIL.getDFSCluster().getFileSystem();<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    LogCleaner cleaner = new 
LogCleaner(3000, server, conf, fs, oldWALsDir);<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    
assertEquals(LogCleaner.OLD_WALS_CLEANER_DEFAULT_SIZE, 
cleaner.getSizeOfCleaners());<a name="line.289"></a>
-<span class="sourceLineNo">290</span>    // Create dir and files for test<a 
name="line.290"></a>
-<span class="sourceLineNo">291</span>    fs.delete(oldWALsDir, true);<a 
name="line.291"></a>
-<span class="sourceLineNo">292</span>    fs.mkdirs(oldWALsDir);<a 
name="line.292"></a>
-<span class="sourceLineNo">293</span>    int numOfFiles = 10;<a 
name="line.293"></a>
-<span class="sourceLineNo">294</span>    createFiles(fs, oldWALsDir, 
numOfFiles);<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    FileStatus[] status = 
fs.listStatus(oldWALsDir);<a name="line.295"></a>
-<span class="sourceLineNo">296</span>    assertEquals(numOfFiles, 
status.length);<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    // Start cleaner chore<a 
name="line.297"></a>
-<span class="sourceLineNo">298</span>    Thread thread = new Thread(() -&gt; 
cleaner.chore());<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    thread.setDaemon(true);<a 
name="line.299"></a>
-<span class="sourceLineNo">300</span>    thread.start();<a name="line.300"></a>
-<span class="sourceLineNo">301</span>    // change size of cleaners 
dynamically<a name="line.301"></a>
-<span class="sourceLineNo">302</span>    int sizeToChange = 4;<a 
name="line.302"></a>
-<span class="sourceLineNo">303</span>    
conf.setInt(LogCleaner.OLD_WALS_CLEANER_SIZE, sizeToChange);<a 
name="line.303"></a>
-<span class="sourceLineNo">304</span>    
cleaner.onConfigurationChange(conf);<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    assertEquals(sizeToChange, 
cleaner.getSizeOfCleaners());<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    // Stop chore<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    thread.join();<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    status = fs.listStatus(oldWALsDir);<a 
name="line.308"></a>
-<span class="sourceLineNo">309</span>    assertEquals(0, status.length);<a 
name="line.309"></a>
-<span class="sourceLineNo">310</span>  }<a name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span>  private void createFiles(FileSystem fs, 
Path parentDir, int numOfFiles) throws IOException {<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    Random random = new Random();<a 
name="line.313"></a>
-<span class="sourceLineNo">314</span>    for (int i = 0; i &lt; numOfFiles; 
i++) {<a name="line.314"></a>
-<span class="sourceLineNo">315</span>      int xMega = 1 + random.nextInt(3); 
// size of each file is between 1~3M<a name="line.315"></a>
-<span class="sourceLineNo">316</span>      try (FSDataOutputStream fsdos = 
fs.create(new Path(parentDir, "file-" + i))) {<a name="line.316"></a>
-<span class="sourceLineNo">317</span>        for (int m = 0; m &lt; xMega; 
m++) {<a name="line.317"></a>
-<span class="sourceLineNo">318</span>          byte[] M = new byte[1024 * 
1024];<a name="line.318"></a>
-<span class="sourceLineNo">319</span>          random.nextBytes(M);<a 
name="line.319"></a>
-<span class="sourceLineNo">320</span>          fsdos.write(M);<a 
name="line.320"></a>
-<span class="sourceLineNo">321</span>        }<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>  }<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span>  static class DummyServer implements 
Server {<a name="line.326"></a>
+<span class="sourceLineNo">282</span>    
conf.setInt(LogCleaner.OLD_WALS_CLEANER_THREAD_SIZE,<a name="line.282"></a>
+<span class="sourceLineNo">283</span>        
LogCleaner.DEFAULT_OLD_WALS_CLEANER_THREAD_SIZE);<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    
conf.setLong(LogCleaner.OLD_WALS_CLEANER_THREAD_TIMEOUT_MSEC,<a 
name="line.284"></a>
+<span class="sourceLineNo">285</span>        
LogCleaner.DEFAULT_OLD_WALS_CLEANER_THREAD_TIMEOUT_MSEC);<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    
conf.setLong(LogCleaner.OLD_WALS_CLEANER_THREAD_CHECK_INTERVAL_MSEC,<a 
name="line.286"></a>
+<span class="sourceLineNo">287</span>        
LogCleaner.DEFAULT_OLD_WALS_CLEANER_THREAD_CHECK_INTERVAL_MSEC);<a 
name="line.287"></a>
+<span class="sourceLineNo">288</span>    // Prepare environments<a 
name="line.288"></a>
+<span class="sourceLineNo">289</span>    Server server = new DummyServer();<a 
name="line.289"></a>
+<span class="sourceLineNo">290</span>    Path oldWALsDir = new 
Path(TEST_UTIL.getDefaultRootDirPath(),<a name="line.290"></a>
+<span class="sourceLineNo">291</span>        
HConstants.HREGION_OLDLOGDIR_NAME);<a name="line.291"></a>
+<span class="sourceLineNo">292</span>    FileSystem fs = 
TEST_UTIL.getDFSCluster().getFileSystem();<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    LogCleaner cleaner = new 
LogCleaner(3000, server, conf, fs, oldWALsDir);<a name="line.293"></a>
+<span class="sourceLineNo">294</span>    
assertEquals(LogCleaner.DEFAULT_OLD_WALS_CLEANER_THREAD_SIZE, 
cleaner.getSizeOfCleaners());<a name="line.294"></a>
+<span class="sourceLineNo">295</span>    
assertEquals(LogCleaner.DEFAULT_OLD_WALS_CLEANER_THREAD_TIMEOUT_MSEC,<a 
name="line.295"></a>
+<span class="sourceLineNo">296</span>        
cleaner.getCleanerThreadTimeoutMsec());<a name="line.296"></a>
+<span class="sourceLineNo">297</span>    
assertEquals(LogCleaner.DEFAULT_OLD_WALS_CLEANER_THREAD_CHECK_INTERVAL_MSEC,<a 
name="line.297"></a>
+<span class="sourceLineNo">298</span>        
cleaner.getCleanerThreadCheckIntervalMsec());<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    // Create dir and files for test<a 
name="line.299"></a>
+<span class="sourceLineNo">300</span>    fs.delete(oldWALsDir, true);<a 
name="line.300"></a>
+<span class="sourceLineNo">301</span>    fs.mkdirs(oldWALsDir);<a 
name="line.301"></a>
+<span class="sourceLineNo">302</span>    int numOfFiles = 10;<a 
name="line.302"></a>
+<span class="sourceLineNo">303</span>    createFiles(fs, oldWALsDir, 
numOfFiles);<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    FileStatus[] status = 
fs.listStatus(oldWALsDir);<a name="line.304"></a>
+<span class="sourceLineNo">305</span>    assertEquals(numOfFiles, 
status.length);<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    // Start cleaner chore<a 
name="line.306"></a>
+<span class="sourceLineNo">307</span>    Thread thread = new Thread(() -&gt; 
cleaner.chore());<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    thread.setDaemon(true);<a 
name="line.308"></a>
+<span class="sourceLineNo">309</span>    thread.start();<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    // change size of cleaners 
dynamically<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    int sizeToChange = 4;<a 
name="line.311"></a>
+<span class="sourceLineNo">312</span>    long threadTimeoutToChange = 30 * 
1000L;<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    long threadCheckIntervalToChange = 
250L;<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    
conf.setInt(LogCleaner.OLD_WALS_CLEANER_THREAD_SIZE, sizeToChange);<a 
name="line.314"></a>
+<span class="sourceLineNo">315</span>    
conf.setLong(LogCleaner.OLD_WALS_CLEANER_THREAD_TIMEOUT_MSEC, 
threadTimeoutToChange);<a name="line.315"></a>
+<span class="sourceLineNo">316</span>    
conf.setLong(LogCleaner.OLD_WALS_CLEANER_THREAD_CHECK_INTERVAL_MSEC,<a 
name="line.316"></a>
+<span class="sourceLineNo">317</span>        threadCheckIntervalToChange);<a 
name="line.317"></a>
+<span class="sourceLineNo">318</span>    
cleaner.onConfigurationChange(conf);<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    assertEquals(sizeToChange, 
cleaner.getSizeOfCleaners());<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    assertEquals(threadTimeoutToChange, 
cleaner.getCleanerThreadTimeoutMsec());<a name="line.320"></a>
+<span class="sourceLineNo">321</span>    
assertEquals(threadCheckIntervalToChange, 
cleaner.getCleanerThreadCheckIntervalMsec());<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    // Stop chore<a name="line.322"></a>
+<span class="sourceLineNo">323</span>    thread.join();<a name="line.323"></a>
+<span class="sourceLineNo">324</span>    status = fs.listStatus(oldWALsDir);<a 
name="line.324"></a>
+<span class="sourceLineNo">325</span>    assertEquals(0, status.length);<a 
name="line.325"></a>
+<span class="sourceLineNo">326</span>  }<a name="line.326"></a>
 <span class="sourceLineNo">327</span><a name="line.327"></a>
-<span class="sourceLineNo">328</span>    @Override<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    public Configuration 
getConfiguration() {<a name="line.329"></a>
-<span class="sourceLineNo">330</span>      return 
TEST_UTIL.getConfiguration();<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    }<a name="line.331"></a>
-<span class="sourceLineNo">332</span><a name="line.332"></a>
-<span class="sourceLineNo">333</span>    @Override<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    public ZKWatcher getZooKeeper() {<a 
name="line.334"></a>
-<span class="sourceLineNo">335</span>      try {<a name="line.335"></a>
-<span class="sourceLineNo">336</span>        return new 
ZKWatcher(getConfiguration(), "dummy server", this);<a name="line.336"></a>
-<span class="sourceLineNo">337</span>      } catch (IOException e) {<a 
name="line.337"></a>
-<span class="sourceLineNo">338</span>        e.printStackTrace();<a 
name="line.338"></a>
-<span class="sourceLineNo">339</span>      }<a name="line.339"></a>
-<span class="sourceLineNo">340</span>      return null;<a name="line.340"></a>
-<span class="sourceLineNo">341</span>    }<a name="line.341"></a>
-<span class="sourceLineNo">342</span><a name="line.342"></a>
-<span class="sourceLineNo">343</span>    @Override<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    public CoordinatedStateManager 
getCoordinatedStateManager() {<a name="line.344"></a>
-<span class="sourceLineNo">345</span>      return null;<a name="line.345"></a>
-<span class="sourceLineNo">346</span>    }<a name="line.346"></a>
-<span class="sourceLineNo">347</span><a name="line.347"></a>
-<span class="sourceLineNo">348</span>    @Override<a name="line.348"></a>
-<span class="sourceLineNo">349</span>    public ClusterConnection 
getConnection() {<a name="line.349"></a>
-<span class="sourceLineNo">350</span>      return null;<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 MetaTableLocator 
getMetaTableLocator() {<a name="line.354"></a>
-<span class="sourceLineNo">355</span>      return null;<a name="line.355"></a>
-<span class="sourceLineNo">356</span>    }<a name="line.356"></a>
-<span class="sourceLineNo">357</span><a name="line.357"></a>
-<span class="sourceLineNo">358</span>    @Override<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    public ServerName getServerName() {<a 
name="line.359"></a>
-<span class="sourceLineNo">360</span>      return 
ServerName.valueOf("regionserver,60020,000000");<a name="line.360"></a>
-<span class="sourceLineNo">361</span>    }<a name="line.361"></a>
-<span class="sourceLineNo">362</span><a name="line.362"></a>
-<span class="sourceLineNo">363</span>    @Override<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    public void abort(String why, 
Throwable e) {}<a name="line.364"></a>
-<span class="sourceLineNo">365</span><a name="line.365"></a>
-<span class="sourceLineNo">366</span>    @Override<a name="line.366"></a>
-<span class="sourceLineNo">367</span>    public boolean isAborted() {<a 
name="line.367"></a>
-<span class="sourceLineNo">368</span>      return false;<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>    @Override<a name="line.371"></a>
-<span class="sourceLineNo">372</span>    public void stop(String why) {}<a 
name="line.372"></a>
+<span class="sourceLineNo">328</span>  private void createFiles(FileSystem fs, 
Path parentDir, int numOfFiles) throws IOException {<a name="line.328"></a>
+<span class="sourceLineNo">329</span>    Random random = new Random();<a 
name="line.329"></a>
+<span class="sourceLineNo">330</span>    for (int i = 0; i &lt; numOfFiles; 
i++) {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      int xMega = 1 + random.nextInt(3); 
// size of each file is between 1~3M<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      try (FSDataOutputStream fsdos = 
fs.create(new Path(parentDir, "file-" + i))) {<a name="line.332"></a>
+<span class="sourceLineNo">333</span>        for (int m = 0; m &lt; xMega; 
m++) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span>          byte[] M = new byte[1024 * 
1024];<a name="line.334"></a>
+<span class="sourceLineNo">335</span>          random.nextBytes(M);<a 
name="line.335"></a>
+<span class="sourceLineNo">336</span>          fsdos.write(M);<a 
name="line.336"></a>
+<span class="sourceLineNo">337</span>        }<a name="line.337"></a>
+<span class="sourceLineNo">338</span>      }<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    }<a name="line.339"></a>
+<span class="sourceLineNo">340</span>  }<a name="line.340"></a>
+<span class="sourceLineNo">341</span><a name="line.341"></a>
+<span class="sourceLineNo">342</span>  static class DummyServer implements 
Server {<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 Configuration 
getConfiguration() {<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      return 
TEST_UTIL.getConfiguration();<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>    @Override<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    public ZKWatcher getZooKeeper() {<a 
name="line.350"></a>
+<span class="sourceLineNo">351</span>      try {<a name="line.351"></a>
+<span class="sourceLineNo">352</span>        return new 
ZKWatcher(getConfiguration(), "dummy server", this);<a name="line.352"></a>
+<span class="sourceLineNo">353</span>      } catch (IOException e) {<a 
name="line.353"></a>
+<span class="sourceLineNo">354</span>        e.printStackTrace();<a 
name="line.354"></a>
+<span class="sourceLineNo">355</span>      }<a name="line.355"></a>
+<span class="sourceLineNo">356</span>      return null;<a name="line.356"></a>
+<span class="sourceLineNo">357</span>    }<a name="line.357"></a>
+<span class="sourceLineNo">358</span><a name="line.358"></a>
+<span class="sourceLineNo">359</span>    @Override<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    public CoordinatedStateManager 
getCoordinatedStateManager() {<a name="line.360"></a>
+<span class="sourceLineNo">361</span>      return null;<a name="line.361"></a>
+<span class="sourceLineNo">362</span>    }<a name="line.362"></a>
+<span class="sourceLineNo">363</span><a name="line.363"></a>
+<span class="sourceLineNo">364</span>    @Override<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    public ClusterConnection 
getConnection() {<a name="line.365"></a>
+<span class="sourceLineNo">366</span>      return null;<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    }<a name="line.367"></a>
+<span class="sourceLineNo">368</span><a name="line.368"></a>
+<span class="sourceLineNo">369</span>    @Override<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    public MetaTableLocator 
getMetaTableLocator() {<a name="line.370"></a>
+<span class="sourceLineNo">371</span>      return null;<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    }<a name="line.372"></a>
 <span class="sourceLineNo">373</span><a name="line.373"></a>
 <span class="sourceLineNo">374</span>    @Override<a name="line.374"></a>
-<span class="sourceLineNo">375</span>    public boolean isStopped() {<a 
name="line.375"></a>
-<span class="sourceLineNo">376</span>      return false;<a name="line.376"></a>
+<span class="sourceLineNo">375</span>    public ServerName getServerName() {<a 
name="line.375"></a>
+<span class="sourceLineNo">376</span>      return 
ServerName.valueOf("regionserver,60020,000000");<a name="line.376"></a>
 <span class="sourceLineNo">377</span>    }<a name="line.377"></a>
 <span class="sourceLineNo">378</span><a name="line.378"></a>
 <span class="sourceLineNo">379</span>    @Override<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    public ChoreService getChoreService() 
{<a name="line.380"></a>
-<span class="sourceLineNo">381</span>      return null;<a name="line.381"></a>
-<span class="sourceLineNo">382</span>    }<a name="line.382"></a>
-<span class="sourceLineNo">383</span><a name="line.383"></a>
-<span class="sourceLineNo">384</span>    @Override<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    public ClusterConnection 
getClusterConnection() {<a name="line.385"></a>
-<span class="sourceLineNo">386</span>      return null;<a name="line.386"></a>
-<span class="sourceLineNo">387</span>    }<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span>    @Override<a name="line.389"></a>
-<span class="sourceLineNo">390</span>    public FileSystem getFileSystem() {<a 
name="line.390"></a>
-<span class="sourceLineNo">391</span>      return null;<a name="line.391"></a>
-<span class="sourceLineNo">392</span>    }<a name="line.392"></a>
-<span class="sourceLineNo">393</span><a name="line.393"></a>
-<span class="sourceLineNo">394</span>    @Override<a name="line.394"></a>
-<span class="sourceLineNo">395</span>    public boolean isStopping() {<a 
name="line.395"></a>
-<span class="sourceLineNo">396</span>      return false;<a name="line.396"></a>
-<span class="sourceLineNo">397</span>    }<a name="line.397"></a>
-<span class="sourceLineNo">398</span><a name="line.398"></a>
-<span class="sourceLineNo">399</span>    @Override<a name="line.399"></a>
-<span class="sourceLineNo">400</span>    public Connection 
createConnection(Configuration conf) throws IOException {<a name="line.400"></a>
-<span class="sourceLineNo">401</span>      return null;<a name="line.401"></a>
-<span class="sourceLineNo">402</span>    }<a name="line.402"></a>
-<span class="sourceLineNo">403</span>  }<a name="line.403"></a>
+<span class="sourceLineNo">380</span>    public void abort(String why, 
Throwable e) {}<a name="line.380"></a>
+<span class="sourceLineNo">381</span><a name="line.381"></a>
+<span class="sourceLineNo">382</span>    @Override<a name="line.382"></a>
+<span class="sourceLineNo">383</span>    public boolean isAborted() {<a 
name="line.383"></a>
+<span class="sourceLineNo">384</span>      return false;<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    }<a name="line.385"></a>
+<span class="sourceLineNo">386</span><a name="line.386"></a>
+<span class="sourceLineNo">387</span>    @Override<a name="line.387"></a>
+<span class="sourceLineNo">388</span>    public void stop(String why) {}<a 
name="line.388"></a>
+<span class="sourceLineNo">389</span><a name="line.389"></a>
+<span class="sourceLineNo">390</span>    @Override<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    public boolean isStopped() {<a 
name="line.391"></a>
+<span class="sourceLineNo">392</span>      return false;<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    }<a name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span>    @Override<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    public ChoreService getChoreService() 
{<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      return null;<a name="line.397"></a>
+<span class="sourceLineNo">398</span>    }<a name="line.398"></a>
+<span class="sourceLineNo">399</span><a name="line.399"></a>
+<span class="sourceLineNo">400</span>    @Override<a name="line.400"></a>
+<span class="sourceLineNo">401</span>    public ClusterConnection 
getClusterConnection() {<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      return null;<a name="line.402"></a>
+<span class="sourceLineNo">403</span>    }<a name="line.403"></a>
 <span class="sourceLineNo">404</span><a name="line.404"></a>
-<span class="sourceLineNo">405</span>  static class FaultyZooKeeperWatcher 
extends ZKWatcher {<a name="line.405"></a>
-<span class="sourceLineNo">406</span>    private RecoverableZooKeeper zk;<a 
name="line.406"></a>
-<span class="sourceLineNo">407</span><a name="line.407"></a>
-<span class="sourceLineNo">408</span>    public 
FaultyZooKeeperWatcher(Configuration conf, String identifier, Abortable 
abortable)<a name="line.408"></a>
-<span class="sourceLineNo">409</span>        throws 
ZooKeeperConnectionException, IOException {<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      super(conf, identifier, 
abortable);<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>    public void init() throws Exception 
{<a name="line.413"></a>
-<span class="sourceLineNo">414</span>      this.zk = 
spy(super.getRecoverableZooKeeper());<a name="line.414"></a>
-<span class="sourceLineNo">415</span>      doThrow(new 
KeeperException.ConnectionLossException())<a name="line.415"></a>
-<span class="sourceLineNo">416</span>        
.when(zk).getChildren("/hbase/replication/rs", null);<a name="line.416"></a>
-<span class="sourceLineNo">417</span>    }<a name="line.417"></a>
-<span class="sourceLineNo">418</span><a name="line.418"></a>
-<span class="sourceLineNo">419</span>    @Override<a name="line.419"></a>
-<span class="sourceLineNo">420</span>    public RecoverableZooKeeper 
getRecoverableZooKeeper() {<a name="line.420"></a>
-<span class="sourceLineNo">421</span>      return zk;<a name="line.421"></a>
-<span class="sourceLineNo">422</span>    }<a name="line.422"></a>
-<span class="sourceLineNo">423</span>  }<a name="line.423"></a>
-<span class="sourceLineNo">424</span>}<a name="line.424"></a>
+<span class="sourceLineNo">405</span>    @Override<a name="line.405"></a>
+<span class="sourceLineNo">406</span>    public FileSystem getFileSystem() {<a 
name="line.406"></a>
+<span class="sourceLineNo">407</span>      return null;<a name="line.407"></a>
+<span class="sourceLineNo">408</span>    }<a name="line.408"></a>
+<span class="sourceLineNo">409</span><a name="line.409"></a>
+<span class="sourceLineNo">410</span>    @Override<a name="line.410"></a>
+<span class="sourceLineNo">411</span>    public boolean isStopping() {<a 
name="line.411"></a>
+<span class="sourceLineNo">412</span>      return false;<a name="line.412"></a>
+<span class="sourceLineNo">413</span>    }<a name="line.413"></a>
+<span class="sourceLineNo">414</span><a name="line.414"></a>
+<span class="sourceLineNo">415</span>    @Override<a name="line.415"></a>
+<span class="sourceLineNo">416</span>    public Connection 
createConnection(Configuration conf) throws IOException {<a name="line.416"></a>
+<span class="sourceLineNo">417</span>      return null;<a name="line.417"></a>
+<span class="sourceLineNo">418</span>    }<a name="line.418"></a>
+<span class="sourceLineNo">419</span>  }<a name="line.419"></a>
+<span class="sourceLineNo">420</span><a name="line.420"></a>
+<span class="sourceLineNo">421</span>  static class FaultyZooKeeperWatcher 
extends ZKWatcher {<a name="line.421"></a>
+<span class="sourceLineNo">422</span>    private RecoverableZooKeeper zk;<a 
name="line.422"></a>
+<span class="sourceLineNo">423</span><a name="line.423"></a>
+<span class="sourceLineNo">424</span>    public 
FaultyZooKeeperWatcher(Configuration conf, String identifier, Abortable 
abortable)<a name="line.424"></a>
+<span class="sourceLineNo">425</span>        throws 
ZooKeeperConnectionException, IOException {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>      super(conf, identifier, 
abortable);<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    }<a name="line.427"></a>
+<span class="sourceLineNo">428</span><a name="line.428"></a>
+<span class="sourceLineNo">429</span>    public void init() throws Exception 
{<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      this.zk = 
spy(super.getRecoverableZooKeeper());<a name="line.430"></a>
+<span class="sourceLineNo">431</span>      doThrow(new 
KeeperException.ConnectionLossException())<a name="line.431"></a>
+<span class="sourceLineNo">432</span>        
.when(zk).getChildren("/hbase/replication/rs", null);<a name="line.432"></a>
+<span class="sourceLineNo">433</span>    }<a name="line.433"></a>
+<span class="sourceLineNo">434</span><a name="line.434"></a>
+<span class="sourceLineNo">435</span>    @Override<a name="line.435"></a>
+<span class="sourceLineNo">436</span>    public RecoverableZooKeeper 
getRecoverableZooKeeper() {<a name="line.436"></a>
+<span class="sourceLineNo">437</span>      return zk;<a name="line.437"></a>
+<span class="sourceLineNo">438</span>    }<a name="line.438"></a>
+<span class="sourceLineNo">439</span>  }<a name="line.439"></a>
+<span class="sourceLineNo">440</span>}<a name="line.440"></a>
 
 
 

Reply via email to