http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fd35fe02/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSource.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSource.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSource.html
index 9cbcea4..c2e0da8 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSource.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSource.html
@@ -28,189 +28,156 @@
 <span class="sourceLineNo">020</span>import java.io.IOException;<a 
name="line.20"></a>
 <span class="sourceLineNo">021</span>import java.util.List;<a 
name="line.21"></a>
 <span class="sourceLineNo">022</span>import java.util.UUID;<a 
name="line.22"></a>
-<span class="sourceLineNo">023</span>import 
java.util.concurrent.BlockingQueue;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import 
java.util.concurrent.PriorityBlockingQueue;<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.Server;<a 
name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.ServerName;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.replication.ReplicationPeer;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.replication.ReplicationQueueStorage;<a 
name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.util.FSUtils;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.util.Threads;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.wal.AbstractFSWALProvider;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.slf4j.Logger;<a 
name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.slf4j.LoggerFactory;<a 
name="line.38"></a>
-<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span>/**<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * Class that handles the recovered 
source of a replication stream, which is transfered from<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * another dead region server. This will 
be closed when all logs are pushed to peer cluster.<a name="line.42"></a>
-<span class="sourceLineNo">043</span> */<a name="line.43"></a>
-<span class="sourceLineNo">044</span>@InterfaceAudience.Private<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>public class RecoveredReplicationSource 
extends ReplicationSource {<a name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span>  private static final Logger LOG = 
LoggerFactory.getLogger(RecoveredReplicationSource.class);<a name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>  private String actualPeerId;<a 
name="line.49"></a>
-<span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span>  @Override<a name="line.51"></a>
-<span class="sourceLineNo">052</span>  public void init(Configuration conf, 
FileSystem fs, ReplicationSourceManager manager,<a name="line.52"></a>
-<span class="sourceLineNo">053</span>      ReplicationQueueStorage 
queueStorage, ReplicationPeer replicationPeer, Server server,<a 
name="line.53"></a>
-<span class="sourceLineNo">054</span>      String peerClusterZnode, UUID 
clusterId, WALFileLengthProvider walFileLengthProvider,<a name="line.54"></a>
-<span class="sourceLineNo">055</span>      MetricsSource metrics) throws 
IOException {<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    super.init(conf, fs, manager, 
queueStorage, replicationPeer, server, peerClusterZnode,<a name="line.56"></a>
-<span class="sourceLineNo">057</span>      clusterId, walFileLengthProvider, 
metrics);<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    this.actualPeerId = 
this.replicationQueueInfo.getPeerId();<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  }<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span>  @Override<a name="line.61"></a>
-<span class="sourceLineNo">062</span>  protected 
RecoveredReplicationSourceShipper createNewShipper(String walGroupId,<a 
name="line.62"></a>
-<span class="sourceLineNo">063</span>      PriorityBlockingQueue&lt;Path&gt; 
queue) {<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    return new 
RecoveredReplicationSourceShipper(conf, walGroupId, queue, this, 
queueStorage);<a name="line.64"></a>
-<span class="sourceLineNo">065</span>  }<a name="line.65"></a>
-<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span>  private void 
handleEmptyWALEntryBatch0(ReplicationSourceWALReader reader,<a 
name="line.67"></a>
-<span class="sourceLineNo">068</span>      BlockingQueue&lt;WALEntryBatch&gt; 
entryBatchQueue, Path currentPath) throws InterruptedException {<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span>    LOG.trace("Didn't read any new 
entries from WAL");<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    // we're done with queue recovery, 
shut ourself down<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    reader.setReaderRunning(false);<a 
name="line.71"></a>
-<span class="sourceLineNo">072</span>    // shuts down shipper thread 
immediately<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    entryBatchQueue.put(new 
WALEntryBatch(0, currentPath));<a name="line.73"></a>
-<span class="sourceLineNo">074</span>  }<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span>  @Override<a name="line.76"></a>
-<span class="sourceLineNo">077</span>  protected ReplicationSourceWALReader 
createNewWALReader(String walGroupId,<a name="line.77"></a>
-<span class="sourceLineNo">078</span>      PriorityBlockingQueue&lt;Path&gt; 
queue, long startPosition) {<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    if 
(replicationPeer.getPeerConfig().isSerial()) {<a name="line.79"></a>
-<span class="sourceLineNo">080</span>      return new 
SerialReplicationSourceWALReader(fs, conf, queue, startPosition, 
walEntryFilter,<a name="line.80"></a>
-<span class="sourceLineNo">081</span>        this) {<a name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span>        @Override<a name="line.83"></a>
-<span class="sourceLineNo">084</span>        protected void 
handleEmptyWALEntryBatch(Path currentPath) throws InterruptedException {<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>          handleEmptyWALEntryBatch0(this, 
entryBatchQueue, currentPath);<a name="line.85"></a>
-<span class="sourceLineNo">086</span>        }<a name="line.86"></a>
-<span class="sourceLineNo">087</span>      };<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    } else {<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      return new 
ReplicationSourceWALReader(fs, conf, queue, startPosition, walEntryFilter, 
this) {<a name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span>        @Override<a name="line.91"></a>
-<span class="sourceLineNo">092</span>        protected void 
handleEmptyWALEntryBatch(Path currentPath) throws InterruptedException {<a 
name="line.92"></a>
-<span class="sourceLineNo">093</span>          handleEmptyWALEntryBatch0(this, 
entryBatchQueue, currentPath);<a name="line.93"></a>
-<span class="sourceLineNo">094</span>        }<a name="line.94"></a>
-<span class="sourceLineNo">095</span>      };<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    }<a name="line.96"></a>
-<span class="sourceLineNo">097</span>  }<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span>  public void 
locateRecoveredPaths(PriorityBlockingQueue&lt;Path&gt; queue) throws 
IOException {<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    boolean hasPathChanged = false;<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>    PriorityBlockingQueue&lt;Path&gt; 
newPaths =<a name="line.101"></a>
-<span class="sourceLineNo">102</span>        new 
PriorityBlockingQueue&lt;Path&gt;(queueSizePerGroup, new LogsComparator());<a 
name="line.102"></a>
-<span class="sourceLineNo">103</span>    pathsLoop: for (Path path : queue) 
{<a name="line.103"></a>
-<span class="sourceLineNo">104</span>      if (fs.exists(path)) { // still in 
same location, don't need to do anything<a name="line.104"></a>
-<span class="sourceLineNo">105</span>        newPaths.add(path);<a 
name="line.105"></a>
-<span class="sourceLineNo">106</span>        continue;<a name="line.106"></a>
-<span class="sourceLineNo">107</span>      }<a name="line.107"></a>
-<span class="sourceLineNo">108</span>      // Path changed - try to find the 
right path.<a name="line.108"></a>
-<span class="sourceLineNo">109</span>      hasPathChanged = true;<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>      if (server instanceof 
ReplicationSyncUp.DummyServer) {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>        // In the case of 
disaster/recovery, HMaster may be shutdown/crashed before flush data<a 
name="line.111"></a>
-<span class="sourceLineNo">112</span>        // from .logs to .oldlogs. Loop 
into .logs folders and check whether a match exists<a name="line.112"></a>
-<span class="sourceLineNo">113</span>        Path newPath = 
getReplSyncUpPath(path);<a name="line.113"></a>
-<span class="sourceLineNo">114</span>        newPaths.add(newPath);<a 
name="line.114"></a>
-<span class="sourceLineNo">115</span>        continue;<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      } else {<a name="line.116"></a>
-<span class="sourceLineNo">117</span>        // See if Path exists in the dead 
RS folder (there could be a chain of failures<a name="line.117"></a>
-<span class="sourceLineNo">118</span>        // to look at)<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>        List&lt;ServerName&gt; 
deadRegionServers = this.replicationQueueInfo.getDeadRegionServers();<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>        LOG.info("NB dead servers : " + 
deadRegionServers.size());<a name="line.120"></a>
-<span class="sourceLineNo">121</span>        final Path walDir = 
FSUtils.getWALRootDir(conf);<a name="line.121"></a>
-<span class="sourceLineNo">122</span>        for (ServerName curDeadServerName 
: deadRegionServers) {<a name="line.122"></a>
-<span class="sourceLineNo">123</span>          final Path deadRsDirectory =<a 
name="line.123"></a>
-<span class="sourceLineNo">124</span>              new Path(walDir, 
AbstractFSWALProvider.getWALDirectoryName(curDeadServerName<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>                  .getServerName()));<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span>          Path[] locs = new Path[] { new 
Path(deadRsDirectory, path.getName()), new Path(<a name="line.126"></a>
-<span class="sourceLineNo">127</span>              
deadRsDirectory.suffix(AbstractFSWALProvider.SPLITTING_EXT), path.getName()) 
};<a name="line.127"></a>
-<span class="sourceLineNo">128</span>          for (Path possibleLogLocation : 
locs) {<a name="line.128"></a>
-<span class="sourceLineNo">129</span>            LOG.info("Possible location " 
+ possibleLogLocation.toUri().toString());<a name="line.129"></a>
-<span class="sourceLineNo">130</span>            if 
(manager.getFs().exists(possibleLogLocation)) {<a name="line.130"></a>
-<span class="sourceLineNo">131</span>              // We found the right new 
location<a name="line.131"></a>
-<span class="sourceLineNo">132</span>              LOG.info("Log " + path + " 
still exists at " + possibleLogLocation);<a name="line.132"></a>
-<span class="sourceLineNo">133</span>              
newPaths.add(possibleLogLocation);<a name="line.133"></a>
-<span class="sourceLineNo">134</span>              continue pathsLoop;<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>            }<a name="line.135"></a>
-<span class="sourceLineNo">136</span>          }<a name="line.136"></a>
-<span class="sourceLineNo">137</span>        }<a name="line.137"></a>
-<span class="sourceLineNo">138</span>        // didn't find a new location<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>        LOG.error(<a name="line.139"></a>
-<span class="sourceLineNo">140</span>          String.format("WAL Path %s 
doesn't exist and couldn't find its new location", path));<a 
name="line.140"></a>
-<span class="sourceLineNo">141</span>        newPaths.add(path);<a 
name="line.141"></a>
-<span class="sourceLineNo">142</span>      }<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    }<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span>    if (hasPathChanged) {<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span>      if (newPaths.size() != 
queue.size()) { // this shouldn't happen<a name="line.146"></a>
-<span class="sourceLineNo">147</span>        LOG.error("Recovery queue size is 
incorrect");<a name="line.147"></a>
-<span class="sourceLineNo">148</span>        throw new IOException("Recovery 
queue size error");<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      }<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      // put the correct locations in the 
queue<a name="line.150"></a>
-<span class="sourceLineNo">151</span>      // since this is a recovered queue 
with no new incoming logs,<a name="line.151"></a>
-<span class="sourceLineNo">152</span>      // there shouldn't be any 
concurrency issues<a name="line.152"></a>
-<span class="sourceLineNo">153</span>      queue.clear();<a 
name="line.153"></a>
-<span class="sourceLineNo">154</span>      for (Path path : newPaths) {<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span>        queue.add(path);<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>      }<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    }<a name="line.157"></a>
-<span class="sourceLineNo">158</span>  }<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span>  // N.B. the ReplicationSyncUp tool sets 
the manager.getWALDir to the root of the wal<a name="line.160"></a>
-<span class="sourceLineNo">161</span>  // area rather than to the wal area for 
a particular region server.<a name="line.161"></a>
-<span class="sourceLineNo">162</span>  private Path getReplSyncUpPath(Path 
path) throws IOException {<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    FileStatus[] rss = 
fs.listStatus(manager.getLogDir());<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    for (FileStatus rs : rss) {<a 
name="line.164"></a>
-<span class="sourceLineNo">165</span>      Path p = rs.getPath();<a 
name="line.165"></a>
-<span class="sourceLineNo">166</span>      FileStatus[] logs = 
fs.listStatus(p);<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      for (FileStatus log : logs) {<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span>        p = new Path(p, 
log.getPath().getName());<a name="line.168"></a>
-<span class="sourceLineNo">169</span>        if 
(p.getName().equals(path.getName())) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span>          LOG.info("Log " + p.getName() + 
" found at " + p);<a name="line.170"></a>
-<span class="sourceLineNo">171</span>          return p;<a name="line.171"></a>
-<span class="sourceLineNo">172</span>        }<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      }<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    }<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    LOG.error("Didn't find path for: " + 
path.getName());<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    return path;<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>  void tryFinish() {<a 
name="line.179"></a>
-<span class="sourceLineNo">180</span>    // use synchronize to make sure one 
last thread will clean the queue<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    synchronized (workerThreads) {<a 
name="line.181"></a>
-<span class="sourceLineNo">182</span>      Threads.sleep(100);// wait a short 
while for other worker thread to fully exit<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      boolean allTasksDone = 
workerThreads.values().stream().allMatch(w -&gt; w.isFinished());<a 
name="line.183"></a>
-<span class="sourceLineNo">184</span>      if (allTasksDone) {<a 
name="line.184"></a>
-<span class="sourceLineNo">185</span>        
manager.removeRecoveredSource(this);<a name="line.185"></a>
-<span class="sourceLineNo">186</span>        LOG.info("Finished recovering 
queue {} with the following stats: {}", queueId, getStats());<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>  }<a name="line.189"></a>
-<span class="sourceLineNo">190</span><a name="line.190"></a>
-<span class="sourceLineNo">191</span>  @Override<a name="line.191"></a>
-<span class="sourceLineNo">192</span>  public String getPeerId() {<a 
name="line.192"></a>
-<span class="sourceLineNo">193</span>    return this.actualPeerId;<a 
name="line.193"></a>
-<span class="sourceLineNo">194</span>  }<a name="line.194"></a>
-<span class="sourceLineNo">195</span><a name="line.195"></a>
-<span class="sourceLineNo">196</span>  @Override<a name="line.196"></a>
-<span class="sourceLineNo">197</span>  public ServerName 
getServerWALsBelongTo() {<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    return 
this.replicationQueueInfo.getDeadRegionServers().get(0);<a name="line.198"></a>
-<span class="sourceLineNo">199</span>  }<a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span>  @Override<a name="line.201"></a>
-<span class="sourceLineNo">202</span>  public boolean isRecovered() {<a 
name="line.202"></a>
-<span class="sourceLineNo">203</span>    return true;<a name="line.203"></a>
-<span class="sourceLineNo">204</span>  }<a name="line.204"></a>
-<span class="sourceLineNo">205</span>}<a name="line.205"></a>
+<span class="sourceLineNo">023</span>import 
java.util.concurrent.PriorityBlockingQueue;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.fs.FileStatus;<a 
name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.fs.FileSystem;<a 
name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.fs.Path;<a 
name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.Server;<a 
name="line.28"></a>
+<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.ServerName;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.replication.ReplicationPeer;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.replication.ReplicationQueueStorage;<a 
name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.util.FSUtils;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.util.Threads;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.wal.AbstractFSWALProvider;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.slf4j.Logger;<a 
name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.slf4j.LoggerFactory;<a 
name="line.37"></a>
+<span class="sourceLineNo">038</span><a name="line.38"></a>
+<span class="sourceLineNo">039</span>/**<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * Class that handles the recovered 
source of a replication stream, which is transfered from<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * another dead region server. This will 
be closed when all logs are pushed to peer cluster.<a name="line.41"></a>
+<span class="sourceLineNo">042</span> */<a name="line.42"></a>
+<span class="sourceLineNo">043</span>@InterfaceAudience.Private<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span>public class RecoveredReplicationSource 
extends ReplicationSource {<a name="line.44"></a>
+<span class="sourceLineNo">045</span><a name="line.45"></a>
+<span class="sourceLineNo">046</span>  private static final Logger LOG = 
LoggerFactory.getLogger(RecoveredReplicationSource.class);<a name="line.46"></a>
+<span class="sourceLineNo">047</span><a name="line.47"></a>
+<span class="sourceLineNo">048</span>  private String actualPeerId;<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">050</span>  @Override<a name="line.50"></a>
+<span class="sourceLineNo">051</span>  public void init(Configuration conf, 
FileSystem fs, ReplicationSourceManager manager,<a name="line.51"></a>
+<span class="sourceLineNo">052</span>      ReplicationQueueStorage 
queueStorage, ReplicationPeer replicationPeer, Server server,<a 
name="line.52"></a>
+<span class="sourceLineNo">053</span>      String peerClusterZnode, UUID 
clusterId, WALFileLengthProvider walFileLengthProvider,<a name="line.53"></a>
+<span class="sourceLineNo">054</span>      MetricsSource metrics) throws 
IOException {<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    super.init(conf, fs, manager, 
queueStorage, replicationPeer, server, peerClusterZnode,<a name="line.55"></a>
+<span class="sourceLineNo">056</span>      clusterId, walFileLengthProvider, 
metrics);<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    this.actualPeerId = 
this.replicationQueueInfo.getPeerId();<a name="line.57"></a>
+<span class="sourceLineNo">058</span>  }<a name="line.58"></a>
+<span class="sourceLineNo">059</span><a name="line.59"></a>
+<span class="sourceLineNo">060</span>  @Override<a name="line.60"></a>
+<span class="sourceLineNo">061</span>  protected 
RecoveredReplicationSourceShipper createNewShipper(String walGroupId,<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>      PriorityBlockingQueue&lt;Path&gt; 
queue) {<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    return new 
RecoveredReplicationSourceShipper(conf, walGroupId, queue, this, 
queueStorage);<a name="line.63"></a>
+<span class="sourceLineNo">064</span>  }<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span>  public void 
locateRecoveredPaths(PriorityBlockingQueue&lt;Path&gt; queue) throws 
IOException {<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    boolean hasPathChanged = false;<a 
name="line.67"></a>
+<span class="sourceLineNo">068</span>    PriorityBlockingQueue&lt;Path&gt; 
newPaths =<a name="line.68"></a>
+<span class="sourceLineNo">069</span>        new 
PriorityBlockingQueue&lt;Path&gt;(queueSizePerGroup, new LogsComparator());<a 
name="line.69"></a>
+<span class="sourceLineNo">070</span>    pathsLoop: for (Path path : queue) 
{<a name="line.70"></a>
+<span class="sourceLineNo">071</span>      if (fs.exists(path)) { // still in 
same location, don't need to do anything<a name="line.71"></a>
+<span class="sourceLineNo">072</span>        newPaths.add(path);<a 
name="line.72"></a>
+<span class="sourceLineNo">073</span>        continue;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>      }<a name="line.74"></a>
+<span class="sourceLineNo">075</span>      // Path changed - try to find the 
right path.<a name="line.75"></a>
+<span class="sourceLineNo">076</span>      hasPathChanged = true;<a 
name="line.76"></a>
+<span class="sourceLineNo">077</span>      if (server instanceof 
ReplicationSyncUp.DummyServer) {<a name="line.77"></a>
+<span class="sourceLineNo">078</span>        // In the case of 
disaster/recovery, HMaster may be shutdown/crashed before flush data<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>        // from .logs to .oldlogs. Loop 
into .logs folders and check whether a match exists<a name="line.79"></a>
+<span class="sourceLineNo">080</span>        Path newPath = 
getReplSyncUpPath(path);<a name="line.80"></a>
+<span class="sourceLineNo">081</span>        newPaths.add(newPath);<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>        continue;<a name="line.82"></a>
+<span class="sourceLineNo">083</span>      } else {<a name="line.83"></a>
+<span class="sourceLineNo">084</span>        // See if Path exists in the dead 
RS folder (there could be a chain of failures<a name="line.84"></a>
+<span class="sourceLineNo">085</span>        // to look at)<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>        List&lt;ServerName&gt; 
deadRegionServers = this.replicationQueueInfo.getDeadRegionServers();<a 
name="line.86"></a>
+<span class="sourceLineNo">087</span>        LOG.info("NB dead servers : " + 
deadRegionServers.size());<a name="line.87"></a>
+<span class="sourceLineNo">088</span>        final Path walDir = 
FSUtils.getWALRootDir(conf);<a name="line.88"></a>
+<span class="sourceLineNo">089</span>        for (ServerName curDeadServerName 
: deadRegionServers) {<a name="line.89"></a>
+<span class="sourceLineNo">090</span>          final Path deadRsDirectory =<a 
name="line.90"></a>
+<span class="sourceLineNo">091</span>              new Path(walDir, 
AbstractFSWALProvider.getWALDirectoryName(curDeadServerName<a 
name="line.91"></a>
+<span class="sourceLineNo">092</span>                  .getServerName()));<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>          Path[] locs = new Path[] { new 
Path(deadRsDirectory, path.getName()), new Path(<a name="line.93"></a>
+<span class="sourceLineNo">094</span>              
deadRsDirectory.suffix(AbstractFSWALProvider.SPLITTING_EXT), path.getName()) 
};<a name="line.94"></a>
+<span class="sourceLineNo">095</span>          for (Path possibleLogLocation : 
locs) {<a name="line.95"></a>
+<span class="sourceLineNo">096</span>            LOG.info("Possible location " 
+ possibleLogLocation.toUri().toString());<a name="line.96"></a>
+<span class="sourceLineNo">097</span>            if 
(manager.getFs().exists(possibleLogLocation)) {<a name="line.97"></a>
+<span class="sourceLineNo">098</span>              // We found the right new 
location<a name="line.98"></a>
+<span class="sourceLineNo">099</span>              LOG.info("Log " + path + " 
still exists at " + possibleLogLocation);<a name="line.99"></a>
+<span class="sourceLineNo">100</span>              
newPaths.add(possibleLogLocation);<a name="line.100"></a>
+<span class="sourceLineNo">101</span>              continue pathsLoop;<a 
name="line.101"></a>
+<span class="sourceLineNo">102</span>            }<a name="line.102"></a>
+<span class="sourceLineNo">103</span>          }<a name="line.103"></a>
+<span class="sourceLineNo">104</span>        }<a name="line.104"></a>
+<span class="sourceLineNo">105</span>        // didn't find a new location<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>        LOG.error(<a name="line.106"></a>
+<span class="sourceLineNo">107</span>          String.format("WAL Path %s 
doesn't exist and couldn't find its new location", path));<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>        newPaths.add(path);<a 
name="line.108"></a>
+<span class="sourceLineNo">109</span>      }<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    }<a name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span>    if (hasPathChanged) {<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>      if (newPaths.size() != 
queue.size()) { // this shouldn't happen<a name="line.113"></a>
+<span class="sourceLineNo">114</span>        LOG.error("Recovery queue size is 
incorrect");<a name="line.114"></a>
+<span class="sourceLineNo">115</span>        throw new IOException("Recovery 
queue size error");<a name="line.115"></a>
+<span class="sourceLineNo">116</span>      }<a name="line.116"></a>
+<span class="sourceLineNo">117</span>      // put the correct locations in the 
queue<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      // since this is a recovered queue 
with no new incoming logs,<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      // there shouldn't be any 
concurrency issues<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      queue.clear();<a 
name="line.120"></a>
+<span class="sourceLineNo">121</span>      for (Path path : newPaths) {<a 
name="line.121"></a>
+<span class="sourceLineNo">122</span>        queue.add(path);<a 
name="line.122"></a>
+<span class="sourceLineNo">123</span>      }<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><a name="line.126"></a>
+<span class="sourceLineNo">127</span>  // N.B. the ReplicationSyncUp tool sets 
the manager.getWALDir to the root of the wal<a name="line.127"></a>
+<span class="sourceLineNo">128</span>  // area rather than to the wal area for 
a particular region server.<a name="line.128"></a>
+<span class="sourceLineNo">129</span>  private Path getReplSyncUpPath(Path 
path) throws IOException {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    FileStatus[] rss = 
fs.listStatus(manager.getLogDir());<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    for (FileStatus rs : rss) {<a 
name="line.131"></a>
+<span class="sourceLineNo">132</span>      Path p = rs.getPath();<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>      FileStatus[] logs = 
fs.listStatus(p);<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      for (FileStatus log : logs) {<a 
name="line.134"></a>
+<span class="sourceLineNo">135</span>        p = new Path(p, 
log.getPath().getName());<a name="line.135"></a>
+<span class="sourceLineNo">136</span>        if 
(p.getName().equals(path.getName())) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>          LOG.info("Log " + p.getName() + 
" found at " + p);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>          return p;<a name="line.138"></a>
+<span class="sourceLineNo">139</span>        }<a name="line.139"></a>
+<span class="sourceLineNo">140</span>      }<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    }<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    LOG.error("Didn't find path for: " + 
path.getName());<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    return path;<a name="line.143"></a>
+<span class="sourceLineNo">144</span>  }<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span>  void tryFinish() {<a 
name="line.146"></a>
+<span class="sourceLineNo">147</span>    // use synchronize to make sure one 
last thread will clean the queue<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    synchronized (workerThreads) {<a 
name="line.148"></a>
+<span class="sourceLineNo">149</span>      Threads.sleep(100);// wait a short 
while for other worker thread to fully exit<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      boolean allTasksDone = 
workerThreads.values().stream().allMatch(w -&gt; w.isFinished());<a 
name="line.150"></a>
+<span class="sourceLineNo">151</span>      if (allTasksDone) {<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span>        
manager.removeRecoveredSource(this);<a name="line.152"></a>
+<span class="sourceLineNo">153</span>        LOG.info("Finished recovering 
queue {} with the following stats: {}", queueId, getStats());<a 
name="line.153"></a>
+<span class="sourceLineNo">154</span>      }<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    }<a name="line.155"></a>
+<span class="sourceLineNo">156</span>  }<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span>  @Override<a name="line.158"></a>
+<span class="sourceLineNo">159</span>  public String getPeerId() {<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>    return this.actualPeerId;<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>  }<a name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span>  @Override<a name="line.163"></a>
+<span class="sourceLineNo">164</span>  public ServerName 
getServerWALsBelongTo() {<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    return 
this.replicationQueueInfo.getDeadRegionServers().get(0);<a name="line.165"></a>
+<span class="sourceLineNo">166</span>  }<a name="line.166"></a>
+<span class="sourceLineNo">167</span><a name="line.167"></a>
+<span class="sourceLineNo">168</span>  @Override<a name="line.168"></a>
+<span class="sourceLineNo">169</span>  public boolean isRecovered() {<a 
name="line.169"></a>
+<span class="sourceLineNo">170</span>    return true;<a name="line.170"></a>
+<span class="sourceLineNo">171</span>  }<a name="line.171"></a>
+<span class="sourceLineNo">172</span>}<a name="line.172"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fd35fe02/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSourceShipper.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSourceShipper.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSourceShipper.html
index d0d2274..4656bff 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSourceShipper.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSourceShipper.html
@@ -56,69 +56,66 @@
 <span class="sourceLineNo">048</span>  }<a name="line.48"></a>
 <span class="sourceLineNo">049</span><a name="line.49"></a>
 <span class="sourceLineNo">050</span>  @Override<a name="line.50"></a>
-<span class="sourceLineNo">051</span>  protected void 
postShipEdits(WALEntryBatch entryBatch) {<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    if 
(entryBatch.getWalEntries().isEmpty()) {<a name="line.52"></a>
-<span class="sourceLineNo">053</span>      LOG.debug("Finished recovering 
queue for group " + walGroupId + " of peer "<a name="line.53"></a>
-<span class="sourceLineNo">054</span>          + source.getQueueId());<a 
name="line.54"></a>
-<span class="sourceLineNo">055</span>      
source.getSourceMetrics().incrCompletedRecoveryQueue();<a name="line.55"></a>
-<span class="sourceLineNo">056</span>      
setWorkerState(WorkerState.FINISHED);<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    }<a name="line.57"></a>
-<span class="sourceLineNo">058</span>  }<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>  @Override<a name="line.60"></a>
-<span class="sourceLineNo">061</span>  protected void postFinish() {<a 
name="line.61"></a>
-<span class="sourceLineNo">062</span>    source.tryFinish();<a 
name="line.62"></a>
-<span class="sourceLineNo">063</span>  }<a name="line.63"></a>
-<span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span>  @Override<a name="line.65"></a>
-<span class="sourceLineNo">066</span>  public long getStartPosition() {<a 
name="line.66"></a>
-<span class="sourceLineNo">067</span>    long startPosition = 
getRecoveredQueueStartPos();<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    int numRetries = 0;<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span>    while (numRetries &lt;= 
maxRetriesMultiplier) {<a name="line.69"></a>
-<span class="sourceLineNo">070</span>      try {<a name="line.70"></a>
-<span class="sourceLineNo">071</span>        
source.locateRecoveredPaths(queue);<a name="line.71"></a>
-<span class="sourceLineNo">072</span>        break;<a name="line.72"></a>
-<span class="sourceLineNo">073</span>      } catch (IOException e) {<a 
name="line.73"></a>
-<span class="sourceLineNo">074</span>        LOG.error("Error while locating 
recovered queue paths, attempt #" + numRetries);<a name="line.74"></a>
-<span class="sourceLineNo">075</span>        numRetries++;<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>    return startPosition;<a 
name="line.78"></a>
-<span class="sourceLineNo">079</span>  }<a name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span>  // If this is a recovered queue, the 
queue is already full and the first log<a name="line.81"></a>
-<span class="sourceLineNo">082</span>  // normally has a position (unless the 
RS failed between 2 logs)<a name="line.82"></a>
-<span class="sourceLineNo">083</span>  private long 
getRecoveredQueueStartPos() {<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    long startPosition = 0;<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>    String peerClusterZnode = 
source.getQueueId();<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    try {<a name="line.86"></a>
-<span class="sourceLineNo">087</span>      startPosition = 
this.replicationQueues.getWALPosition(source.getServerWALsBelongTo(),<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>        peerClusterZnode, 
this.queue.peek().getName());<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      if (LOG.isTraceEnabled()) {<a 
name="line.89"></a>
-<span class="sourceLineNo">090</span>        LOG.trace("Recovered queue 
started with log " + this.queue.peek() + " at position " +<a name="line.90"></a>
-<span class="sourceLineNo">091</span>          startPosition);<a 
name="line.91"></a>
-<span class="sourceLineNo">092</span>      }<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    } catch (ReplicationException e) {<a 
name="line.93"></a>
-<span class="sourceLineNo">094</span>      terminate("Couldn't get the 
position of this recovered queue " + peerClusterZnode, e);<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    }<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    return startPosition;<a 
name="line.96"></a>
-<span class="sourceLineNo">097</span>  }<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span>  private void terminate(String reason, 
Exception cause) {<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    if (cause == null) {<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>      LOG.info("Closing worker for wal 
group " + this.walGroupId + " because: " + reason);<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span>    } else {<a name="line.103"></a>
-<span class="sourceLineNo">104</span>      LOG.error("Closing worker for wal 
group " + this.walGroupId<a name="line.104"></a>
-<span class="sourceLineNo">105</span>          + " because an error occurred: 
" + reason, cause);<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    }<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    entryReader.interrupt();<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>    Threads.shutdown(entryReader, 
sleepForRetries);<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    this.interrupt();<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>    Threads.shutdown(this, 
sleepForRetries);<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    LOG.info("ReplicationSourceWorker " + 
this.getName() + " terminated");<a name="line.111"></a>
-<span class="sourceLineNo">112</span>  }<a name="line.112"></a>
-<span class="sourceLineNo">113</span>}<a name="line.113"></a>
+<span class="sourceLineNo">051</span>  protected void noMoreData() {<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>    LOG.debug("Finished recovering queue 
for group {} of peer {}", walGroupId, source.getQueueId());<a 
name="line.52"></a>
+<span class="sourceLineNo">053</span>    
source.getSourceMetrics().incrCompletedRecoveryQueue();<a name="line.53"></a>
+<span class="sourceLineNo">054</span>    
setWorkerState(WorkerState.FINISHED);<a name="line.54"></a>
+<span class="sourceLineNo">055</span>  }<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span>  @Override<a name="line.57"></a>
+<span class="sourceLineNo">058</span>  protected void postFinish() {<a 
name="line.58"></a>
+<span class="sourceLineNo">059</span>    source.tryFinish();<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>  @Override<a name="line.62"></a>
+<span class="sourceLineNo">063</span>  long getStartPosition() {<a 
name="line.63"></a>
+<span class="sourceLineNo">064</span>    long startPosition = 
getRecoveredQueueStartPos();<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    int numRetries = 0;<a 
name="line.65"></a>
+<span class="sourceLineNo">066</span>    while (numRetries &lt;= 
maxRetriesMultiplier) {<a name="line.66"></a>
+<span class="sourceLineNo">067</span>      try {<a name="line.67"></a>
+<span class="sourceLineNo">068</span>        
source.locateRecoveredPaths(queue);<a name="line.68"></a>
+<span class="sourceLineNo">069</span>        break;<a name="line.69"></a>
+<span class="sourceLineNo">070</span>      } catch (IOException e) {<a 
name="line.70"></a>
+<span class="sourceLineNo">071</span>        LOG.error("Error while locating 
recovered queue paths, attempt #" + numRetries);<a name="line.71"></a>
+<span class="sourceLineNo">072</span>        numRetries++;<a 
name="line.72"></a>
+<span class="sourceLineNo">073</span>      }<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    }<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    return startPosition;<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>  // If this is a recovered queue, the 
queue is already full and the first log<a name="line.78"></a>
+<span class="sourceLineNo">079</span>  // normally has a position (unless the 
RS failed between 2 logs)<a name="line.79"></a>
+<span class="sourceLineNo">080</span>  private long 
getRecoveredQueueStartPos() {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    long startPosition = 0;<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>    String peerClusterZnode = 
source.getQueueId();<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    try {<a name="line.83"></a>
+<span class="sourceLineNo">084</span>      startPosition = 
this.replicationQueues.getWALPosition(source.getServerWALsBelongTo(),<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span>        peerClusterZnode, 
this.queue.peek().getName());<a name="line.85"></a>
+<span class="sourceLineNo">086</span>      if (LOG.isTraceEnabled()) {<a 
name="line.86"></a>
+<span class="sourceLineNo">087</span>        LOG.trace("Recovered queue 
started with log " + this.queue.peek() + " at position " +<a name="line.87"></a>
+<span class="sourceLineNo">088</span>          startPosition);<a 
name="line.88"></a>
+<span class="sourceLineNo">089</span>      }<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    } catch (ReplicationException e) {<a 
name="line.90"></a>
+<span class="sourceLineNo">091</span>      terminate("Couldn't get the 
position of this recovered queue " + peerClusterZnode, e);<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    }<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    return startPosition;<a 
name="line.93"></a>
+<span class="sourceLineNo">094</span>  }<a name="line.94"></a>
+<span class="sourceLineNo">095</span><a name="line.95"></a>
+<span class="sourceLineNo">096</span>  private void terminate(String reason, 
Exception cause) {<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    if (cause == null) {<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>      LOG.info("Closing worker for wal 
group " + this.walGroupId + " because: " + reason);<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span>    } else {<a name="line.100"></a>
+<span class="sourceLineNo">101</span>      LOG.error("Closing worker for wal 
group " + this.walGroupId<a name="line.101"></a>
+<span class="sourceLineNo">102</span>          + " because an error occurred: 
" + reason, cause);<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    }<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    entryReader.interrupt();<a 
name="line.104"></a>
+<span class="sourceLineNo">105</span>    Threads.shutdown(entryReader, 
sleepForRetries);<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    this.interrupt();<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span>    Threads.shutdown(this, 
sleepForRetries);<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    LOG.info("ReplicationSourceWorker " + 
this.getName() + " terminated");<a name="line.108"></a>
+<span class="sourceLineNo">109</span>  }<a name="line.109"></a>
+<span class="sourceLineNo">110</span>}<a name="line.110"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fd35fe02/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.LogsComparator.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.LogsComparator.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.LogsComparator.html
index 182e566..4eb9011 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.LogsComparator.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.LogsComparator.html
@@ -323,7 +323,7 @@
 <span class="sourceLineNo">315</span>    return new 
ReplicationSourceShipper(conf, walGroupId, queue, this);<a name="line.315"></a>
 <span class="sourceLineNo">316</span>  }<a name="line.316"></a>
 <span class="sourceLineNo">317</span><a name="line.317"></a>
-<span class="sourceLineNo">318</span>  protected ReplicationSourceWALReader 
createNewWALReader(String walGroupId,<a name="line.318"></a>
+<span class="sourceLineNo">318</span>  private ReplicationSourceWALReader 
createNewWALReader(String walGroupId,<a name="line.318"></a>
 <span class="sourceLineNo">319</span>      PriorityBlockingQueue&lt;Path&gt; 
queue, long startPosition) {<a name="line.319"></a>
 <span class="sourceLineNo">320</span>    return 
replicationPeer.getPeerConfig().isSerial()<a name="line.320"></a>
 <span class="sourceLineNo">321</span>      ? new 
SerialReplicationSourceWALReader(fs, conf, queue, startPosition, 
walEntryFilter, this)<a name="line.321"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fd35fe02/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.html
index 182e566..4eb9011 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.html
@@ -323,7 +323,7 @@
 <span class="sourceLineNo">315</span>    return new 
ReplicationSourceShipper(conf, walGroupId, queue, this);<a name="line.315"></a>
 <span class="sourceLineNo">316</span>  }<a name="line.316"></a>
 <span class="sourceLineNo">317</span><a name="line.317"></a>
-<span class="sourceLineNo">318</span>  protected ReplicationSourceWALReader 
createNewWALReader(String walGroupId,<a name="line.318"></a>
+<span class="sourceLineNo">318</span>  private ReplicationSourceWALReader 
createNewWALReader(String walGroupId,<a name="line.318"></a>
 <span class="sourceLineNo">319</span>      PriorityBlockingQueue&lt;Path&gt; 
queue, long startPosition) {<a name="line.319"></a>
 <span class="sourceLineNo">320</span>    return 
replicationPeer.getPeerConfig().isSerial()<a name="line.320"></a>
 <span class="sourceLineNo">321</span>      ? new 
SerialReplicationSourceWALReader(fs, conf, queue, startPosition, 
walEntryFilter, this)<a name="line.321"></a>

Reply via email to