Repository: hbase-site
Updated Branches:
  refs/heads/asf-site 37bebb63e -> bd10ee7c2


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/bd10ee7c/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManagerZkImpl.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManagerZkImpl.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManagerZkImpl.html
index 8e7123d..bfbed77 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManagerZkImpl.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManagerZkImpl.html
@@ -30,135 +30,136 @@
 <span class="sourceLineNo">022</span>import 
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.22"></a>
 <span class="sourceLineNo">023</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.23"></a>
 <span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.Server;<a 
name="line.24"></a>
-<span class="sourceLineNo">025</span>import 
org.apache.hadoop.hbase.replication.ReplicationFactory;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import 
org.apache.hadoop.hbase.replication.ReplicationQueueInfo;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.replication.ReplicationQueues;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.replication.ReplicationQueuesArguments;<a 
name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.replication.ReplicationQueuesClientArguments;<a 
name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.replication.ReplicationQueuesClientZKImpl;<a 
name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.replication.ReplicationSourceDummy;<a 
name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.testclassification.ReplicationTests;<a 
name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.junit.BeforeClass;<a 
name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.junit.Test;<a 
name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.junit.experimental.categories.Category;<a name="line.36"></a>
-<span class="sourceLineNo">037</span><a name="line.37"></a>
-<span class="sourceLineNo">038</span>import java.util.List;<a 
name="line.38"></a>
-<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span>import static 
org.junit.Assert.assertEquals;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import static 
org.junit.Assert.assertTrue;<a name="line.41"></a>
-<span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span>/**<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * Tests the ReplicationSourceManager 
with ReplicationQueueZkImpl's and<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * ReplicationQueuesClientZkImpl. Also 
includes extra tests outside of those in<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * TestReplicationSourceManager that test 
ReplicationQueueZkImpl-specific behaviors.<a name="line.46"></a>
-<span class="sourceLineNo">047</span> */<a name="line.47"></a>
-<span class="sourceLineNo">048</span>@Category({ReplicationTests.class, 
MediumTests.class})<a name="line.48"></a>
-<span class="sourceLineNo">049</span>public class 
TestReplicationSourceManagerZkImpl extends TestReplicationSourceManager {<a 
name="line.49"></a>
-<span class="sourceLineNo">050</span>  @BeforeClass<a name="line.50"></a>
-<span class="sourceLineNo">051</span>  public static void setUpBeforeClass() 
throws Exception {<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    conf = HBaseConfiguration.create();<a 
name="line.52"></a>
-<span class="sourceLineNo">053</span>    
conf.set("replication.replicationsource.implementation",<a name="line.53"></a>
-<span class="sourceLineNo">054</span>      
ReplicationSourceDummy.class.getCanonicalName());<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    
conf.setLong("replication.sleep.before.failover", 2000);<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    
conf.setInt("replication.source.maxretriesmultiplier", 10);<a 
name="line.56"></a>
-<span class="sourceLineNo">057</span>    utility = new 
HBaseTestingUtility(conf);<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    utility.startMiniZKCluster();<a 
name="line.58"></a>
-<span class="sourceLineNo">059</span>    setupZkAndReplication();<a 
name="line.59"></a>
-<span class="sourceLineNo">060</span>  }<a name="line.60"></a>
-<span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span>  // Tests the naming convention of 
adopted queues for ReplicationQueuesZkImpl<a name="line.62"></a>
-<span class="sourceLineNo">063</span>  @Test<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  public void 
testNodeFailoverDeadServerParsing() throws Exception {<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    final Server server = new 
DummyServer("ec2-54-234-230-108.compute-1.amazonaws.com");<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    ReplicationQueues repQueues =<a 
name="line.66"></a>
-<span class="sourceLineNo">067</span>      
ReplicationFactory.getReplicationQueues(new ReplicationQueuesArguments(conf, 
server,<a name="line.67"></a>
-<span class="sourceLineNo">068</span>        server.getZooKeeper()));<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span>    
repQueues.init(server.getServerName().toString());<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    // populate some znodes in the peer 
znode<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    files.add("log1");<a 
name="line.71"></a>
-<span class="sourceLineNo">072</span>    files.add("log2");<a 
name="line.72"></a>
-<span class="sourceLineNo">073</span>    for (String file : files) {<a 
name="line.73"></a>
-<span class="sourceLineNo">074</span>      repQueues.addLog("1", file);<a 
name="line.74"></a>
-<span class="sourceLineNo">075</span>    }<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span>    // create 3 DummyServers<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span>    Server s1 = new 
DummyServer("ip-10-8-101-114.ec2.internal");<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    Server s2 = new 
DummyServer("ec2-107-20-52-47.compute-1.amazonaws.com");<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    Server s3 = new 
DummyServer("ec2-23-20-187-167.compute-1.amazonaws.com");<a name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span>    // simulate three servers fail 
sequentially<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    ReplicationQueues rq1 =<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span>      
ReplicationFactory.getReplicationQueues(new 
ReplicationQueuesArguments(s1.getConfiguration(), s1,<a name="line.84"></a>
-<span class="sourceLineNo">085</span>        s1.getZooKeeper()));<a 
name="line.85"></a>
-<span class="sourceLineNo">086</span>    
rq1.init(s1.getServerName().toString());<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    String serverName = 
server.getServerName().getServerName();<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    List&lt;String&gt; unclaimed = 
rq1.getUnClaimedQueueIds(serverName);<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    rq1.claimQueue(serverName, 
unclaimed.get(0)).getSecond();<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    
rq1.removeReplicatorIfQueueIsEmpty(unclaimed.get(0));<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    ReplicationQueues rq2 =<a 
name="line.91"></a>
-<span class="sourceLineNo">092</span>      
ReplicationFactory.getReplicationQueues(new 
ReplicationQueuesArguments(s2.getConfiguration(), s2,<a name="line.92"></a>
-<span class="sourceLineNo">093</span>        s2.getZooKeeper()));<a 
name="line.93"></a>
-<span class="sourceLineNo">094</span>    
rq2.init(s2.getServerName().toString());<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    serverName = 
s1.getServerName().getServerName();<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    unclaimed = 
rq2.getUnClaimedQueueIds(serverName);<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    rq2.claimQueue(serverName, 
unclaimed.get(0)).getSecond();<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    
rq2.removeReplicatorIfQueueIsEmpty(unclaimed.get(0));<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    ReplicationQueues rq3 =<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>      
ReplicationFactory.getReplicationQueues(new 
ReplicationQueuesArguments(s3.getConfiguration(), s3,<a name="line.100"></a>
-<span class="sourceLineNo">101</span>        s3.getZooKeeper()));<a 
name="line.101"></a>
-<span class="sourceLineNo">102</span>    
rq3.init(s3.getServerName().toString());<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    serverName = 
s2.getServerName().getServerName();<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    unclaimed = 
rq3.getUnClaimedQueueIds(serverName);<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    String queue3 = 
rq3.claimQueue(serverName, unclaimed.get(0)).getFirst();<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    
rq3.removeReplicatorIfQueueIsEmpty(unclaimed.get(0));<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    ReplicationQueueInfo 
replicationQueueInfo = new ReplicationQueueInfo(queue3);<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    List&lt;String&gt; result = 
replicationQueueInfo.getDeadRegionServers();<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    // verify<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    
assertTrue(result.contains(server.getServerName().getServerName()));<a 
name="line.110"></a>
-<span class="sourceLineNo">111</span>    
assertTrue(result.contains(s1.getServerName().getServerName()));<a 
name="line.111"></a>
-<span class="sourceLineNo">112</span>    
assertTrue(result.contains(s2.getServerName().getServerName()));<a 
name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span>    server.stop("");<a 
name="line.114"></a>
-<span class="sourceLineNo">115</span>  }<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>  @Test<a name="line.117"></a>
-<span class="sourceLineNo">118</span>  public void 
testFailoverDeadServerCversionChange() throws Exception {<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    final Server s0 = new 
DummyServer("cversion-change0.example.org");<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    ReplicationQueues repQueues =<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span>      
ReplicationFactory.getReplicationQueues(new ReplicationQueuesArguments(conf, 
s0,<a name="line.121"></a>
-<span class="sourceLineNo">122</span>        s0.getZooKeeper()));<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>    
repQueues.init(s0.getServerName().toString());<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    // populate some znodes in the peer 
znode<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    files.add("log1");<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span>    files.add("log2");<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>    for (String file : files) {<a 
name="line.127"></a>
-<span class="sourceLineNo">128</span>      repQueues.addLog("1", file);<a 
name="line.128"></a>
-<span class="sourceLineNo">129</span>    }<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    // simulate queue transfer<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span>    Server s1 = new 
DummyServer("cversion-change1.example.org");<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    ReplicationQueues rq1 =<a 
name="line.132"></a>
-<span class="sourceLineNo">133</span>      
ReplicationFactory.getReplicationQueues(new 
ReplicationQueuesArguments(s1.getConfiguration(), s1,<a name="line.133"></a>
-<span class="sourceLineNo">134</span>        s1.getZooKeeper()));<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>    
rq1.init(s1.getServerName().toString());<a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span>    ReplicationQueuesClientZKImpl client 
=<a name="line.137"></a>
-<span class="sourceLineNo">138</span>      
(ReplicationQueuesClientZKImpl)ReplicationFactory.getReplicationQueuesClient(<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>        new 
ReplicationQueuesClientArguments(s1.getConfiguration(), s1, 
s1.getZooKeeper()));<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span>    int v0 = 
client.getQueuesZNodeCversion();<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    List&lt;String&gt; queues = 
rq1.getUnClaimedQueueIds(s0.getServerName().getServerName());<a 
name="line.142"></a>
-<span class="sourceLineNo">143</span>    for(String queue : queues) {<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>      
rq1.claimQueue(s0.getServerName().getServerName(), queue);<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span>    }<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    
rq1.removeReplicatorIfQueueIsEmpty(s0.getServerName().getServerName());<a 
name="line.146"></a>
-<span class="sourceLineNo">147</span>    int v1 = 
client.getQueuesZNodeCversion();<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    // cversion should increase by 1 
since a child node is deleted<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    assertEquals(v0 + 1, v1);<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span>    s0.stop("");<a name="line.151"></a>
-<span class="sourceLineNo">152</span>  }<a name="line.152"></a>
-<span class="sourceLineNo">153</span>}<a name="line.153"></a>
+<span class="sourceLineNo">025</span>import 
org.apache.hadoop.hbase.ServerName;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import 
org.apache.hadoop.hbase.replication.ReplicationFactory;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.replication.ReplicationQueueInfo;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.replication.ReplicationQueues;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.replication.ReplicationQueuesArguments;<a 
name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.replication.ReplicationQueuesClientArguments;<a 
name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.replication.ReplicationQueuesClientZKImpl;<a 
name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.replication.ReplicationSourceDummy;<a 
name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.testclassification.ReplicationTests;<a 
name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.junit.BeforeClass;<a 
name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.junit.Test;<a 
name="line.36"></a>
+<span class="sourceLineNo">037</span>import 
org.junit.experimental.categories.Category;<a name="line.37"></a>
+<span class="sourceLineNo">038</span><a name="line.38"></a>
+<span class="sourceLineNo">039</span>import java.util.List;<a 
name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span>import static 
org.junit.Assert.assertEquals;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import static 
org.junit.Assert.assertTrue;<a name="line.42"></a>
+<span class="sourceLineNo">043</span><a name="line.43"></a>
+<span class="sourceLineNo">044</span>/**<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * Tests the ReplicationSourceManager 
with ReplicationQueueZkImpl's and<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * ReplicationQueuesClientZkImpl. Also 
includes extra tests outside of those in<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * TestReplicationSourceManager that test 
ReplicationQueueZkImpl-specific behaviors.<a name="line.47"></a>
+<span class="sourceLineNo">048</span> */<a name="line.48"></a>
+<span class="sourceLineNo">049</span>@Category({ReplicationTests.class, 
MediumTests.class})<a name="line.49"></a>
+<span class="sourceLineNo">050</span>public class 
TestReplicationSourceManagerZkImpl extends TestReplicationSourceManager {<a 
name="line.50"></a>
+<span class="sourceLineNo">051</span>  @BeforeClass<a name="line.51"></a>
+<span class="sourceLineNo">052</span>  public static void setUpBeforeClass() 
throws Exception {<a name="line.52"></a>
+<span class="sourceLineNo">053</span>    conf = HBaseConfiguration.create();<a 
name="line.53"></a>
+<span class="sourceLineNo">054</span>    
conf.set("replication.replicationsource.implementation",<a name="line.54"></a>
+<span class="sourceLineNo">055</span>      
ReplicationSourceDummy.class.getCanonicalName());<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    
conf.setLong("replication.sleep.before.failover", 2000);<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    
conf.setInt("replication.source.maxretriesmultiplier", 10);<a 
name="line.57"></a>
+<span class="sourceLineNo">058</span>    utility = new 
HBaseTestingUtility(conf);<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    utility.startMiniZKCluster();<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>    setupZkAndReplication();<a 
name="line.60"></a>
+<span class="sourceLineNo">061</span>  }<a name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span>  // Tests the naming convention of 
adopted queues for ReplicationQueuesZkImpl<a name="line.63"></a>
+<span class="sourceLineNo">064</span>  @Test<a name="line.64"></a>
+<span class="sourceLineNo">065</span>  public void 
testNodeFailoverDeadServerParsing() throws Exception {<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    final Server server = new 
DummyServer("ec2-54-234-230-108.compute-1.amazonaws.com");<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    ReplicationQueues repQueues =<a 
name="line.67"></a>
+<span class="sourceLineNo">068</span>      
ReplicationFactory.getReplicationQueues(new ReplicationQueuesArguments(conf, 
server,<a name="line.68"></a>
+<span class="sourceLineNo">069</span>        server.getZooKeeper()));<a 
name="line.69"></a>
+<span class="sourceLineNo">070</span>    
repQueues.init(server.getServerName().toString());<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    // populate some znodes in the peer 
znode<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    files.add("log1");<a 
name="line.72"></a>
+<span class="sourceLineNo">073</span>    files.add("log2");<a 
name="line.73"></a>
+<span class="sourceLineNo">074</span>    for (String file : files) {<a 
name="line.74"></a>
+<span class="sourceLineNo">075</span>      repQueues.addLog("1", file);<a 
name="line.75"></a>
+<span class="sourceLineNo">076</span>    }<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span>    // create 3 DummyServers<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>    Server s1 = new 
DummyServer("ip-10-8-101-114.ec2.internal");<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    Server s2 = new 
DummyServer("ec2-107-20-52-47.compute-1.amazonaws.com");<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    Server s3 = new 
DummyServer("ec2-23-20-187-167.compute-1.amazonaws.com");<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span>    // simulate three servers fail 
sequentially<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    ReplicationQueues rq1 =<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span>      
ReplicationFactory.getReplicationQueues(new 
ReplicationQueuesArguments(s1.getConfiguration(), s1,<a name="line.85"></a>
+<span class="sourceLineNo">086</span>        s1.getZooKeeper()));<a 
name="line.86"></a>
+<span class="sourceLineNo">087</span>    
rq1.init(s1.getServerName().toString());<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    String serverName = 
server.getServerName().getServerName();<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    List&lt;String&gt; unclaimed = 
rq1.getUnClaimedQueueIds(serverName);<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    rq1.claimQueue(serverName, 
unclaimed.get(0)).getSecond();<a name="line.90"></a>
+<span class="sourceLineNo">091</span>    
rq1.removeReplicatorIfQueueIsEmpty(unclaimed.get(0));<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    ReplicationQueues rq2 =<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>      
ReplicationFactory.getReplicationQueues(new 
ReplicationQueuesArguments(s2.getConfiguration(), s2,<a name="line.93"></a>
+<span class="sourceLineNo">094</span>        s2.getZooKeeper()));<a 
name="line.94"></a>
+<span class="sourceLineNo">095</span>    
rq2.init(s2.getServerName().toString());<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    serverName = 
s1.getServerName().getServerName();<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    unclaimed = 
rq2.getUnClaimedQueueIds(serverName);<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    rq2.claimQueue(serverName, 
unclaimed.get(0)).getSecond();<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    
rq2.removeReplicatorIfQueueIsEmpty(unclaimed.get(0));<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    ReplicationQueues rq3 =<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>      
ReplicationFactory.getReplicationQueues(new 
ReplicationQueuesArguments(s3.getConfiguration(), s3,<a name="line.101"></a>
+<span class="sourceLineNo">102</span>        s3.getZooKeeper()));<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>    
rq3.init(s3.getServerName().toString());<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    serverName = 
s2.getServerName().getServerName();<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    unclaimed = 
rq3.getUnClaimedQueueIds(serverName);<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    String queue3 = 
rq3.claimQueue(serverName, unclaimed.get(0)).getFirst();<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    
rq3.removeReplicatorIfQueueIsEmpty(unclaimed.get(0));<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    ReplicationQueueInfo 
replicationQueueInfo = new ReplicationQueueInfo(queue3);<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    List&lt;ServerName&gt; result = 
replicationQueueInfo.getDeadRegionServers();<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    // verify<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    
assertTrue(result.contains(server.getServerName()));<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    
assertTrue(result.contains(s1.getServerName()));<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    
assertTrue(result.contains(s2.getServerName()));<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span>    server.stop("");<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span>  }<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span>  @Test<a name="line.118"></a>
+<span class="sourceLineNo">119</span>  public void 
testFailoverDeadServerCversionChange() throws Exception {<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    final Server s0 = new 
DummyServer("cversion-change0.example.org");<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    ReplicationQueues repQueues =<a 
name="line.121"></a>
+<span class="sourceLineNo">122</span>      
ReplicationFactory.getReplicationQueues(new ReplicationQueuesArguments(conf, 
s0,<a name="line.122"></a>
+<span class="sourceLineNo">123</span>        s0.getZooKeeper()));<a 
name="line.123"></a>
+<span class="sourceLineNo">124</span>    
repQueues.init(s0.getServerName().toString());<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    // populate some znodes in the peer 
znode<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    files.add("log1");<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span>    files.add("log2");<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>    for (String file : files) {<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>      repQueues.addLog("1", file);<a 
name="line.129"></a>
+<span class="sourceLineNo">130</span>    }<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    // simulate queue transfer<a 
name="line.131"></a>
+<span class="sourceLineNo">132</span>    Server s1 = new 
DummyServer("cversion-change1.example.org");<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    ReplicationQueues rq1 =<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>      
ReplicationFactory.getReplicationQueues(new 
ReplicationQueuesArguments(s1.getConfiguration(), s1,<a name="line.134"></a>
+<span class="sourceLineNo">135</span>        s1.getZooKeeper()));<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>    
rq1.init(s1.getServerName().toString());<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span>    ReplicationQueuesClientZKImpl client 
=<a name="line.138"></a>
+<span class="sourceLineNo">139</span>      
(ReplicationQueuesClientZKImpl)ReplicationFactory.getReplicationQueuesClient(<a 
name="line.139"></a>
+<span class="sourceLineNo">140</span>        new 
ReplicationQueuesClientArguments(s1.getConfiguration(), s1, 
s1.getZooKeeper()));<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span>    int v0 = 
client.getQueuesZNodeCversion();<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    List&lt;String&gt; queues = 
rq1.getUnClaimedQueueIds(s0.getServerName().getServerName());<a 
name="line.143"></a>
+<span class="sourceLineNo">144</span>    for(String queue : queues) {<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>      
rq1.claimQueue(s0.getServerName().getServerName(), queue);<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>    }<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    
rq1.removeReplicatorIfQueueIsEmpty(s0.getServerName().getServerName());<a 
name="line.147"></a>
+<span class="sourceLineNo">148</span>    int v1 = 
client.getQueuesZNodeCversion();<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    // cversion should increase by 1 
since a child node is deleted<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    assertEquals(v0 + 1, v1);<a 
name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span>    s0.stop("");<a name="line.152"></a>
+<span class="sourceLineNo">153</span>  }<a name="line.153"></a>
+<span class="sourceLineNo">154</span>}<a name="line.154"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/bd10ee7c/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html
index 5197ea6..c994229 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html
@@ -156,7 +156,7 @@
 <span class="sourceLineNo">148</span>          log.rollWriter();<a 
name="line.148"></a>
 <span class="sourceLineNo">149</span><a name="line.149"></a>
 <span class="sourceLineNo">150</span>          try (WALEntryStream entryStream 
=<a name="line.150"></a>
-<span class="sourceLineNo">151</span>              new 
WALEntryStream(walQueue, fs, conf, 0, log, new MetricsSource("1"))) {<a 
name="line.151"></a>
+<span class="sourceLineNo">151</span>              new 
WALEntryStream(walQueue, fs, conf, 0, log, null, new MetricsSource("1"))) {<a 
name="line.151"></a>
 <span class="sourceLineNo">152</span>            int i = 0;<a 
name="line.152"></a>
 <span class="sourceLineNo">153</span>            while (entryStream.hasNext()) 
{<a name="line.153"></a>
 <span class="sourceLineNo">154</span>              
assertNotNull(entryStream.next());<a name="line.154"></a>
@@ -183,7 +183,7 @@
 <span class="sourceLineNo">175</span>    appendToLog();<a name="line.175"></a>
 <span class="sourceLineNo">176</span>    long oldPos;<a name="line.176"></a>
 <span class="sourceLineNo">177</span>    try (WALEntryStream entryStream =<a 
name="line.177"></a>
-<span class="sourceLineNo">178</span>        new WALEntryStream(walQueue, fs, 
conf, 0, log, new MetricsSource("1"))) {<a name="line.178"></a>
+<span class="sourceLineNo">178</span>        new WALEntryStream(walQueue, fs, 
conf, 0, log, null, new MetricsSource("1"))) {<a name="line.178"></a>
 <span class="sourceLineNo">179</span>      // There's one edit in the log, 
read it. Reading past it needs to throw exception<a name="line.179"></a>
 <span class="sourceLineNo">180</span>      
assertTrue(entryStream.hasNext());<a name="line.180"></a>
 <span class="sourceLineNo">181</span>      WAL.Entry entry = 
entryStream.next();<a name="line.181"></a>
@@ -201,7 +201,7 @@
 <span class="sourceLineNo">193</span>    appendToLog();<a name="line.193"></a>
 <span class="sourceLineNo">194</span><a name="line.194"></a>
 <span class="sourceLineNo">195</span>    try (WALEntryStream entryStream = new 
WALEntryStream(walQueue, fs, conf, oldPos,<a name="line.195"></a>
-<span class="sourceLineNo">196</span>        log, new MetricsSource("1"))) {<a 
name="line.196"></a>
+<span class="sourceLineNo">196</span>        log, null, new 
MetricsSource("1"))) {<a name="line.196"></a>
 <span class="sourceLineNo">197</span>      // Read the newly added entry, make 
sure we made progress<a name="line.197"></a>
 <span class="sourceLineNo">198</span>      WAL.Entry entry = 
entryStream.next();<a name="line.198"></a>
 <span class="sourceLineNo">199</span>      assertNotEquals(oldPos, 
entryStream.getPosition());<a name="line.199"></a>
@@ -215,7 +215,7 @@
 <span class="sourceLineNo">207</span>    appendToLog();<a name="line.207"></a>
 <span class="sourceLineNo">208</span><a name="line.208"></a>
 <span class="sourceLineNo">209</span>    try (WALEntryStream entryStream = new 
WALEntryStream(walQueue, fs, conf, oldPos,<a name="line.209"></a>
-<span class="sourceLineNo">210</span>        log, new MetricsSource("1"))) {<a 
name="line.210"></a>
+<span class="sourceLineNo">210</span>        log, null, new 
MetricsSource("1"))) {<a name="line.210"></a>
 <span class="sourceLineNo">211</span>      WAL.Entry entry = 
entryStream.next();<a name="line.211"></a>
 <span class="sourceLineNo">212</span>      assertNotEquals(oldPos, 
entryStream.getPosition());<a name="line.212"></a>
 <span class="sourceLineNo">213</span>      assertNotNull(entry);<a 
name="line.213"></a>
@@ -240,7 +240,7 @@
 <span class="sourceLineNo">232</span>    appendToLog("1");<a 
name="line.232"></a>
 <span class="sourceLineNo">233</span>    appendToLog("2");// 2<a 
name="line.233"></a>
 <span class="sourceLineNo">234</span>    try (WALEntryStream entryStream =<a 
name="line.234"></a>
-<span class="sourceLineNo">235</span>        new WALEntryStream(walQueue, fs, 
conf, 0, log, new MetricsSource("1"))) {<a name="line.235"></a>
+<span class="sourceLineNo">235</span>        new WALEntryStream(walQueue, fs, 
conf, 0, log, null, new MetricsSource("1"))) {<a name="line.235"></a>
 <span class="sourceLineNo">236</span>      assertEquals("1", 
getRow(entryStream.next()));<a name="line.236"></a>
 <span class="sourceLineNo">237</span><a name="line.237"></a>
 <span class="sourceLineNo">238</span>      appendToLog("3"); // 3 - comes in 
after reader opened<a name="line.238"></a>
@@ -265,7 +265,7 @@
 <span class="sourceLineNo">257</span>  public void 
testNewEntriesWhileStreaming() throws Exception {<a name="line.257"></a>
 <span class="sourceLineNo">258</span>    appendToLog("1");<a 
name="line.258"></a>
 <span class="sourceLineNo">259</span>    try (WALEntryStream entryStream =<a 
name="line.259"></a>
-<span class="sourceLineNo">260</span>        new WALEntryStream(walQueue, fs, 
conf, 0, log, new MetricsSource("1"))) {<a name="line.260"></a>
+<span class="sourceLineNo">260</span>        new WALEntryStream(walQueue, fs, 
conf, 0, log, null, new MetricsSource("1"))) {<a name="line.260"></a>
 <span class="sourceLineNo">261</span>      entryStream.next(); // we've hit 
the end of the stream at this point<a name="line.261"></a>
 <span class="sourceLineNo">262</span><a name="line.262"></a>
 <span class="sourceLineNo">263</span>      // some new entries come in while 
we're streaming<a name="line.263"></a>
@@ -288,7 +288,7 @@
 <span class="sourceLineNo">280</span>    long lastPosition = 0;<a 
name="line.280"></a>
 <span class="sourceLineNo">281</span>    appendToLog("1");<a 
name="line.281"></a>
 <span class="sourceLineNo">282</span>    try (WALEntryStream entryStream =<a 
name="line.282"></a>
-<span class="sourceLineNo">283</span>        new WALEntryStream(walQueue, fs, 
conf, 0, log, new MetricsSource("1"))) {<a name="line.283"></a>
+<span class="sourceLineNo">283</span>        new WALEntryStream(walQueue, fs, 
conf, 0, log, null, new MetricsSource("1"))) {<a name="line.283"></a>
 <span class="sourceLineNo">284</span>      entryStream.next(); // we've hit 
the end of the stream at this point<a name="line.284"></a>
 <span class="sourceLineNo">285</span>      appendToLog("2");<a 
name="line.285"></a>
 <span class="sourceLineNo">286</span>      appendToLog("3");<a 
name="line.286"></a>
@@ -296,7 +296,7 @@
 <span class="sourceLineNo">288</span>    }<a name="line.288"></a>
 <span class="sourceLineNo">289</span>    // next stream should picks up where 
we left off<a name="line.289"></a>
 <span class="sourceLineNo">290</span>    try (WALEntryStream entryStream =<a 
name="line.290"></a>
-<span class="sourceLineNo">291</span>        new WALEntryStream(walQueue, fs, 
conf, lastPosition, log, new MetricsSource("1"))) {<a name="line.291"></a>
+<span class="sourceLineNo">291</span>        new WALEntryStream(walQueue, fs, 
conf, lastPosition, log, null, new MetricsSource("1"))) {<a name="line.291"></a>
 <span class="sourceLineNo">292</span>      assertEquals("2", 
getRow(entryStream.next()));<a name="line.292"></a>
 <span class="sourceLineNo">293</span>      assertEquals("3", 
getRow(entryStream.next()));<a name="line.293"></a>
 <span class="sourceLineNo">294</span>      assertFalse(entryStream.hasNext()); 
// done<a name="line.294"></a>
@@ -314,13 +314,13 @@
 <span class="sourceLineNo">306</span>    appendEntriesToLog(3);<a 
name="line.306"></a>
 <span class="sourceLineNo">307</span>    // read only one element<a 
name="line.307"></a>
 <span class="sourceLineNo">308</span>    try (WALEntryStream entryStream = new 
WALEntryStream(walQueue, fs, conf, lastPosition,<a name="line.308"></a>
-<span class="sourceLineNo">309</span>        log, new MetricsSource("1"))) {<a 
name="line.309"></a>
+<span class="sourceLineNo">309</span>        log, null, new 
MetricsSource("1"))) {<a name="line.309"></a>
 <span class="sourceLineNo">310</span>      entryStream.next();<a 
name="line.310"></a>
 <span class="sourceLineNo">311</span>      lastPosition = 
entryStream.getPosition();<a name="line.311"></a>
 <span class="sourceLineNo">312</span>    }<a name="line.312"></a>
 <span class="sourceLineNo">313</span>    // there should still be two more 
entries from where we left off<a name="line.313"></a>
 <span class="sourceLineNo">314</span>    try (WALEntryStream entryStream =<a 
name="line.314"></a>
-<span class="sourceLineNo">315</span>        new WALEntryStream(walQueue, fs, 
conf, lastPosition, log, new MetricsSource("1"))) {<a name="line.315"></a>
+<span class="sourceLineNo">315</span>        new WALEntryStream(walQueue, fs, 
conf, lastPosition, log, null, new MetricsSource("1"))) {<a name="line.315"></a>
 <span class="sourceLineNo">316</span>      
assertNotNull(entryStream.next());<a name="line.316"></a>
 <span class="sourceLineNo">317</span>      
assertNotNull(entryStream.next());<a name="line.317"></a>
 <span class="sourceLineNo">318</span>      
assertFalse(entryStream.hasNext());<a name="line.318"></a>
@@ -331,7 +331,7 @@
 <span class="sourceLineNo">323</span>  @Test<a name="line.323"></a>
 <span class="sourceLineNo">324</span>  public void testEmptyStream() throws 
Exception {<a name="line.324"></a>
 <span class="sourceLineNo">325</span>    try (WALEntryStream entryStream =<a 
name="line.325"></a>
-<span class="sourceLineNo">326</span>        new WALEntryStream(walQueue, fs, 
conf, 0, log, new MetricsSource("1"))) {<a name="line.326"></a>
+<span class="sourceLineNo">326</span>        new WALEntryStream(walQueue, fs, 
conf, 0, log, null, new MetricsSource("1"))) {<a name="line.326"></a>
 <span class="sourceLineNo">327</span>      
assertFalse(entryStream.hasNext());<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>
@@ -342,7 +342,7 @@
 <span class="sourceLineNo">334</span>    // get ending position<a 
name="line.334"></a>
 <span class="sourceLineNo">335</span>    long position;<a name="line.335"></a>
 <span class="sourceLineNo">336</span>    try (WALEntryStream entryStream =<a 
name="line.336"></a>
-<span class="sourceLineNo">337</span>        new WALEntryStream(walQueue, fs, 
conf, 0, log, new MetricsSource("1"))) {<a name="line.337"></a>
+<span class="sourceLineNo">337</span>        new WALEntryStream(walQueue, fs, 
conf, 0, log, null, new MetricsSource("1"))) {<a name="line.337"></a>
 <span class="sourceLineNo">338</span>      entryStream.next();<a 
name="line.338"></a>
 <span class="sourceLineNo">339</span>      entryStream.next();<a 
name="line.339"></a>
 <span class="sourceLineNo">340</span>      entryStream.next();<a 
name="line.340"></a>
@@ -448,7 +448,7 @@
 <span class="sourceLineNo">440</span>    long size = 
log.getLogFileSizeIfBeingWritten(walQueue.peek()).getAsLong();<a 
name="line.440"></a>
 <span class="sourceLineNo">441</span>    AtomicLong fileLength = new 
AtomicLong(size - 1);<a name="line.441"></a>
 <span class="sourceLineNo">442</span>    try (WALEntryStream entryStream = new 
WALEntryStream(walQueue, fs, conf, 0,<a name="line.442"></a>
-<span class="sourceLineNo">443</span>        p -&gt; 
OptionalLong.of(fileLength.get()), new MetricsSource("1"))) {<a 
name="line.443"></a>
+<span class="sourceLineNo">443</span>        p -&gt; 
OptionalLong.of(fileLength.get()), null, new MetricsSource("1"))) {<a 
name="line.443"></a>
 <span class="sourceLineNo">444</span>      
assertTrue(entryStream.hasNext());<a name="line.444"></a>
 <span class="sourceLineNo">445</span>      
assertNotNull(entryStream.next());<a name="line.445"></a>
 <span class="sourceLineNo">446</span>      // can not get log 2<a 
name="line.446"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/bd10ee7c/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html
index 5197ea6..c994229 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html
@@ -156,7 +156,7 @@
 <span class="sourceLineNo">148</span>          log.rollWriter();<a 
name="line.148"></a>
 <span class="sourceLineNo">149</span><a name="line.149"></a>
 <span class="sourceLineNo">150</span>          try (WALEntryStream entryStream 
=<a name="line.150"></a>
-<span class="sourceLineNo">151</span>              new 
WALEntryStream(walQueue, fs, conf, 0, log, new MetricsSource("1"))) {<a 
name="line.151"></a>
+<span class="sourceLineNo">151</span>              new 
WALEntryStream(walQueue, fs, conf, 0, log, null, new MetricsSource("1"))) {<a 
name="line.151"></a>
 <span class="sourceLineNo">152</span>            int i = 0;<a 
name="line.152"></a>
 <span class="sourceLineNo">153</span>            while (entryStream.hasNext()) 
{<a name="line.153"></a>
 <span class="sourceLineNo">154</span>              
assertNotNull(entryStream.next());<a name="line.154"></a>
@@ -183,7 +183,7 @@
 <span class="sourceLineNo">175</span>    appendToLog();<a name="line.175"></a>
 <span class="sourceLineNo">176</span>    long oldPos;<a name="line.176"></a>
 <span class="sourceLineNo">177</span>    try (WALEntryStream entryStream =<a 
name="line.177"></a>
-<span class="sourceLineNo">178</span>        new WALEntryStream(walQueue, fs, 
conf, 0, log, new MetricsSource("1"))) {<a name="line.178"></a>
+<span class="sourceLineNo">178</span>        new WALEntryStream(walQueue, fs, 
conf, 0, log, null, new MetricsSource("1"))) {<a name="line.178"></a>
 <span class="sourceLineNo">179</span>      // There's one edit in the log, 
read it. Reading past it needs to throw exception<a name="line.179"></a>
 <span class="sourceLineNo">180</span>      
assertTrue(entryStream.hasNext());<a name="line.180"></a>
 <span class="sourceLineNo">181</span>      WAL.Entry entry = 
entryStream.next();<a name="line.181"></a>
@@ -201,7 +201,7 @@
 <span class="sourceLineNo">193</span>    appendToLog();<a name="line.193"></a>
 <span class="sourceLineNo">194</span><a name="line.194"></a>
 <span class="sourceLineNo">195</span>    try (WALEntryStream entryStream = new 
WALEntryStream(walQueue, fs, conf, oldPos,<a name="line.195"></a>
-<span class="sourceLineNo">196</span>        log, new MetricsSource("1"))) {<a 
name="line.196"></a>
+<span class="sourceLineNo">196</span>        log, null, new 
MetricsSource("1"))) {<a name="line.196"></a>
 <span class="sourceLineNo">197</span>      // Read the newly added entry, make 
sure we made progress<a name="line.197"></a>
 <span class="sourceLineNo">198</span>      WAL.Entry entry = 
entryStream.next();<a name="line.198"></a>
 <span class="sourceLineNo">199</span>      assertNotEquals(oldPos, 
entryStream.getPosition());<a name="line.199"></a>
@@ -215,7 +215,7 @@
 <span class="sourceLineNo">207</span>    appendToLog();<a name="line.207"></a>
 <span class="sourceLineNo">208</span><a name="line.208"></a>
 <span class="sourceLineNo">209</span>    try (WALEntryStream entryStream = new 
WALEntryStream(walQueue, fs, conf, oldPos,<a name="line.209"></a>
-<span class="sourceLineNo">210</span>        log, new MetricsSource("1"))) {<a 
name="line.210"></a>
+<span class="sourceLineNo">210</span>        log, null, new 
MetricsSource("1"))) {<a name="line.210"></a>
 <span class="sourceLineNo">211</span>      WAL.Entry entry = 
entryStream.next();<a name="line.211"></a>
 <span class="sourceLineNo">212</span>      assertNotEquals(oldPos, 
entryStream.getPosition());<a name="line.212"></a>
 <span class="sourceLineNo">213</span>      assertNotNull(entry);<a 
name="line.213"></a>
@@ -240,7 +240,7 @@
 <span class="sourceLineNo">232</span>    appendToLog("1");<a 
name="line.232"></a>
 <span class="sourceLineNo">233</span>    appendToLog("2");// 2<a 
name="line.233"></a>
 <span class="sourceLineNo">234</span>    try (WALEntryStream entryStream =<a 
name="line.234"></a>
-<span class="sourceLineNo">235</span>        new WALEntryStream(walQueue, fs, 
conf, 0, log, new MetricsSource("1"))) {<a name="line.235"></a>
+<span class="sourceLineNo">235</span>        new WALEntryStream(walQueue, fs, 
conf, 0, log, null, new MetricsSource("1"))) {<a name="line.235"></a>
 <span class="sourceLineNo">236</span>      assertEquals("1", 
getRow(entryStream.next()));<a name="line.236"></a>
 <span class="sourceLineNo">237</span><a name="line.237"></a>
 <span class="sourceLineNo">238</span>      appendToLog("3"); // 3 - comes in 
after reader opened<a name="line.238"></a>
@@ -265,7 +265,7 @@
 <span class="sourceLineNo">257</span>  public void 
testNewEntriesWhileStreaming() throws Exception {<a name="line.257"></a>
 <span class="sourceLineNo">258</span>    appendToLog("1");<a 
name="line.258"></a>
 <span class="sourceLineNo">259</span>    try (WALEntryStream entryStream =<a 
name="line.259"></a>
-<span class="sourceLineNo">260</span>        new WALEntryStream(walQueue, fs, 
conf, 0, log, new MetricsSource("1"))) {<a name="line.260"></a>
+<span class="sourceLineNo">260</span>        new WALEntryStream(walQueue, fs, 
conf, 0, log, null, new MetricsSource("1"))) {<a name="line.260"></a>
 <span class="sourceLineNo">261</span>      entryStream.next(); // we've hit 
the end of the stream at this point<a name="line.261"></a>
 <span class="sourceLineNo">262</span><a name="line.262"></a>
 <span class="sourceLineNo">263</span>      // some new entries come in while 
we're streaming<a name="line.263"></a>
@@ -288,7 +288,7 @@
 <span class="sourceLineNo">280</span>    long lastPosition = 0;<a 
name="line.280"></a>
 <span class="sourceLineNo">281</span>    appendToLog("1");<a 
name="line.281"></a>
 <span class="sourceLineNo">282</span>    try (WALEntryStream entryStream =<a 
name="line.282"></a>
-<span class="sourceLineNo">283</span>        new WALEntryStream(walQueue, fs, 
conf, 0, log, new MetricsSource("1"))) {<a name="line.283"></a>
+<span class="sourceLineNo">283</span>        new WALEntryStream(walQueue, fs, 
conf, 0, log, null, new MetricsSource("1"))) {<a name="line.283"></a>
 <span class="sourceLineNo">284</span>      entryStream.next(); // we've hit 
the end of the stream at this point<a name="line.284"></a>
 <span class="sourceLineNo">285</span>      appendToLog("2");<a 
name="line.285"></a>
 <span class="sourceLineNo">286</span>      appendToLog("3");<a 
name="line.286"></a>
@@ -296,7 +296,7 @@
 <span class="sourceLineNo">288</span>    }<a name="line.288"></a>
 <span class="sourceLineNo">289</span>    // next stream should picks up where 
we left off<a name="line.289"></a>
 <span class="sourceLineNo">290</span>    try (WALEntryStream entryStream =<a 
name="line.290"></a>
-<span class="sourceLineNo">291</span>        new WALEntryStream(walQueue, fs, 
conf, lastPosition, log, new MetricsSource("1"))) {<a name="line.291"></a>
+<span class="sourceLineNo">291</span>        new WALEntryStream(walQueue, fs, 
conf, lastPosition, log, null, new MetricsSource("1"))) {<a name="line.291"></a>
 <span class="sourceLineNo">292</span>      assertEquals("2", 
getRow(entryStream.next()));<a name="line.292"></a>
 <span class="sourceLineNo">293</span>      assertEquals("3", 
getRow(entryStream.next()));<a name="line.293"></a>
 <span class="sourceLineNo">294</span>      assertFalse(entryStream.hasNext()); 
// done<a name="line.294"></a>
@@ -314,13 +314,13 @@
 <span class="sourceLineNo">306</span>    appendEntriesToLog(3);<a 
name="line.306"></a>
 <span class="sourceLineNo">307</span>    // read only one element<a 
name="line.307"></a>
 <span class="sourceLineNo">308</span>    try (WALEntryStream entryStream = new 
WALEntryStream(walQueue, fs, conf, lastPosition,<a name="line.308"></a>
-<span class="sourceLineNo">309</span>        log, new MetricsSource("1"))) {<a 
name="line.309"></a>
+<span class="sourceLineNo">309</span>        log, null, new 
MetricsSource("1"))) {<a name="line.309"></a>
 <span class="sourceLineNo">310</span>      entryStream.next();<a 
name="line.310"></a>
 <span class="sourceLineNo">311</span>      lastPosition = 
entryStream.getPosition();<a name="line.311"></a>
 <span class="sourceLineNo">312</span>    }<a name="line.312"></a>
 <span class="sourceLineNo">313</span>    // there should still be two more 
entries from where we left off<a name="line.313"></a>
 <span class="sourceLineNo">314</span>    try (WALEntryStream entryStream =<a 
name="line.314"></a>
-<span class="sourceLineNo">315</span>        new WALEntryStream(walQueue, fs, 
conf, lastPosition, log, new MetricsSource("1"))) {<a name="line.315"></a>
+<span class="sourceLineNo">315</span>        new WALEntryStream(walQueue, fs, 
conf, lastPosition, log, null, new MetricsSource("1"))) {<a name="line.315"></a>
 <span class="sourceLineNo">316</span>      
assertNotNull(entryStream.next());<a name="line.316"></a>
 <span class="sourceLineNo">317</span>      
assertNotNull(entryStream.next());<a name="line.317"></a>
 <span class="sourceLineNo">318</span>      
assertFalse(entryStream.hasNext());<a name="line.318"></a>
@@ -331,7 +331,7 @@
 <span class="sourceLineNo">323</span>  @Test<a name="line.323"></a>
 <span class="sourceLineNo">324</span>  public void testEmptyStream() throws 
Exception {<a name="line.324"></a>
 <span class="sourceLineNo">325</span>    try (WALEntryStream entryStream =<a 
name="line.325"></a>
-<span class="sourceLineNo">326</span>        new WALEntryStream(walQueue, fs, 
conf, 0, log, new MetricsSource("1"))) {<a name="line.326"></a>
+<span class="sourceLineNo">326</span>        new WALEntryStream(walQueue, fs, 
conf, 0, log, null, new MetricsSource("1"))) {<a name="line.326"></a>
 <span class="sourceLineNo">327</span>      
assertFalse(entryStream.hasNext());<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>
@@ -342,7 +342,7 @@
 <span class="sourceLineNo">334</span>    // get ending position<a 
name="line.334"></a>
 <span class="sourceLineNo">335</span>    long position;<a name="line.335"></a>
 <span class="sourceLineNo">336</span>    try (WALEntryStream entryStream =<a 
name="line.336"></a>
-<span class="sourceLineNo">337</span>        new WALEntryStream(walQueue, fs, 
conf, 0, log, new MetricsSource("1"))) {<a name="line.337"></a>
+<span class="sourceLineNo">337</span>        new WALEntryStream(walQueue, fs, 
conf, 0, log, null, new MetricsSource("1"))) {<a name="line.337"></a>
 <span class="sourceLineNo">338</span>      entryStream.next();<a 
name="line.338"></a>
 <span class="sourceLineNo">339</span>      entryStream.next();<a 
name="line.339"></a>
 <span class="sourceLineNo">340</span>      entryStream.next();<a 
name="line.340"></a>
@@ -448,7 +448,7 @@
 <span class="sourceLineNo">440</span>    long size = 
log.getLogFileSizeIfBeingWritten(walQueue.peek()).getAsLong();<a 
name="line.440"></a>
 <span class="sourceLineNo">441</span>    AtomicLong fileLength = new 
AtomicLong(size - 1);<a name="line.441"></a>
 <span class="sourceLineNo">442</span>    try (WALEntryStream entryStream = new 
WALEntryStream(walQueue, fs, conf, 0,<a name="line.442"></a>
-<span class="sourceLineNo">443</span>        p -&gt; 
OptionalLong.of(fileLength.get()), new MetricsSource("1"))) {<a 
name="line.443"></a>
+<span class="sourceLineNo">443</span>        p -&gt; 
OptionalLong.of(fileLength.get()), null, new MetricsSource("1"))) {<a 
name="line.443"></a>
 <span class="sourceLineNo">444</span>      
assertTrue(entryStream.hasNext());<a name="line.444"></a>
 <span class="sourceLineNo">445</span>      
assertNotNull(entryStream.next());<a name="line.445"></a>
 <span class="sourceLineNo">446</span>      // can not get log 2<a 
name="line.446"></a>

Reply via email to