hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject [05/17] hbase-site git commit: Published site at 33396c3629a83f2379a69f3a3b493ae8e6ee0a13.
Date Mon, 04 Apr 2016 16:30:44 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/56eae93a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationHFileCleaner.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationHFileCleaner.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationHFileCleaner.html
index 07d3194..f89cbaf 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationHFileCleaner.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationHFileCleaner.html
@@ -18,264 +18,334 @@
 <span class="sourceLineNo">010</span> */<a name="line.10"></a>
 <span class="sourceLineNo">011</span>package org.apache.hadoop.hbase.master.cleaner;<a name="line.11"></a>
 <span class="sourceLineNo">012</span><a name="line.12"></a>
-<span class="sourceLineNo">013</span>import static org.junit.Assert.assertFalse;<a name="line.13"></a>
-<span class="sourceLineNo">014</span>import static org.junit.Assert.assertTrue;<a name="line.14"></a>
-<span class="sourceLineNo">015</span>import static org.junit.Assert.fail;<a name="line.15"></a>
-<span class="sourceLineNo">016</span><a name="line.16"></a>
-<span class="sourceLineNo">017</span>import java.io.IOException;<a name="line.17"></a>
-<span class="sourceLineNo">018</span>import java.lang.reflect.Field;<a name="line.18"></a>
-<span class="sourceLineNo">019</span>import java.util.ArrayList;<a name="line.19"></a>
-<span class="sourceLineNo">020</span>import java.util.Iterator;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import java.util.List;<a name="line.21"></a>
-<span class="sourceLineNo">022</span><a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.commons.logging.Log;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.commons.logging.LogFactory;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.hadoop.conf.Configuration;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.fs.FileStatus;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.fs.FileSystem;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.fs.Path;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.ChoreService;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.CoordinatedStateManager;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.HConstants;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.Server;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.ServerName;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.client.ClusterConnection;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.replication.ReplicationException;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.replication.ReplicationFactory;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.replication.ReplicationPeerConfig;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.replication.ReplicationPeers;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.replication.ReplicationQueues;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.replication.ReplicationQueuesClient;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.replication.ReplicationQueuesZKImpl;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.replication.master.ReplicationHFileCleaner;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.replication.regionserver.Replication;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.zookeeper.MetaTableLocator;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.junit.After;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.junit.AfterClass;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.junit.Before;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.junit.BeforeClass;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.junit.Test;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.junit.experimental.categories.Category;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.mockito.Mockito;<a name="line.55"></a>
-<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span>@Category({ MasterTests.class, SmallTests.class })<a name="line.57"></a>
-<span class="sourceLineNo">058</span>public class TestReplicationHFileCleaner {<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  private static final Log LOG = LogFactory.getLog(ReplicationQueuesZKImpl.class);<a name="line.59"></a>
-<span class="sourceLineNo">060</span>  private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.60"></a>
-<span class="sourceLineNo">061</span>  private static Server server;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>  private static ReplicationQueues rq;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>  private static ReplicationPeers rp;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  private static final String peerId = "TestReplicationHFileCleaner";<a name="line.64"></a>
-<span class="sourceLineNo">065</span>  private static Configuration conf = TEST_UTIL.getConfiguration();<a name="line.65"></a>
-<span class="sourceLineNo">066</span>  static FileSystem fs = null;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>  Path root;<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span>  /**<a name="line.69"></a>
-<span class="sourceLineNo">070</span>   * @throws java.lang.Exception<a name="line.70"></a>
-<span class="sourceLineNo">071</span>   */<a name="line.71"></a>
-<span class="sourceLineNo">072</span>  @BeforeClass<a name="line.72"></a>
-<span class="sourceLineNo">073</span>  public static void setUpBeforeClass() throws Exception {<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    TEST_UTIL.startMiniZKCluster();<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    server = new DummyServer();<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    conf.setBoolean(HConstants.REPLICATION_BULKLOAD_ENABLE_KEY, true);<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    Replication.decorateMasterConfiguration(conf);<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    rp = ReplicationFactory.getReplicationPeers(server.getZooKeeper(), conf, server);<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    rp.init();<a name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span>    rq = ReplicationFactory.getReplicationQueues(server.getZooKeeper(), conf, server);<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    rq.init(server.getServerName().toString());<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    try {<a name="line.83"></a>
-<span class="sourceLineNo">084</span>      fs = FileSystem.get(conf);<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    } finally {<a name="line.85"></a>
-<span class="sourceLineNo">086</span>      if (fs != null) {<a name="line.86"></a>
-<span class="sourceLineNo">087</span>        fs.close();<a name="line.87"></a>
-<span class="sourceLineNo">088</span>      }<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    }<a name="line.89"></a>
-<span class="sourceLineNo">090</span>  }<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span>  /**<a name="line.92"></a>
-<span class="sourceLineNo">093</span>   * @throws java.lang.Exception<a name="line.93"></a>
-<span class="sourceLineNo">094</span>   */<a name="line.94"></a>
-<span class="sourceLineNo">095</span>  @AfterClass<a name="line.95"></a>
-<span class="sourceLineNo">096</span>  public static void tearDownAfterClass() throws Exception {<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    TEST_UTIL.shutdownMiniZKCluster();<a name="line.97"></a>
-<span class="sourceLineNo">098</span>  }<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span>  @Before<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  public void setup() throws ReplicationException, IOException {<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    root = TEST_UTIL.getDataTestDirOnTestFS();<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    rp.addPeer(peerId, new ReplicationPeerConfig().setClusterKey(TEST_UTIL.getClusterKey()));<a name="line.103"></a>
-<span class="sourceLineNo">104</span>  }<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span>  @After<a name="line.106"></a>
-<span class="sourceLineNo">107</span>  public void cleanup() throws ReplicationException {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    try {<a name="line.108"></a>
-<span class="sourceLineNo">109</span>      fs.delete(root, true);<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    } catch (IOException e) {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      LOG.warn("Failed to delete files recursively from path " + root);<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    }<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    rp.removePeer(peerId);<a name="line.113"></a>
+<span class="sourceLineNo">013</span>import static org.junit.Assert.assertEquals;<a name="line.13"></a>
+<span class="sourceLineNo">014</span>import static org.junit.Assert.assertFalse;<a name="line.14"></a>
+<span class="sourceLineNo">015</span>import static org.junit.Assert.assertTrue;<a name="line.15"></a>
+<span class="sourceLineNo">016</span>import static org.junit.Assert.fail;<a name="line.16"></a>
+<span class="sourceLineNo">017</span>import static org.mockito.Mockito.doThrow;<a name="line.17"></a>
+<span class="sourceLineNo">018</span>import static org.mockito.Mockito.spy;<a name="line.18"></a>
+<span class="sourceLineNo">019</span><a name="line.19"></a>
+<span class="sourceLineNo">020</span>import com.google.common.collect.Lists;<a name="line.20"></a>
+<span class="sourceLineNo">021</span><a name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.io.IOException;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import java.lang.reflect.Field;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import java.util.ArrayList;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import java.util.Iterator;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.util.List;<a name="line.26"></a>
+<span class="sourceLineNo">027</span><a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.commons.logging.Log;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.commons.logging.LogFactory;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.conf.Configuration;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.fs.FileStatus;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.fs.FileSystem;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.fs.Path;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.Abortable;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.ChoreService;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.CoordinatedStateManager;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.HConstants;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.Server;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.ServerName;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.ZooKeeperConnectionException;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.client.ClusterConnection;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.replication.ReplicationException;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.replication.ReplicationFactory;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.replication.ReplicationPeerConfig;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.replication.ReplicationPeers;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.replication.ReplicationQueues;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.replication.ReplicationQueuesClient;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.replication.ReplicationQueuesZKImpl;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.replication.master.ReplicationHFileCleaner;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.replication.regionserver.Replication;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.zookeeper.MetaTableLocator;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.zookeeper.RecoverableZooKeeper;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.apache.zookeeper.KeeperException;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.apache.zookeeper.data.Stat;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.junit.After;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import org.junit.AfterClass;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>import org.junit.Before;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>import org.junit.BeforeClass;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>import org.junit.Test;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>import org.junit.experimental.categories.Category;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>import org.mockito.Mockito;<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span>@Category({ MasterTests.class, SmallTests.class })<a name="line.67"></a>
+<span class="sourceLineNo">068</span>public class TestReplicationHFileCleaner {<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  private static final Log LOG = LogFactory.getLog(ReplicationQueuesZKImpl.class);<a name="line.69"></a>
+<span class="sourceLineNo">070</span>  private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.70"></a>
+<span class="sourceLineNo">071</span>  private static Server server;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>  private static ReplicationQueues rq;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>  private static ReplicationPeers rp;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>  private static final String peerId = "TestReplicationHFileCleaner";<a name="line.74"></a>
+<span class="sourceLineNo">075</span>  private static Configuration conf = TEST_UTIL.getConfiguration();<a name="line.75"></a>
+<span class="sourceLineNo">076</span>  static FileSystem fs = null;<a name="line.76"></a>
+<span class="sourceLineNo">077</span>  Path root;<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span>  /**<a name="line.79"></a>
+<span class="sourceLineNo">080</span>   * @throws java.lang.Exception<a name="line.80"></a>
+<span class="sourceLineNo">081</span>   */<a name="line.81"></a>
+<span class="sourceLineNo">082</span>  @BeforeClass<a name="line.82"></a>
+<span class="sourceLineNo">083</span>  public static void setUpBeforeClass() throws Exception {<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    TEST_UTIL.startMiniZKCluster();<a name="line.84"></a>
+<span class="sourceLineNo">085</span>    server = new DummyServer();<a name="line.85"></a>
+<span class="sourceLineNo">086</span>    conf.setBoolean(HConstants.REPLICATION_BULKLOAD_ENABLE_KEY, true);<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    Replication.decorateMasterConfiguration(conf);<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    rp = ReplicationFactory.getReplicationPeers(server.getZooKeeper(), conf, server);<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    rp.init();<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span>    rq = ReplicationFactory.getReplicationQueues(server.getZooKeeper(), conf, server);<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    rq.init(server.getServerName().toString());<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    try {<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      fs = FileSystem.get(conf);<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    } finally {<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      if (fs != null) {<a name="line.96"></a>
+<span class="sourceLineNo">097</span>        fs.close();<a name="line.97"></a>
+<span class="sourceLineNo">098</span>      }<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    }<a name="line.99"></a>
+<span class="sourceLineNo">100</span>  }<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span>  /**<a name="line.102"></a>
+<span class="sourceLineNo">103</span>   * @throws java.lang.Exception<a name="line.103"></a>
+<span class="sourceLineNo">104</span>   */<a name="line.104"></a>
+<span class="sourceLineNo">105</span>  @AfterClass<a name="line.105"></a>
+<span class="sourceLineNo">106</span>  public static void tearDownAfterClass() throws Exception {<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    TEST_UTIL.shutdownMiniZKCluster();<a name="line.107"></a>
+<span class="sourceLineNo">108</span>  }<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span>  @Before<a name="line.110"></a>
+<span class="sourceLineNo">111</span>  public void setup() throws ReplicationException, IOException {<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    root = TEST_UTIL.getDataTestDirOnTestFS();<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    rp.addPeer(peerId, new ReplicationPeerConfig().setClusterKey(TEST_UTIL.getClusterKey()));<a name="line.113"></a>
 <span class="sourceLineNo">114</span>  }<a name="line.114"></a>
 <span class="sourceLineNo">115</span><a name="line.115"></a>
-<span class="sourceLineNo">116</span>  @Test<a name="line.116"></a>
-<span class="sourceLineNo">117</span>  public void testIsFileDeletable() throws IOException, ReplicationException {<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    // 1. Create a file<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    Path file = new Path(root, "testIsFileDeletableWithNoHFileRefs");<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    fs.createNewFile(file);<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    // 2. Assert file is successfully created<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    assertTrue("Test file not created!", fs.exists(file));<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    ReplicationHFileCleaner cleaner = new ReplicationHFileCleaner();<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    cleaner.setConf(conf);<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    // 3. Assert that file as is should be deletable<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    assertTrue("Cleaner should allow to delete this file as there is no hfile reference node "<a name="line.126"></a>
-<span class="sourceLineNo">127</span>        + "for it in the queue.",<a name="line.127"></a>
-<span class="sourceLineNo">128</span>      cleaner.isFileDeletable(fs.getFileStatus(file)));<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>    List&lt;String&gt; files = new ArrayList&lt;String&gt;(1);<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    files.add(file.getName());<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    // 4. Add the file to hfile-refs queue<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    rq.addHFileRefs(peerId, files);<a name="line.133"></a>
-<span class="sourceLineNo">134</span>    // 5. Assert file should not be deletable<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    assertFalse("Cleaner should not allow to delete this file as there is a hfile reference node "<a name="line.135"></a>
-<span class="sourceLineNo">136</span>        + "for it in the queue.",<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      cleaner.isFileDeletable(fs.getFileStatus(file)));<a name="line.137"></a>
-<span class="sourceLineNo">138</span>  }<a name="line.138"></a>
+<span class="sourceLineNo">116</span>  @After<a name="line.116"></a>
+<span class="sourceLineNo">117</span>  public void cleanup() throws ReplicationException {<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    try {<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      fs.delete(root, true);<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    } catch (IOException e) {<a name="line.120"></a>
+<span class="sourceLineNo">121</span>      LOG.warn("Failed to delete files recursively from path " + root);<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    }<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    rp.removePeer(peerId);<a name="line.123"></a>
+<span class="sourceLineNo">124</span>  }<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span>  @Test<a name="line.126"></a>
+<span class="sourceLineNo">127</span>  public void testIsFileDeletable() throws IOException, ReplicationException {<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    // 1. Create a file<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    Path file = new Path(root, "testIsFileDeletableWithNoHFileRefs");<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    fs.createNewFile(file);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    // 2. Assert file is successfully created<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    assertTrue("Test file not created!", fs.exists(file));<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    ReplicationHFileCleaner cleaner = new ReplicationHFileCleaner();<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    cleaner.setConf(conf);<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    // 3. Assert that file as is should be deletable<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    assertTrue("Cleaner should allow to delete this file as there is no hfile reference node "<a name="line.136"></a>
+<span class="sourceLineNo">137</span>        + "for it in the queue.",<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      cleaner.isFileDeletable(fs.getFileStatus(file)));<a name="line.138"></a>
 <span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span>  @Test<a name="line.140"></a>
-<span class="sourceLineNo">141</span>  public void testGetDeletableFiles() throws Exception {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    // 1. Create two files and assert that they do not exist<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    Path notDeletablefile = new Path(root, "testGetDeletableFiles_1");<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    fs.createNewFile(notDeletablefile);<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    assertTrue("Test file not created!", fs.exists(notDeletablefile));<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    Path deletablefile = new Path(root, "testGetDeletableFiles_2");<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    fs.createNewFile(deletablefile);<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    assertTrue("Test file not created!", fs.exists(deletablefile));<a name="line.148"></a>
+<span class="sourceLineNo">140</span>    List&lt;String&gt; files = new ArrayList&lt;String&gt;(1);<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    files.add(file.getName());<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    // 4. Add the file to hfile-refs queue<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    rq.addHFileRefs(peerId, files);<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    // 5. Assert file should not be deletable<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    assertFalse("Cleaner should not allow to delete this file as there is a hfile reference node "<a name="line.145"></a>
+<span class="sourceLineNo">146</span>        + "for it in the queue.",<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      cleaner.isFileDeletable(fs.getFileStatus(file)));<a name="line.147"></a>
+<span class="sourceLineNo">148</span>  }<a name="line.148"></a>
 <span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span>    List&lt;FileStatus&gt; files = new ArrayList&lt;FileStatus&gt;(2);<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    FileStatus f = new FileStatus();<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    f.setPath(deletablefile);<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    files.add(f);<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    f = new FileStatus();<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    f.setPath(notDeletablefile);<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    files.add(f);<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span>    List&lt;String&gt; hfiles = new ArrayList&lt;&gt;(1);<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    hfiles.add(notDeletablefile.getName());<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    // 2. Add one file to hfile-refs queue<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    rq.addHFileRefs(peerId, hfiles);<a name="line.161"></a>
-<span class="sourceLineNo">162</span><a name="line.162"></a>
-<span class="sourceLineNo">163</span>    ReplicationHFileCleaner cleaner = new ReplicationHFileCleaner();<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    cleaner.setConf(conf);<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    Iterator&lt;FileStatus&gt; deletableFilesIterator = cleaner.getDeletableFiles(files).iterator();<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    int i = 0;<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    while (deletableFilesIterator.hasNext() &amp;&amp; i &lt; 2) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span>      i++;<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    }<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    // 5. Assert one file should not be deletable and it is present in the list returned<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    if (i &gt; 2) {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      fail("File " + notDeletablefile<a name="line.172"></a>
-<span class="sourceLineNo">173</span>          + " should not be deletable as its hfile reference node is not added.");<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    }<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    assertTrue(deletableFilesIterator.next().getPath().equals(deletablefile));<a name="line.175"></a>
-<span class="sourceLineNo">176</span>  }<a name="line.176"></a>
-<span class="sourceLineNo">177</span><a name="line.177"></a>
-<span class="sourceLineNo">178</span>  /*<a name="line.178"></a>
-<span class="sourceLineNo">179</span>   * Test for HBASE-14621. This test will not assert directly anything. Without the fix the test<a name="line.179"></a>
-<span class="sourceLineNo">180</span>   * will end up in a infinite loop, so it will timeout.<a name="line.180"></a>
-<span class="sourceLineNo">181</span>   */<a name="line.181"></a>
-<span class="sourceLineNo">182</span>  @Test(timeout = 15000)<a name="line.182"></a>
-<span class="sourceLineNo">183</span>  public void testForDifferntHFileRefsZnodeVersion() throws Exception {<a name="line.183"></a>
-<span class="sourceLineNo">184</span>    // 1. Create a file<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    Path file = new Path(root, "testForDifferntHFileRefsZnodeVersion");<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    fs.createNewFile(file);<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    // 2. Assert file is successfully created<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    assertTrue("Test file not created!", fs.exists(file));<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    ReplicationHFileCleaner cleaner = new ReplicationHFileCleaner();<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    cleaner.setConf(conf);<a name="line.190"></a>
-<span class="sourceLineNo">191</span><a name="line.191"></a>
-<span class="sourceLineNo">192</span>    ReplicationQueuesClient replicationQueuesClient = Mockito.mock(ReplicationQueuesClient.class);<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    //Return different znode version for each call<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    Mockito.when(replicationQueuesClient.getHFileRefsNodeChangeVersion()).thenReturn(1, 2);<a name="line.194"></a>
-<span class="sourceLineNo">195</span><a name="line.195"></a>
-<span class="sourceLineNo">196</span>    Class&lt;? extends ReplicationHFileCleaner&gt; cleanerClass = cleaner.getClass();<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    Field rqc = cleanerClass.getDeclaredField("rqc");<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    rqc.setAccessible(true);<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    rqc.set(cleaner, replicationQueuesClient);<a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span>    cleaner.isFileDeletable(fs.getFileStatus(file));<a name="line.201"></a>
-<span class="sourceLineNo">202</span>  }<a name="line.202"></a>
-<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span>  static class DummyServer implements Server {<a name="line.204"></a>
+<span class="sourceLineNo">150</span>  @Test<a name="line.150"></a>
+<span class="sourceLineNo">151</span>  public void testGetDeletableFiles() throws Exception {<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    // 1. Create two files and assert that they do not exist<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    Path notDeletablefile = new Path(root, "testGetDeletableFiles_1");<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    fs.createNewFile(notDeletablefile);<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    assertTrue("Test file not created!", fs.exists(notDeletablefile));<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    Path deletablefile = new Path(root, "testGetDeletableFiles_2");<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    fs.createNewFile(deletablefile);<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    assertTrue("Test file not created!", fs.exists(deletablefile));<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span>    List&lt;FileStatus&gt; files = new ArrayList&lt;FileStatus&gt;(2);<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    FileStatus f = new FileStatus();<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    f.setPath(deletablefile);<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    files.add(f);<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    f = new FileStatus();<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    f.setPath(notDeletablefile);<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    files.add(f);<a name="line.166"></a>
+<span class="sourceLineNo">167</span><a name="line.167"></a>
+<span class="sourceLineNo">168</span>    List&lt;String&gt; hfiles = new ArrayList&lt;&gt;(1);<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    hfiles.add(notDeletablefile.getName());<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    // 2. Add one file to hfile-refs queue<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    rq.addHFileRefs(peerId, hfiles);<a name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span>    ReplicationHFileCleaner cleaner = new ReplicationHFileCleaner();<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    cleaner.setConf(conf);<a name="line.174"></a>
+<span class="sourceLineNo">175</span>    Iterator&lt;FileStatus&gt; deletableFilesIterator = cleaner.getDeletableFiles(files).iterator();<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    int i = 0;<a name="line.176"></a>
+<span class="sourceLineNo">177</span>    while (deletableFilesIterator.hasNext() &amp;&amp; i &lt; 2) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span>      i++;<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    }<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    // 5. Assert one file should not be deletable and it is present in the list returned<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    if (i &gt; 2) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      fail("File " + notDeletablefile<a name="line.182"></a>
+<span class="sourceLineNo">183</span>          + " should not be deletable as its hfile reference node is not added.");<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    }<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    assertTrue(deletableFilesIterator.next().getPath().equals(deletablefile));<a name="line.185"></a>
+<span class="sourceLineNo">186</span>  }<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span>  /*<a name="line.188"></a>
+<span class="sourceLineNo">189</span>   * Test for HBASE-14621. This test will not assert directly anything. Without the fix the test<a name="line.189"></a>
+<span class="sourceLineNo">190</span>   * will end up in a infinite loop, so it will timeout.<a name="line.190"></a>
+<span class="sourceLineNo">191</span>   */<a name="line.191"></a>
+<span class="sourceLineNo">192</span>  @Test(timeout = 15000)<a name="line.192"></a>
+<span class="sourceLineNo">193</span>  public void testForDifferntHFileRefsZnodeVersion() throws Exception {<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    // 1. Create a file<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    Path file = new Path(root, "testForDifferntHFileRefsZnodeVersion");<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    fs.createNewFile(file);<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    // 2. Assert file is successfully created<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    assertTrue("Test file not created!", fs.exists(file));<a name="line.198"></a>
+<span class="sourceLineNo">199</span>    ReplicationHFileCleaner cleaner = new ReplicationHFileCleaner();<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    cleaner.setConf(conf);<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span>    ReplicationQueuesClient replicationQueuesClient = Mockito.mock(ReplicationQueuesClient.class);<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    //Return different znode version for each call<a name="line.203"></a>
+<span class="sourceLineNo">204</span>    Mockito.when(replicationQueuesClient.getHFileRefsNodeChangeVersion()).thenReturn(1, 2);<a name="line.204"></a>
 <span class="sourceLineNo">205</span><a name="line.205"></a>
-<span class="sourceLineNo">206</span>    @Override<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    public Configuration getConfiguration() {<a name="line.207"></a>
-<span class="sourceLineNo">208</span>      return TEST_UTIL.getConfiguration();<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    }<a name="line.209"></a>
+<span class="sourceLineNo">206</span>    Class&lt;? extends ReplicationHFileCleaner&gt; cleanerClass = cleaner.getClass();<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    Field rqc = cleanerClass.getDeclaredField("rqc");<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    rqc.setAccessible(true);<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    rqc.set(cleaner, replicationQueuesClient);<a name="line.209"></a>
 <span class="sourceLineNo">210</span><a name="line.210"></a>
-<span class="sourceLineNo">211</span>    @Override<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    public ZooKeeperWatcher getZooKeeper() {<a name="line.212"></a>
-<span class="sourceLineNo">213</span>      try {<a name="line.213"></a>
-<span class="sourceLineNo">214</span>        return new ZooKeeperWatcher(getConfiguration(), "dummy server", this);<a name="line.214"></a>
-<span class="sourceLineNo">215</span>      } catch (IOException e) {<a name="line.215"></a>
-<span class="sourceLineNo">216</span>        e.printStackTrace();<a name="line.216"></a>
-<span class="sourceLineNo">217</span>      }<a name="line.217"></a>
-<span class="sourceLineNo">218</span>      return null;<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    }<a name="line.219"></a>
+<span class="sourceLineNo">211</span>    cleaner.isFileDeletable(fs.getFileStatus(file));<a name="line.211"></a>
+<span class="sourceLineNo">212</span>  }<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span>  /**<a name="line.214"></a>
+<span class="sourceLineNo">215</span>   * ReplicationHFileCleaner should be able to ride over ZooKeeper errors without aborting.<a name="line.215"></a>
+<span class="sourceLineNo">216</span>   */<a name="line.216"></a>
+<span class="sourceLineNo">217</span>  @Test<a name="line.217"></a>
+<span class="sourceLineNo">218</span>  public void testZooKeeperAbort() throws Exception {<a name="line.218"></a>
+<span class="sourceLineNo">219</span>    ReplicationHFileCleaner cleaner = new ReplicationHFileCleaner();<a name="line.219"></a>
 <span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span>    @Override<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    public CoordinatedStateManager getCoordinatedStateManager() {<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      return null;<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    }<a name="line.224"></a>
+<span class="sourceLineNo">221</span>    List&lt;FileStatus&gt; dummyFiles =<a name="line.221"></a>
+<span class="sourceLineNo">222</span>        Lists.newArrayList(new FileStatus(100, false, 3, 100, System.currentTimeMillis(), new Path(<a name="line.222"></a>
+<span class="sourceLineNo">223</span>            "hfile1")), new FileStatus(100, false, 3, 100, System.currentTimeMillis(), new Path(<a name="line.223"></a>
+<span class="sourceLineNo">224</span>            "hfile2")));<a name="line.224"></a>
 <span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span>    @Override<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    public ClusterConnection getConnection() {<a name="line.227"></a>
-<span class="sourceLineNo">228</span>      return null;<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    }<a name="line.229"></a>
-<span class="sourceLineNo">230</span><a name="line.230"></a>
-<span class="sourceLineNo">231</span>    @Override<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    public MetaTableLocator getMetaTableLocator() {<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      return null;<a name="line.233"></a>
-<span class="sourceLineNo">234</span>    }<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span>    @Override<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    public ServerName getServerName() {<a name="line.237"></a>
-<span class="sourceLineNo">238</span>      return ServerName.valueOf("regionserver,60020,000000");<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    }<a name="line.239"></a>
-<span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span>    @Override<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    public void abort(String why, Throwable e) {<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    }<a name="line.243"></a>
-<span class="sourceLineNo">244</span><a name="line.244"></a>
-<span class="sourceLineNo">245</span>    @Override<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    public boolean isAborted() {<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      return false;<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    }<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span>    @Override<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    public void stop(String why) {<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    }<a name="line.252"></a>
-<span class="sourceLineNo">253</span><a name="line.253"></a>
-<span class="sourceLineNo">254</span>    @Override<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    public boolean isStopped() {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      return false;<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    }<a name="line.257"></a>
-<span class="sourceLineNo">258</span><a name="line.258"></a>
-<span class="sourceLineNo">259</span>    @Override<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    public ChoreService getChoreService() {<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      return null;<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    }<a name="line.262"></a>
-<span class="sourceLineNo">263</span><a name="line.263"></a>
-<span class="sourceLineNo">264</span>    @Override<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    public ClusterConnection getClusterConnection() {<a name="line.265"></a>
-<span class="sourceLineNo">266</span>      // TODO Auto-generated method stub<a name="line.266"></a>
-<span class="sourceLineNo">267</span>      return null;<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    }<a name="line.268"></a>
-<span class="sourceLineNo">269</span>  }<a name="line.269"></a>
-<span class="sourceLineNo">270</span>}<a name="line.270"></a>
+<span class="sourceLineNo">226</span>    FaultyZooKeeperWatcher faultyZK =<a name="line.226"></a>
+<span class="sourceLineNo">227</span>        new FaultyZooKeeperWatcher(conf, "testZooKeeperAbort-faulty", null);<a name="line.227"></a>
+<span class="sourceLineNo">228</span>    try {<a name="line.228"></a>
+<span class="sourceLineNo">229</span>      faultyZK.init();<a name="line.229"></a>
+<span class="sourceLineNo">230</span>      cleaner.setConf(conf, faultyZK);<a name="line.230"></a>
+<span class="sourceLineNo">231</span>      // should keep all files due to a ConnectionLossException getting the queues znodes<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      Iterable&lt;FileStatus&gt; toDelete = cleaner.getDeletableFiles(dummyFiles);<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      assertFalse(toDelete.iterator().hasNext());<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      assertFalse(cleaner.isStopped());<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    } finally {<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      faultyZK.close();<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    }<a name="line.237"></a>
+<span class="sourceLineNo">238</span><a name="line.238"></a>
+<span class="sourceLineNo">239</span>    // when zk is working both files should be returned<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    cleaner = new ReplicationHFileCleaner();<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    ZooKeeperWatcher zkw = new ZooKeeperWatcher(conf, "testZooKeeperAbort-normal", null);<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    try {<a name="line.242"></a>
+<span class="sourceLineNo">243</span>      cleaner.setConf(conf, zkw);<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      Iterable&lt;FileStatus&gt; filesToDelete = cleaner.getDeletableFiles(dummyFiles);<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      Iterator&lt;FileStatus&gt; iter = filesToDelete.iterator();<a name="line.245"></a>
+<span class="sourceLineNo">246</span>      assertTrue(iter.hasNext());<a name="line.246"></a>
+<span class="sourceLineNo">247</span>      assertEquals(new Path("hfile1"), iter.next().getPath());<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      assertTrue(iter.hasNext());<a name="line.248"></a>
+<span class="sourceLineNo">249</span>      assertEquals(new Path("hfile2"), iter.next().getPath());<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      assertFalse(iter.hasNext());<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    } finally {<a name="line.251"></a>
+<span class="sourceLineNo">252</span>      zkw.close();<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    }<a name="line.253"></a>
+<span class="sourceLineNo">254</span>  }<a name="line.254"></a>
+<span class="sourceLineNo">255</span><a name="line.255"></a>
+<span class="sourceLineNo">256</span>  static class DummyServer implements Server {<a name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span>    @Override<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    public Configuration getConfiguration() {<a name="line.259"></a>
+<span class="sourceLineNo">260</span>      return TEST_UTIL.getConfiguration();<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    }<a name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span>    @Override<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    public ZooKeeperWatcher getZooKeeper() {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      try {<a name="line.265"></a>
+<span class="sourceLineNo">266</span>        return new ZooKeeperWatcher(getConfiguration(), "dummy server", this);<a name="line.266"></a>
+<span class="sourceLineNo">267</span>      } catch (IOException e) {<a name="line.267"></a>
+<span class="sourceLineNo">268</span>        e.printStackTrace();<a name="line.268"></a>
+<span class="sourceLineNo">269</span>      }<a name="line.269"></a>
+<span class="sourceLineNo">270</span>      return null;<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    }<a name="line.271"></a>
+<span class="sourceLineNo">272</span><a name="line.272"></a>
+<span class="sourceLineNo">273</span>    @Override<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    public CoordinatedStateManager getCoordinatedStateManager() {<a name="line.274"></a>
+<span class="sourceLineNo">275</span>      return null;<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    }<a name="line.276"></a>
+<span class="sourceLineNo">277</span><a name="line.277"></a>
+<span class="sourceLineNo">278</span>    @Override<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    public ClusterConnection getConnection() {<a name="line.279"></a>
+<span class="sourceLineNo">280</span>      return null;<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    }<a name="line.281"></a>
+<span class="sourceLineNo">282</span><a name="line.282"></a>
+<span class="sourceLineNo">283</span>    @Override<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    public MetaTableLocator getMetaTableLocator() {<a name="line.284"></a>
+<span class="sourceLineNo">285</span>      return null;<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    }<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span>    @Override<a name="line.288"></a>
+<span class="sourceLineNo">289</span>    public ServerName getServerName() {<a name="line.289"></a>
+<span class="sourceLineNo">290</span>      return ServerName.valueOf("regionserver,60020,000000");<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    }<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span>    @Override<a name="line.293"></a>
+<span class="sourceLineNo">294</span>    public void abort(String why, Throwable e) {<a name="line.294"></a>
+<span class="sourceLineNo">295</span>    }<a name="line.295"></a>
+<span class="sourceLineNo">296</span><a name="line.296"></a>
+<span class="sourceLineNo">297</span>    @Override<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    public boolean isAborted() {<a name="line.298"></a>
+<span class="sourceLineNo">299</span>      return false;<a name="line.299"></a>
+<span class="sourceLineNo">300</span>    }<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span>    @Override<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    public void stop(String why) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    }<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span>    @Override<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    public boolean isStopped() {<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      return false;<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    }<a name="line.309"></a>
+<span class="sourceLineNo">310</span><a name="line.310"></a>
+<span class="sourceLineNo">311</span>    @Override<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    public ChoreService getChoreService() {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>      return null;<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    }<a name="line.314"></a>
+<span class="sourceLineNo">315</span><a name="line.315"></a>
+<span class="sourceLineNo">316</span>    @Override<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    public ClusterConnection getClusterConnection() {<a name="line.317"></a>
+<span class="sourceLineNo">318</span>      // TODO Auto-generated method stub<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      return null;<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    }<a name="line.320"></a>
+<span class="sourceLineNo">321</span>  }<a name="line.321"></a>
+<span class="sourceLineNo">322</span><a name="line.322"></a>
+<span class="sourceLineNo">323</span>  static class FaultyZooKeeperWatcher extends ZooKeeperWatcher {<a name="line.323"></a>
+<span class="sourceLineNo">324</span>    private RecoverableZooKeeper zk;<a name="line.324"></a>
+<span class="sourceLineNo">325</span>    public FaultyZooKeeperWatcher(Configuration conf, String identifier, Abortable abortable)<a name="line.325"></a>
+<span class="sourceLineNo">326</span>        throws ZooKeeperConnectionException, IOException {<a name="line.326"></a>
+<span class="sourceLineNo">327</span>      super(conf, identifier, abortable);<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    }<a name="line.328"></a>
+<span class="sourceLineNo">329</span><a name="line.329"></a>
+<span class="sourceLineNo">330</span>    public void init() throws Exception {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      this.zk = spy(super.getRecoverableZooKeeper());<a name="line.331"></a>
+<span class="sourceLineNo">332</span>      doThrow(new KeeperException.ConnectionLossException())<a name="line.332"></a>
+<span class="sourceLineNo">333</span>          .when(zk).getData("/hbase/replication/hfile-refs", null, new Stat());<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    }<a name="line.334"></a>
+<span class="sourceLineNo">335</span><a name="line.335"></a>
+<span class="sourceLineNo">336</span>    public RecoverableZooKeeper getRecoverableZooKeeper() {<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      return zk;<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/56eae93a/xref-test/allclasses-frame.html
----------------------------------------------------------------------
diff --git a/xref-test/allclasses-frame.html b/xref-test/allclasses-frame.html
index b766fb9..d87d7b9 100644
--- a/xref-test/allclasses-frame.html
+++ b/xref-test/allclasses-frame.html
@@ -750,7 +750,7 @@
 				<a href="org/apache/hadoop/hbase/regionserver/wal/FaultySequenceFileLogReader.html" target="classFrame">FaultySequenceFileLogReader</a>
 			</li>
 						<li>
-				<a href="org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.html" target="classFrame">FaultyZooKeeperWatcher</a>
+				<a href="org/apache/hadoop/hbase/master/cleaner/TestReplicationHFileCleaner.html" target="classFrame">FaultyZooKeeperWatcher</a>
 			</li>
 						<li>
 				<a href="org/apache/hadoop/hbase/TestClassFinder.html" target="classFrame">FileAndPath</a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/56eae93a/xref-test/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.html
----------------------------------------------------------------------
diff --git a/xref-test/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.html b/xref-test/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.html
index be59b8b..c75cc47 100644
--- a/xref-test/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.html
+++ b/xref-test/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.html
@@ -202,8 +202,8 @@
 <a class="jxr_linenumber" name="192" href="#192">192</a>         <strong class="jxr_keyword">new</strong> FileStatus(100, false, 3, 100, System.currentTimeMillis(), <strong class="jxr_keyword">new</strong> Path(<span class="jxr_string">"log2"</span>))
 <a class="jxr_linenumber" name="193" href="#193">193</a>     );
 <a class="jxr_linenumber" name="194" href="#194">194</a> 
-<a class="jxr_linenumber" name="195" href="#195">195</a>     <a href="../../../../../../org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.html">FaultyZooKeeperWatcher</a> faultyZK =
-<a class="jxr_linenumber" name="196" href="#196">196</a>         <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.html">FaultyZooKeeperWatcher</a>(conf, <span class="jxr_string">"testZooKeeperAbort-faulty"</span>, <strong class="jxr_keyword">null</strong>);
+<a class="jxr_linenumber" name="195" href="#195">195</a>     <a href="../../../../../../org/apache/hadoop/hbase/master/cleaner/TestReplicationHFileCleaner.html">FaultyZooKeeperWatcher</a> faultyZK =
+<a class="jxr_linenumber" name="196" href="#196">196</a>         <strong class="jxr_keyword">new</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/cleaner/TestReplicationHFileCleaner.html">FaultyZooKeeperWatcher</a>(conf, <span class="jxr_string">"testZooKeeperAbort-faulty"</span>, <strong class="jxr_keyword">null</strong>);
 <a class="jxr_linenumber" name="197" href="#197">197</a>     <strong class="jxr_keyword">try</strong> {
 <a class="jxr_linenumber" name="198" href="#198">198</a>       faultyZK.init();
 <a class="jxr_linenumber" name="199" href="#199">199</a>       cleaner.setConf(conf, faultyZK);
@@ -297,10 +297,10 @@
 <a class="jxr_linenumber" name="287" href="#287">287</a>     }
 <a class="jxr_linenumber" name="288" href="#288">288</a>   }
 <a class="jxr_linenumber" name="289" href="#289">289</a> 
-<a class="jxr_linenumber" name="290" href="#290">290</a>   <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.html">FaultyZooKeeperWatcher</a> <strong class="jxr_keyword">extends</strong> ZooKeeperWatcher {
+<a class="jxr_linenumber" name="290" href="#290">290</a>   <strong class="jxr_keyword">static</strong> <strong class="jxr_keyword">class</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/cleaner/TestReplicationHFileCleaner.html">FaultyZooKeeperWatcher</a> <strong class="jxr_keyword">extends</strong> ZooKeeperWatcher {
 <a class="jxr_linenumber" name="291" href="#291">291</a>     <strong class="jxr_keyword">private</strong> RecoverableZooKeeper zk;
 <a class="jxr_linenumber" name="292" href="#292">292</a> 
-<a class="jxr_linenumber" name="293" href="#293">293</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.html">FaultyZooKeeperWatcher</a>(Configuration conf, String identifier, Abortable abortable)
+<a class="jxr_linenumber" name="293" href="#293">293</a>     <strong class="jxr_keyword">public</strong> <a href="../../../../../../org/apache/hadoop/hbase/master/cleaner/TestReplicationHFileCleaner.html">FaultyZooKeeperWatcher</a>(Configuration conf, String identifier, Abortable abortable)
 <a class="jxr_linenumber" name="294" href="#294">294</a>         <strong class="jxr_keyword">throws</strong> ZooKeeperConnectionException, IOException {
 <a class="jxr_linenumber" name="295" href="#295">295</a>       <strong class="jxr_keyword">super</strong>(conf, identifier, abortable);
 <a class="jxr_linenumber" name="296" href="#296">296</a>     }


Mime
View raw message