http://git-wip-us.apache.org/repos/asf/hbase-site/blob/6b5143ed/devapidocs/src-html/org/apache/hadoop/hbase/mob/compactions/PartitionedMobCompactor.DelPartitionComparator.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/mob/compactions/PartitionedMobCompactor.DelPartitionComparator.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/mob/compactions/PartitionedMobCompactor.DelPartitionComparator.html
index 79ff168..d8869c3 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/mob/compactions/PartitionedMobCompactor.DelPartitionComparator.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/mob/compactions/PartitionedMobCompactor.DelPartitionComparator.html
@@ -923,26 +923,23 @@
 <span class="sourceLineNo">915</span><a name="line.915"></a>
 <span class="sourceLineNo">916</span>  private FileStatus 
getLinkedFileStatus(HFileLink link) throws IOException {<a name="line.916"></a>
 <span class="sourceLineNo">917</span>    Path[] locations = 
link.getLocations();<a name="line.917"></a>
-<span class="sourceLineNo">918</span>    for (Path location : locations) {<a 
name="line.918"></a>
-<span class="sourceLineNo">919</span>      FileStatus file = 
getFileStatus(location);<a name="line.919"></a>
-<span class="sourceLineNo">920</span>      if (file != null) {<a 
name="line.920"></a>
-<span class="sourceLineNo">921</span>        return file;<a 
name="line.921"></a>
-<span class="sourceLineNo">922</span>      }<a name="line.922"></a>
-<span class="sourceLineNo">923</span>    }<a name="line.923"></a>
-<span class="sourceLineNo">924</span>    return null;<a name="line.924"></a>
-<span class="sourceLineNo">925</span>  }<a name="line.925"></a>
-<span class="sourceLineNo">926</span><a name="line.926"></a>
-<span class="sourceLineNo">927</span>  private FileStatus getFileStatus(Path 
path) throws IOException {<a name="line.927"></a>
-<span class="sourceLineNo">928</span>    try {<a name="line.928"></a>
-<span class="sourceLineNo">929</span>      if (path != null) {<a 
name="line.929"></a>
-<span class="sourceLineNo">930</span>        return fs.getFileStatus(path);<a 
name="line.930"></a>
-<span class="sourceLineNo">931</span>      }<a name="line.931"></a>
-<span class="sourceLineNo">932</span>    } catch (FileNotFoundException e) {<a 
name="line.932"></a>
-<span class="sourceLineNo">933</span>      LOG.warn("The file " + path + " can 
not be found", e);<a name="line.933"></a>
-<span class="sourceLineNo">934</span>    }<a name="line.934"></a>
-<span class="sourceLineNo">935</span>    return null;<a name="line.935"></a>
-<span class="sourceLineNo">936</span>  }<a name="line.936"></a>
-<span class="sourceLineNo">937</span>}<a name="line.937"></a>
+<span class="sourceLineNo">918</span>    FileStatus file;<a 
name="line.918"></a>
+<span class="sourceLineNo">919</span>    for (Path location : locations) {<a 
name="line.919"></a>
+<span class="sourceLineNo">920</span><a name="line.920"></a>
+<span class="sourceLineNo">921</span>      if (location != null) {<a 
name="line.921"></a>
+<span class="sourceLineNo">922</span>        try {<a name="line.922"></a>
+<span class="sourceLineNo">923</span>          file = 
fs.getFileStatus(location);<a name="line.923"></a>
+<span class="sourceLineNo">924</span>          if (file != null) {<a 
name="line.924"></a>
+<span class="sourceLineNo">925</span>            return file;<a 
name="line.925"></a>
+<span class="sourceLineNo">926</span>          }<a name="line.926"></a>
+<span class="sourceLineNo">927</span>        }  catch (FileNotFoundException 
e) {<a name="line.927"></a>
+<span class="sourceLineNo">928</span>        }<a name="line.928"></a>
+<span class="sourceLineNo">929</span>      }<a name="line.929"></a>
+<span class="sourceLineNo">930</span>    }<a name="line.930"></a>
+<span class="sourceLineNo">931</span>    LOG.warn("The file " + link + " links 
to can not be found");<a name="line.931"></a>
+<span class="sourceLineNo">932</span>    return null;<a name="line.932"></a>
+<span class="sourceLineNo">933</span>  }<a name="line.933"></a>
+<span class="sourceLineNo">934</span>}<a name="line.934"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/6b5143ed/devapidocs/src-html/org/apache/hadoop/hbase/mob/compactions/PartitionedMobCompactor.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/mob/compactions/PartitionedMobCompactor.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/mob/compactions/PartitionedMobCompactor.html
index 79ff168..d8869c3 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/mob/compactions/PartitionedMobCompactor.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/mob/compactions/PartitionedMobCompactor.html
@@ -923,26 +923,23 @@
 <span class="sourceLineNo">915</span><a name="line.915"></a>
 <span class="sourceLineNo">916</span>  private FileStatus 
getLinkedFileStatus(HFileLink link) throws IOException {<a name="line.916"></a>
 <span class="sourceLineNo">917</span>    Path[] locations = 
link.getLocations();<a name="line.917"></a>
-<span class="sourceLineNo">918</span>    for (Path location : locations) {<a 
name="line.918"></a>
-<span class="sourceLineNo">919</span>      FileStatus file = 
getFileStatus(location);<a name="line.919"></a>
-<span class="sourceLineNo">920</span>      if (file != null) {<a 
name="line.920"></a>
-<span class="sourceLineNo">921</span>        return file;<a 
name="line.921"></a>
-<span class="sourceLineNo">922</span>      }<a name="line.922"></a>
-<span class="sourceLineNo">923</span>    }<a name="line.923"></a>
-<span class="sourceLineNo">924</span>    return null;<a name="line.924"></a>
-<span class="sourceLineNo">925</span>  }<a name="line.925"></a>
-<span class="sourceLineNo">926</span><a name="line.926"></a>
-<span class="sourceLineNo">927</span>  private FileStatus getFileStatus(Path 
path) throws IOException {<a name="line.927"></a>
-<span class="sourceLineNo">928</span>    try {<a name="line.928"></a>
-<span class="sourceLineNo">929</span>      if (path != null) {<a 
name="line.929"></a>
-<span class="sourceLineNo">930</span>        return fs.getFileStatus(path);<a 
name="line.930"></a>
-<span class="sourceLineNo">931</span>      }<a name="line.931"></a>
-<span class="sourceLineNo">932</span>    } catch (FileNotFoundException e) {<a 
name="line.932"></a>
-<span class="sourceLineNo">933</span>      LOG.warn("The file " + path + " can 
not be found", e);<a name="line.933"></a>
-<span class="sourceLineNo">934</span>    }<a name="line.934"></a>
-<span class="sourceLineNo">935</span>    return null;<a name="line.935"></a>
-<span class="sourceLineNo">936</span>  }<a name="line.936"></a>
-<span class="sourceLineNo">937</span>}<a name="line.937"></a>
+<span class="sourceLineNo">918</span>    FileStatus file;<a 
name="line.918"></a>
+<span class="sourceLineNo">919</span>    for (Path location : locations) {<a 
name="line.919"></a>
+<span class="sourceLineNo">920</span><a name="line.920"></a>
+<span class="sourceLineNo">921</span>      if (location != null) {<a 
name="line.921"></a>
+<span class="sourceLineNo">922</span>        try {<a name="line.922"></a>
+<span class="sourceLineNo">923</span>          file = 
fs.getFileStatus(location);<a name="line.923"></a>
+<span class="sourceLineNo">924</span>          if (file != null) {<a 
name="line.924"></a>
+<span class="sourceLineNo">925</span>            return file;<a 
name="line.925"></a>
+<span class="sourceLineNo">926</span>          }<a name="line.926"></a>
+<span class="sourceLineNo">927</span>        }  catch (FileNotFoundException 
e) {<a name="line.927"></a>
+<span class="sourceLineNo">928</span>        }<a name="line.928"></a>
+<span class="sourceLineNo">929</span>      }<a name="line.929"></a>
+<span class="sourceLineNo">930</span>    }<a name="line.930"></a>
+<span class="sourceLineNo">931</span>    LOG.warn("The file " + link + " links 
to can not be found");<a name="line.931"></a>
+<span class="sourceLineNo">932</span>    return null;<a name="line.932"></a>
+<span class="sourceLineNo">933</span>  }<a name="line.933"></a>
+<span class="sourceLineNo">934</span>}<a name="line.934"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/6b5143ed/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrContext.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrContext.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrContext.html
index 9a2e602..2daec52 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrContext.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrContext.html
@@ -52,8 +52,8 @@
 <span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.44"></a>
 <span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.wal.WAL.Entry;<a name="line.45"></a>
 <span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span>import 
com.google.protobuf.CodedInputStream;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import 
com.google.protobuf.InvalidProtocolBufferException;<a name="line.48"></a>
+<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedInputStream;<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;<a
 name="line.48"></a>
 <span class="sourceLineNo">049</span><a name="line.49"></a>
 <span class="sourceLineNo">050</span>/**<a name="line.50"></a>
 <span class="sourceLineNo">051</span> * A Protobuf based WAL has the following 
structure:<a name="line.51"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/6b5143ed/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrResult.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrResult.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrResult.html
index 9a2e602..2daec52 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrResult.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrResult.html
@@ -52,8 +52,8 @@
 <span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.44"></a>
 <span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.wal.WAL.Entry;<a name="line.45"></a>
 <span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span>import 
com.google.protobuf.CodedInputStream;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import 
com.google.protobuf.InvalidProtocolBufferException;<a name="line.48"></a>
+<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedInputStream;<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;<a
 name="line.48"></a>
 <span class="sourceLineNo">049</span><a name="line.49"></a>
 <span class="sourceLineNo">050</span>/**<a name="line.50"></a>
 <span class="sourceLineNo">051</span> * A Protobuf based WAL has the following 
structure:<a name="line.51"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/6b5143ed/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.html
index 9a2e602..2daec52 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.html
@@ -52,8 +52,8 @@
 <span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.44"></a>
 <span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.wal.WAL.Entry;<a name="line.45"></a>
 <span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span>import 
com.google.protobuf.CodedInputStream;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import 
com.google.protobuf.InvalidProtocolBufferException;<a name="line.48"></a>
+<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedInputStream;<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException;<a
 name="line.48"></a>
 <span class="sourceLineNo">049</span><a name="line.49"></a>
 <span class="sourceLineNo">050</span>/**<a name="line.50"></a>
 <span class="sourceLineNo">051</span> * A Protobuf based WAL has the following 
structure:<a name="line.51"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/6b5143ed/devapidocs/src-html/org/apache/hadoop/hbase/replication/BaseReplicationEndpoint.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/replication/BaseReplicationEndpoint.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/replication/BaseReplicationEndpoint.html
index 482a25d..f7fc1c7 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/replication/BaseReplicationEndpoint.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/replication/BaseReplicationEndpoint.html
@@ -32,92 +32,98 @@
 <span class="sourceLineNo">024</span>import org.apache.commons.logging.Log;<a 
name="line.24"></a>
 <span class="sourceLineNo">025</span>import 
org.apache.commons.logging.LogFactory;<a name="line.25"></a>
 <span class="sourceLineNo">026</span>import 
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<a 
name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.util.concurrent.AbstractService;<a
 name="line.29"></a>
+<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<a 
name="line.27"></a>
+<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.util.concurrent.AbstractService;<a
 name="line.28"></a>
+<span class="sourceLineNo">029</span><a name="line.29"></a>
 <span class="sourceLineNo">030</span>/**<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * A Base implementation for {@link 
ReplicationEndpoint}s. Users should consider extending this<a 
name="line.31"></a>
-<span class="sourceLineNo">032</span> * class rather than implementing {@link 
ReplicationEndpoint} directly for better backwards<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * compatibility.<a name="line.33"></a>
-<span class="sourceLineNo">034</span> */<a name="line.34"></a>
-<span 
class="sourceLineNo">035</span>@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.REPLICATION)<a
 name="line.35"></a>
-<span class="sourceLineNo">036</span>public abstract class 
BaseReplicationEndpoint extends AbstractService<a name="line.36"></a>
-<span class="sourceLineNo">037</span>  implements ReplicationEndpoint {<a 
name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span>  private static final Log LOG = 
LogFactory.getLog(BaseReplicationEndpoint.class);<a name="line.39"></a>
-<span class="sourceLineNo">040</span>  public static final String 
REPLICATION_WALENTRYFILTER_CONFIG_KEY<a name="line.40"></a>
-<span class="sourceLineNo">041</span>      = 
"hbase.replication.source.custom.walentryfilters";<a name="line.41"></a>
-<span class="sourceLineNo">042</span>  protected Context ctx;<a 
name="line.42"></a>
-<span class="sourceLineNo">043</span><a name="line.43"></a>
-<span class="sourceLineNo">044</span>  @Override<a name="line.44"></a>
-<span class="sourceLineNo">045</span>  public void init(Context context) 
throws IOException {<a name="line.45"></a>
-<span class="sourceLineNo">046</span>    this.ctx = context;<a 
name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>    if (this.ctx != null){<a 
name="line.48"></a>
-<span class="sourceLineNo">049</span>      ReplicationPeer peer = 
this.ctx.getReplicationPeer();<a name="line.49"></a>
-<span class="sourceLineNo">050</span>      if (peer != null){<a 
name="line.50"></a>
-<span class="sourceLineNo">051</span>        
peer.trackPeerConfigChanges(this);<a name="line.51"></a>
-<span class="sourceLineNo">052</span>      } else {<a name="line.52"></a>
-<span class="sourceLineNo">053</span>        LOG.warn("Not tracking 
replication peer config changes for Peer Id " + this.ctx.getPeerId() +<a 
name="line.53"></a>
-<span class="sourceLineNo">054</span>            " because there's no such 
peer");<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>  }<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span>  @Override<a name="line.59"></a>
-<span class="sourceLineNo">060</span>  /**<a name="line.60"></a>
-<span class="sourceLineNo">061</span>   * No-op implementation for subclasses 
to override if they wish to execute logic if their config changes<a 
name="line.61"></a>
-<span class="sourceLineNo">062</span>   */<a name="line.62"></a>
-<span class="sourceLineNo">063</span>  public void 
peerConfigUpdated(ReplicationPeerConfig rpc){<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><a name="line.66"></a>
-<span class="sourceLineNo">067</span>  /** Returns a default set of filters 
*/<a name="line.67"></a>
-<span class="sourceLineNo">068</span>  @Override<a name="line.68"></a>
-<span class="sourceLineNo">069</span>  public WALEntryFilter 
getWALEntryfilter() {<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    ArrayList&lt;WALEntryFilter&gt; 
filters = Lists.newArrayList();<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    WALEntryFilter scopeFilter = 
getScopeWALEntryFilter();<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    if (scopeFilter != null) {<a 
name="line.72"></a>
-<span class="sourceLineNo">073</span>      filters.add(scopeFilter);<a 
name="line.73"></a>
-<span class="sourceLineNo">074</span>    }<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    WALEntryFilter tableCfFilter = 
getNamespaceTableCfWALEntryFilter();<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    if (tableCfFilter != null) {<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span>      filters.add(tableCfFilter);<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span>    }<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    if (ctx != null &amp;&amp; 
ctx.getPeerConfig() != null) {<a name="line.79"></a>
-<span class="sourceLineNo">080</span>      String filterNameCSV = 
ctx.getPeerConfig().getConfiguration().get(REPLICATION_WALENTRYFILTER_CONFIG_KEY);<a
 name="line.80"></a>
-<span class="sourceLineNo">081</span>      if (filterNameCSV != null 
&amp;&amp; !filterNameCSV.isEmpty()) {<a name="line.81"></a>
-<span class="sourceLineNo">082</span>        String[] filterNames = 
filterNameCSV.split(",");<a name="line.82"></a>
-<span class="sourceLineNo">083</span>        for (String filterName : 
filterNames) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span>          try {<a name="line.84"></a>
-<span class="sourceLineNo">085</span>            Class&lt;?&gt; clazz = 
Class.forName(filterName);<a name="line.85"></a>
-<span class="sourceLineNo">086</span>            filters.add((WALEntryFilter) 
clazz.newInstance());<a name="line.86"></a>
-<span class="sourceLineNo">087</span>          } catch (Exception e) {<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>            LOG.error("Unable to create 
WALEntryFilter " + filterName, e);<a name="line.88"></a>
-<span class="sourceLineNo">089</span>          }<a name="line.89"></a>
-<span class="sourceLineNo">090</span>        }<a name="line.90"></a>
-<span class="sourceLineNo">091</span>      }<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    }<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    return filters.isEmpty() ? null : new 
ChainWALEntryFilter(filters);<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>  /** Returns a WALEntryFilter for 
checking the scope. Subclasses can<a name="line.96"></a>
-<span class="sourceLineNo">097</span>   * return null if they don't want this 
filter */<a name="line.97"></a>
-<span class="sourceLineNo">098</span>  protected WALEntryFilter 
getScopeWALEntryFilter() {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    return new ScopeWALEntryFilter();<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>  }<a name="line.100"></a>
-<span class="sourceLineNo">101</span><a name="line.101"></a>
-<span class="sourceLineNo">102</span>  /** Returns a WALEntryFilter for 
checking replication per table and CF. Subclasses can<a name="line.102"></a>
-<span class="sourceLineNo">103</span>   * return null if they don't want this 
filter */<a name="line.103"></a>
-<span class="sourceLineNo">104</span>  protected WALEntryFilter 
getNamespaceTableCfWALEntryFilter() {<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    return new 
NamespaceTableCfWALEntryFilter(ctx.getReplicationPeer());<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  }<a name="line.106"></a>
-<span class="sourceLineNo">107</span><a name="line.107"></a>
-<span class="sourceLineNo">108</span>  @Override<a name="line.108"></a>
-<span class="sourceLineNo">109</span>  public boolean 
canReplicateToSameCluster() {<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    return false;<a name="line.110"></a>
-<span class="sourceLineNo">111</span>  }<a name="line.111"></a>
-<span class="sourceLineNo">112</span>}<a name="line.112"></a>
+<span class="sourceLineNo">031</span> * A Base implementation for {@link 
ReplicationEndpoint}s. For internal use. Uses our internal<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * Guava.<a name="line.32"></a>
+<span class="sourceLineNo">033</span> */<a name="line.33"></a>
+<span class="sourceLineNo">034</span>// This class has been made 
InterfaceAudience.Private in 2.0.0. It used to be<a name="line.34"></a>
+<span class="sourceLineNo">035</span>// LimitedPrivate. See HBASE-15982.<a 
name="line.35"></a>
+<span class="sourceLineNo">036</span>@InterfaceAudience.Private<a 
name="line.36"></a>
+<span class="sourceLineNo">037</span>public abstract class 
BaseReplicationEndpoint extends AbstractService<a name="line.37"></a>
+<span class="sourceLineNo">038</span>  implements ReplicationEndpoint {<a 
name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span>  private static final Log LOG = 
LogFactory.getLog(BaseReplicationEndpoint.class);<a name="line.40"></a>
+<span class="sourceLineNo">041</span>  public static final String 
REPLICATION_WALENTRYFILTER_CONFIG_KEY<a name="line.41"></a>
+<span class="sourceLineNo">042</span>      = 
"hbase.replication.source.custom.walentryfilters";<a name="line.42"></a>
+<span class="sourceLineNo">043</span>  protected Context ctx;<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span>  @Override<a name="line.45"></a>
+<span class="sourceLineNo">046</span>  public void init(Context context) 
throws IOException {<a name="line.46"></a>
+<span class="sourceLineNo">047</span>    this.ctx = context;<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span>    if (this.ctx != null){<a 
name="line.49"></a>
+<span class="sourceLineNo">050</span>      ReplicationPeer peer = 
this.ctx.getReplicationPeer();<a name="line.50"></a>
+<span class="sourceLineNo">051</span>      if (peer != null){<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>        
peer.trackPeerConfigChanges(this);<a name="line.52"></a>
+<span class="sourceLineNo">053</span>      } else {<a name="line.53"></a>
+<span class="sourceLineNo">054</span>        LOG.warn("Not tracking 
replication peer config changes for Peer Id " + this.ctx.getPeerId() +<a 
name="line.54"></a>
+<span class="sourceLineNo">055</span>            " because there's no such 
peer");<a name="line.55"></a>
+<span class="sourceLineNo">056</span>      }<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>  /**<a name="line.61"></a>
+<span class="sourceLineNo">062</span>   * No-op implementation for subclasses 
to override if they wish to execute logic if their config changes<a 
name="line.62"></a>
+<span class="sourceLineNo">063</span>   */<a name="line.63"></a>
+<span class="sourceLineNo">064</span>  public void 
peerConfigUpdated(ReplicationPeerConfig rpc){<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><a name="line.67"></a>
+<span class="sourceLineNo">068</span>  /** Returns a default set of filters 
*/<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  @Override<a name="line.69"></a>
+<span class="sourceLineNo">070</span>  public WALEntryFilter 
getWALEntryfilter() {<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    ArrayList&lt;WALEntryFilter&gt; 
filters = Lists.newArrayList();<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    WALEntryFilter scopeFilter = 
getScopeWALEntryFilter();<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    if (scopeFilter != null) {<a 
name="line.73"></a>
+<span class="sourceLineNo">074</span>      filters.add(scopeFilter);<a 
name="line.74"></a>
+<span class="sourceLineNo">075</span>    }<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    WALEntryFilter tableCfFilter = 
getNamespaceTableCfWALEntryFilter();<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    if (tableCfFilter != null) {<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span>      filters.add(tableCfFilter);<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>    }<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    if (ctx != null &amp;&amp; 
ctx.getPeerConfig() != null) {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>      String filterNameCSV = 
ctx.getPeerConfig().getConfiguration().get(REPLICATION_WALENTRYFILTER_CONFIG_KEY);<a
 name="line.81"></a>
+<span class="sourceLineNo">082</span>      if (filterNameCSV != null 
&amp;&amp; !filterNameCSV.isEmpty()) {<a name="line.82"></a>
+<span class="sourceLineNo">083</span>        String[] filterNames = 
filterNameCSV.split(",");<a name="line.83"></a>
+<span class="sourceLineNo">084</span>        for (String filterName : 
filterNames) {<a name="line.84"></a>
+<span class="sourceLineNo">085</span>          try {<a name="line.85"></a>
+<span class="sourceLineNo">086</span>            Class&lt;?&gt; clazz = 
Class.forName(filterName);<a name="line.86"></a>
+<span class="sourceLineNo">087</span>            filters.add((WALEntryFilter) 
clazz.newInstance());<a name="line.87"></a>
+<span class="sourceLineNo">088</span>          } catch (Exception e) {<a 
name="line.88"></a>
+<span class="sourceLineNo">089</span>            LOG.error("Unable to create 
WALEntryFilter " + filterName, e);<a name="line.89"></a>
+<span class="sourceLineNo">090</span>          }<a name="line.90"></a>
+<span class="sourceLineNo">091</span>        }<a name="line.91"></a>
+<span class="sourceLineNo">092</span>      }<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    }<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    return filters.isEmpty() ? null : new 
ChainWALEntryFilter(filters);<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>  /** Returns a WALEntryFilter for 
checking the scope. Subclasses can<a name="line.97"></a>
+<span class="sourceLineNo">098</span>   * return null if they don't want this 
filter */<a name="line.98"></a>
+<span class="sourceLineNo">099</span>  protected WALEntryFilter 
getScopeWALEntryFilter() {<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    return new ScopeWALEntryFilter();<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>  }<a name="line.101"></a>
+<span class="sourceLineNo">102</span><a name="line.102"></a>
+<span class="sourceLineNo">103</span>  /** Returns a WALEntryFilter for 
checking replication per table and CF. Subclasses can<a name="line.103"></a>
+<span class="sourceLineNo">104</span>   * return null if they don't want this 
filter */<a name="line.104"></a>
+<span class="sourceLineNo">105</span>  protected WALEntryFilter 
getNamespaceTableCfWALEntryFilter() {<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    return new 
NamespaceTableCfWALEntryFilter(ctx.getReplicationPeer());<a name="line.106"></a>
+<span class="sourceLineNo">107</span>  }<a name="line.107"></a>
+<span class="sourceLineNo">108</span><a name="line.108"></a>
+<span class="sourceLineNo">109</span>  @Override<a name="line.109"></a>
+<span class="sourceLineNo">110</span>  public boolean 
canReplicateToSameCluster() {<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    return false;<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">114</span>  @Override<a name="line.114"></a>
+<span class="sourceLineNo">115</span>  public boolean isStarting() {<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span>    return state() == State.STARTING;<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>  }<a name="line.117"></a>
+<span class="sourceLineNo">118</span>}<a name="line.118"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/6b5143ed/devapidocs/src-html/org/apache/hadoop/hbase/replication/HBaseReplicationEndpoint.PeerRegionServerListener.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/replication/HBaseReplicationEndpoint.PeerRegionServerListener.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/replication/HBaseReplicationEndpoint.PeerRegionServerListener.html
index 12bdd86..2550293 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/replication/HBaseReplicationEndpoint.PeerRegionServerListener.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/replication/HBaseReplicationEndpoint.PeerRegionServerListener.html
@@ -87,151 +87,161 @@
 <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>  @Override<a name="line.81"></a>
-<span class="sourceLineNo">082</span>  protected void doStart() {<a 
name="line.82"></a>
-<span class="sourceLineNo">083</span>    try {<a name="line.83"></a>
-<span class="sourceLineNo">084</span>      reloadZkWatcher();<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>      notifyStarted();<a 
name="line.85"></a>
-<span class="sourceLineNo">086</span>    } catch (IOException e) {<a 
name="line.86"></a>
-<span class="sourceLineNo">087</span>      notifyFailed(e);<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>    }<a name="line.88"></a>
+<span class="sourceLineNo">082</span>  public void start() {<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span>    startAsync();<a name="line.83"></a>
+<span class="sourceLineNo">084</span>  }<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span>  @Override<a name="line.86"></a>
+<span class="sourceLineNo">087</span>  public void stop() {<a 
name="line.87"></a>
+<span class="sourceLineNo">088</span>    stopAsync();<a name="line.88"></a>
 <span class="sourceLineNo">089</span>  }<a name="line.89"></a>
 <span class="sourceLineNo">090</span><a name="line.90"></a>
 <span class="sourceLineNo">091</span>  @Override<a name="line.91"></a>
-<span class="sourceLineNo">092</span>  protected void doStop() {<a 
name="line.92"></a>
-<span class="sourceLineNo">093</span>    disconnect();<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    notifyStopped();<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>  @Override<a name="line.97"></a>
-<span class="sourceLineNo">098</span>  // Synchronize peer cluster connection 
attempts to avoid races and rate<a name="line.98"></a>
-<span class="sourceLineNo">099</span>  // limit connections when multiple 
replication sources try to connect to<a name="line.99"></a>
-<span class="sourceLineNo">100</span>  // the peer cluster. If the peer 
cluster is down we can get out of control<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  // over time.<a name="line.101"></a>
-<span class="sourceLineNo">102</span>  public synchronized UUID getPeerUUID() 
{<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    UUID peerUUID = null;<a 
name="line.103"></a>
-<span class="sourceLineNo">104</span>    try {<a name="line.104"></a>
-<span class="sourceLineNo">105</span>      peerUUID = 
ZKClusterId.getUUIDForCluster(zkw);<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    } catch (KeeperException ke) {<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>      reconnect(ke);<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>    }<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    return peerUUID;<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>  /**<a name="line.112"></a>
-<span class="sourceLineNo">113</span>   * Get the ZK connection to this peer<a 
name="line.113"></a>
-<span class="sourceLineNo">114</span>   * @return zk connection<a 
name="line.114"></a>
-<span class="sourceLineNo">115</span>   */<a name="line.115"></a>
-<span class="sourceLineNo">116</span>  protected ZooKeeperWatcher getZkw() {<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>    return zkw;<a name="line.117"></a>
-<span class="sourceLineNo">118</span>  }<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span>  /**<a name="line.120"></a>
-<span class="sourceLineNo">121</span>   * Closes the current ZKW (if not null) 
and creates a new one<a name="line.121"></a>
-<span class="sourceLineNo">122</span>   * @throws IOException If anything goes 
wrong connecting<a name="line.122"></a>
-<span class="sourceLineNo">123</span>   */<a name="line.123"></a>
-<span class="sourceLineNo">124</span>  void reloadZkWatcher() throws 
IOException {<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    if (zkw != null) zkw.close();<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span>    zkw = new 
ZooKeeperWatcher(ctx.getConfiguration(),<a name="line.126"></a>
-<span class="sourceLineNo">127</span>        "connection to cluster: " + 
ctx.getPeerId(), this);<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    getZkw().registerListener(new 
PeerRegionServerListener(this));<a name="line.128"></a>
-<span class="sourceLineNo">129</span>  }<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span>  @Override<a name="line.131"></a>
-<span class="sourceLineNo">132</span>  public void abort(String why, Throwable 
e) {<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    LOG.error("The 
HBaseReplicationEndpoint corresponding to peer " + ctx.getPeerId()<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span>        + " was aborted for the following 
reason(s):" + why, e);<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>  @Override<a name="line.137"></a>
-<span class="sourceLineNo">138</span>  public boolean isAborted() {<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>    // Currently this is never "Aborted", 
we just log when the abort method is called.<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    return false;<a name="line.140"></a>
-<span class="sourceLineNo">141</span>  }<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>   * Get the list of all the region 
servers from the specified peer<a name="line.144"></a>
-<span class="sourceLineNo">145</span>   * @param zkw zk connection to use<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span>   * @return list of region server 
addresses or an empty list if the slave is unavailable<a name="line.146"></a>
-<span class="sourceLineNo">147</span>   */<a name="line.147"></a>
-<span class="sourceLineNo">148</span>  protected static List&lt;ServerName&gt; 
fetchSlavesAddresses(ZooKeeperWatcher zkw)<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      throws KeeperException {<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>    List&lt;String&gt; children = 
ZKUtil.listChildrenAndWatchForNewChildren(zkw, zkw.znodePaths.rsZNode);<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span>    if (children == null) {<a 
name="line.151"></a>
-<span class="sourceLineNo">152</span>      return Collections.emptyList();<a 
name="line.152"></a>
-<span class="sourceLineNo">153</span>    }<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    List&lt;ServerName&gt; addresses = 
new ArrayList&lt;&gt;(children.size());<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    for (String child : children) {<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>      
addresses.add(ServerName.parseServerName(child));<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    }<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    return addresses;<a 
name="line.158"></a>
-<span class="sourceLineNo">159</span>  }<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span>  /**<a name="line.161"></a>
-<span class="sourceLineNo">162</span>   * Get a list of all the addresses of 
all the region servers<a name="line.162"></a>
-<span class="sourceLineNo">163</span>   * for this peer cluster<a 
name="line.163"></a>
-<span class="sourceLineNo">164</span>   * @return list of addresses<a 
name="line.164"></a>
-<span class="sourceLineNo">165</span>   */<a name="line.165"></a>
-<span class="sourceLineNo">166</span>  // Synchronize peer cluster connection 
attempts to avoid races and rate<a name="line.166"></a>
-<span class="sourceLineNo">167</span>  // limit connections when multiple 
replication sources try to connect to<a name="line.167"></a>
-<span class="sourceLineNo">168</span>  // the peer cluster. If the peer 
cluster is down we can get out of control<a name="line.168"></a>
-<span class="sourceLineNo">169</span>  // over time.<a name="line.169"></a>
-<span class="sourceLineNo">170</span>  public synchronized 
List&lt;ServerName&gt; getRegionServers() {<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    try {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      
setRegionServers(fetchSlavesAddresses(this.getZkw()));<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    } catch (KeeperException ke) {<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span>      if (LOG.isDebugEnabled()) {<a 
name="line.174"></a>
-<span class="sourceLineNo">175</span>        LOG.debug("Fetch slaves addresses 
failed", ke);<a name="line.175"></a>
-<span class="sourceLineNo">176</span>      }<a name="line.176"></a>
-<span class="sourceLineNo">177</span>      reconnect(ke);<a 
name="line.177"></a>
-<span class="sourceLineNo">178</span>    }<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    return regionServers;<a 
name="line.179"></a>
-<span class="sourceLineNo">180</span>  }<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span>  /**<a name="line.182"></a>
-<span class="sourceLineNo">183</span>   * Set the list of region servers for 
that peer<a name="line.183"></a>
-<span class="sourceLineNo">184</span>   * @param regionServers list of 
addresses for the region servers<a name="line.184"></a>
-<span class="sourceLineNo">185</span>   */<a name="line.185"></a>
-<span class="sourceLineNo">186</span>  public synchronized void 
setRegionServers(List&lt;ServerName&gt; regionServers) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    this.regionServers = regionServers;<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>    lastRegionServerUpdate = 
System.currentTimeMillis();<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>  /**<a name="line.191"></a>
-<span class="sourceLineNo">192</span>   * Get the timestamp at which the last 
change occurred to the list of region servers to replicate<a 
name="line.192"></a>
-<span class="sourceLineNo">193</span>   * to.<a name="line.193"></a>
-<span class="sourceLineNo">194</span>   * @return The System.currentTimeMillis 
at the last time the list of peer region servers changed.<a name="line.194"></a>
+<span class="sourceLineNo">092</span>  protected void doStart() {<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>    try {<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      reloadZkWatcher();<a 
name="line.94"></a>
+<span class="sourceLineNo">095</span>      notifyStarted();<a 
name="line.95"></a>
+<span class="sourceLineNo">096</span>    } catch (IOException e) {<a 
name="line.96"></a>
+<span class="sourceLineNo">097</span>      notifyFailed(e);<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>    }<a name="line.98"></a>
+<span class="sourceLineNo">099</span>  }<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span>  @Override<a name="line.101"></a>
+<span class="sourceLineNo">102</span>  protected void doStop() {<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>    disconnect();<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    notifyStopped();<a 
name="line.104"></a>
+<span class="sourceLineNo">105</span>  }<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span>  @Override<a name="line.107"></a>
+<span class="sourceLineNo">108</span>  // Synchronize peer cluster connection 
attempts to avoid races and rate<a name="line.108"></a>
+<span class="sourceLineNo">109</span>  // limit connections when multiple 
replication sources try to connect to<a name="line.109"></a>
+<span class="sourceLineNo">110</span>  // the peer cluster. If the peer 
cluster is down we can get out of control<a name="line.110"></a>
+<span class="sourceLineNo">111</span>  // over time.<a name="line.111"></a>
+<span class="sourceLineNo">112</span>  public synchronized UUID getPeerUUID() 
{<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    UUID peerUUID = null;<a 
name="line.113"></a>
+<span class="sourceLineNo">114</span>    try {<a name="line.114"></a>
+<span class="sourceLineNo">115</span>      peerUUID = 
ZKClusterId.getUUIDForCluster(zkw);<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    } catch (KeeperException ke) {<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>      reconnect(ke);<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>    }<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    return peerUUID;<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>  }<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span>  /**<a name="line.122"></a>
+<span class="sourceLineNo">123</span>   * Get the ZK connection to this peer<a 
name="line.123"></a>
+<span class="sourceLineNo">124</span>   * @return zk connection<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>   */<a name="line.125"></a>
+<span class="sourceLineNo">126</span>  protected ZooKeeperWatcher getZkw() {<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span>    return zkw;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>  }<a name="line.128"></a>
+<span class="sourceLineNo">129</span><a name="line.129"></a>
+<span class="sourceLineNo">130</span>  /**<a name="line.130"></a>
+<span class="sourceLineNo">131</span>   * Closes the current ZKW (if not null) 
and creates a new one<a name="line.131"></a>
+<span class="sourceLineNo">132</span>   * @throws IOException If anything goes 
wrong connecting<a name="line.132"></a>
+<span class="sourceLineNo">133</span>   */<a name="line.133"></a>
+<span class="sourceLineNo">134</span>  void reloadZkWatcher() throws 
IOException {<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    if (zkw != null) zkw.close();<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>    zkw = new 
ZooKeeperWatcher(ctx.getConfiguration(),<a name="line.136"></a>
+<span class="sourceLineNo">137</span>        "connection to cluster: " + 
ctx.getPeerId(), this);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    getZkw().registerListener(new 
PeerRegionServerListener(this));<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>  @Override<a name="line.141"></a>
+<span class="sourceLineNo">142</span>  public void abort(String why, Throwable 
e) {<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    LOG.error("The 
HBaseReplicationEndpoint corresponding to peer " + ctx.getPeerId()<a 
name="line.143"></a>
+<span class="sourceLineNo">144</span>        + " was aborted for the following 
reason(s):" + why, e);<a name="line.144"></a>
+<span class="sourceLineNo">145</span>  }<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span>  @Override<a name="line.147"></a>
+<span class="sourceLineNo">148</span>  public boolean isAborted() {<a 
name="line.148"></a>
+<span class="sourceLineNo">149</span>    // Currently this is never "Aborted", 
we just log when the abort method is called.<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    return false;<a name="line.150"></a>
+<span class="sourceLineNo">151</span>  }<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">154</span>   * Get the list of all the region 
servers from the specified peer<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   * @param zkw zk connection to use<a 
name="line.155"></a>
+<span class="sourceLineNo">156</span>   * @return list of region server 
addresses or an empty list if the slave is unavailable<a name="line.156"></a>
+<span class="sourceLineNo">157</span>   */<a name="line.157"></a>
+<span class="sourceLineNo">158</span>  protected static List&lt;ServerName&gt; 
fetchSlavesAddresses(ZooKeeperWatcher zkw)<a name="line.158"></a>
+<span class="sourceLineNo">159</span>      throws KeeperException {<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>    List&lt;String&gt; children = 
ZKUtil.listChildrenAndWatchForNewChildren(zkw, zkw.znodePaths.rsZNode);<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>    if (children == null) {<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>      return Collections.emptyList();<a 
name="line.162"></a>
+<span class="sourceLineNo">163</span>    }<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    List&lt;ServerName&gt; addresses = 
new ArrayList&lt;&gt;(children.size());<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    for (String child : children) {<a 
name="line.165"></a>
+<span class="sourceLineNo">166</span>      
addresses.add(ServerName.parseServerName(child));<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    }<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    return addresses;<a 
name="line.168"></a>
+<span class="sourceLineNo">169</span>  }<a name="line.169"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span>  /**<a name="line.171"></a>
+<span class="sourceLineNo">172</span>   * Get a list of all the addresses of 
all the region servers<a name="line.172"></a>
+<span class="sourceLineNo">173</span>   * for this peer cluster<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span>   * @return list of addresses<a 
name="line.174"></a>
+<span class="sourceLineNo">175</span>   */<a name="line.175"></a>
+<span class="sourceLineNo">176</span>  // Synchronize peer cluster connection 
attempts to avoid races and rate<a name="line.176"></a>
+<span class="sourceLineNo">177</span>  // limit connections when multiple 
replication sources try to connect to<a name="line.177"></a>
+<span class="sourceLineNo">178</span>  // the peer cluster. If the peer 
cluster is down we can get out of control<a name="line.178"></a>
+<span class="sourceLineNo">179</span>  // over time.<a name="line.179"></a>
+<span class="sourceLineNo">180</span>  public synchronized 
List&lt;ServerName&gt; getRegionServers() {<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    try {<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      
setRegionServers(fetchSlavesAddresses(this.getZkw()));<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    } catch (KeeperException ke) {<a 
name="line.183"></a>
+<span class="sourceLineNo">184</span>      if (LOG.isDebugEnabled()) {<a 
name="line.184"></a>
+<span class="sourceLineNo">185</span>        LOG.debug("Fetch slaves addresses 
failed", ke);<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      }<a name="line.186"></a>
+<span class="sourceLineNo">187</span>      reconnect(ke);<a 
name="line.187"></a>
+<span class="sourceLineNo">188</span>    }<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    return regionServers;<a 
name="line.189"></a>
+<span class="sourceLineNo">190</span>  }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span>  /**<a name="line.192"></a>
+<span class="sourceLineNo">193</span>   * Set the list of region servers for 
that peer<a name="line.193"></a>
+<span class="sourceLineNo">194</span>   * @param regionServers list of 
addresses for the region servers<a name="line.194"></a>
 <span class="sourceLineNo">195</span>   */<a name="line.195"></a>
-<span class="sourceLineNo">196</span>  public long getLastRegionServerUpdate() 
{<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    return lastRegionServerUpdate;<a 
name="line.197"></a>
-<span class="sourceLineNo">198</span>  }<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>   * Tracks changes to the list of region 
servers in a peer's cluster.<a name="line.201"></a>
-<span class="sourceLineNo">202</span>   */<a name="line.202"></a>
-<span class="sourceLineNo">203</span>  public static class 
PeerRegionServerListener extends ZooKeeperListener {<a name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span>    private final 
HBaseReplicationEndpoint replicationEndpoint;<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    private final String 
regionServerListNode;<a name="line.206"></a>
-<span class="sourceLineNo">207</span><a name="line.207"></a>
-<span class="sourceLineNo">208</span>    public 
PeerRegionServerListener(HBaseReplicationEndpoint replicationPeer) {<a 
name="line.208"></a>
-<span class="sourceLineNo">209</span>      super(replicationPeer.getZkw());<a 
name="line.209"></a>
-<span class="sourceLineNo">210</span>      this.replicationEndpoint = 
replicationPeer;<a name="line.210"></a>
-<span class="sourceLineNo">211</span>      this.regionServerListNode = 
replicationEndpoint.getZkw().znodePaths.rsZNode;<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    }<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span>    @Override<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    public synchronized void 
nodeChildrenChanged(String path) {<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      if 
(path.equals(regionServerListNode)) {<a name="line.216"></a>
-<span class="sourceLineNo">217</span>        try {<a name="line.217"></a>
-<span class="sourceLineNo">218</span>          LOG.info("Detected change to 
peer region servers, fetching updated list");<a name="line.218"></a>
-<span class="sourceLineNo">219</span>          
replicationEndpoint.setRegionServers(fetchSlavesAddresses(replicationEndpoint.getZkw()));<a
 name="line.219"></a>
-<span class="sourceLineNo">220</span>        } catch (KeeperException e) {<a 
name="line.220"></a>
-<span class="sourceLineNo">221</span>          LOG.error("Error reading slave 
addresses", e);<a name="line.221"></a>
-<span class="sourceLineNo">222</span>        }<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      }<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    }<a name="line.224"></a>
-<span class="sourceLineNo">225</span>  }<a name="line.225"></a>
-<span class="sourceLineNo">226</span>}<a name="line.226"></a>
+<span class="sourceLineNo">196</span>  public synchronized void 
setRegionServers(List&lt;ServerName&gt; regionServers) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    this.regionServers = regionServers;<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span>    lastRegionServerUpdate = 
System.currentTimeMillis();<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>  /**<a name="line.201"></a>
+<span class="sourceLineNo">202</span>   * Get the timestamp at which the last 
change occurred to the list of region servers to replicate<a 
name="line.202"></a>
+<span class="sourceLineNo">203</span>   * to.<a name="line.203"></a>
+<span class="sourceLineNo">204</span>   * @return The System.currentTimeMillis 
at the last time the list of peer region servers changed.<a name="line.204"></a>
+<span class="sourceLineNo">205</span>   */<a name="line.205"></a>
+<span class="sourceLineNo">206</span>  public long getLastRegionServerUpdate() 
{<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    return lastRegionServerUpdate;<a 
name="line.207"></a>
+<span class="sourceLineNo">208</span>  }<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span>  /**<a name="line.210"></a>
+<span class="sourceLineNo">211</span>   * Tracks changes to the list of region 
servers in a peer's cluster.<a name="line.211"></a>
+<span class="sourceLineNo">212</span>   */<a name="line.212"></a>
+<span class="sourceLineNo">213</span>  public static class 
PeerRegionServerListener extends ZooKeeperListener {<a name="line.213"></a>
+<span class="sourceLineNo">214</span><a name="line.214"></a>
+<span class="sourceLineNo">215</span>    private final 
HBaseReplicationEndpoint replicationEndpoint;<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    private final String 
regionServerListNode;<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span>    public 
PeerRegionServerListener(HBaseReplicationEndpoint replicationPeer) {<a 
name="line.218"></a>
+<span class="sourceLineNo">219</span>      super(replicationPeer.getZkw());<a 
name="line.219"></a>
+<span class="sourceLineNo">220</span>      this.replicationEndpoint = 
replicationPeer;<a name="line.220"></a>
+<span class="sourceLineNo">221</span>      this.regionServerListNode = 
replicationEndpoint.getZkw().znodePaths.rsZNode;<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    }<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span>    @Override<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    public synchronized void 
nodeChildrenChanged(String path) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span>      if 
(path.equals(regionServerListNode)) {<a name="line.226"></a>
+<span class="sourceLineNo">227</span>        try {<a name="line.227"></a>
+<span class="sourceLineNo">228</span>          LOG.info("Detected change to 
peer region servers, fetching updated list");<a name="line.228"></a>
+<span class="sourceLineNo">229</span>          
replicationEndpoint.setRegionServers(fetchSlavesAddresses(replicationEndpoint.getZkw()));<a
 name="line.229"></a>
+<span class="sourceLineNo">230</span>        } catch (KeeperException e) {<a 
name="line.230"></a>
+<span class="sourceLineNo">231</span>          LOG.error("Error reading slave 
addresses", e);<a name="line.231"></a>
+<span class="sourceLineNo">232</span>        }<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      }<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    }<a name="line.234"></a>
+<span class="sourceLineNo">235</span>  }<a name="line.235"></a>
+<span class="sourceLineNo">236</span>}<a name="line.236"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/6b5143ed/devapidocs/src-html/org/apache/hadoop/hbase/replication/HBaseReplicationEndpoint.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/replication/HBaseReplicationEndpoint.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/replication/HBaseReplicationEndpoint.html
index 12bdd86..2550293 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/replication/HBaseReplicationEndpoint.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/replication/HBaseReplicationEndpoint.html
@@ -87,151 +87,161 @@
 <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>  @Override<a name="line.81"></a>
-<span class="sourceLineNo">082</span>  protected void doStart() {<a 
name="line.82"></a>
-<span class="sourceLineNo">083</span>    try {<a name="line.83"></a>
-<span class="sourceLineNo">084</span>      reloadZkWatcher();<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>      notifyStarted();<a 
name="line.85"></a>
-<span class="sourceLineNo">086</span>    } catch (IOException e) {<a 
name="line.86"></a>
-<span class="sourceLineNo">087</span>      notifyFailed(e);<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>    }<a name="line.88"></a>
+<span class="sourceLineNo">082</span>  public void start() {<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span>    startAsync();<a name="line.83"></a>
+<span class="sourceLineNo">084</span>  }<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span>  @Override<a name="line.86"></a>
+<span class="sourceLineNo">087</span>  public void stop() {<a 
name="line.87"></a>
+<span class="sourceLineNo">088</span>    stopAsync();<a name="line.88"></a>
 <span class="sourceLineNo">089</span>  }<a name="line.89"></a>
 <span class="sourceLineNo">090</span><a name="line.90"></a>
 <span class="sourceLineNo">091</span>  @Override<a name="line.91"></a>
-<span class="sourceLineNo">092</span>  protected void doStop() {<a 
name="line.92"></a>
-<span class="sourceLineNo">093</span>    disconnect();<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    notifyStopped();<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>  @Override<a name="line.97"></a>
-<span class="sourceLineNo">098</span>  // Synchronize peer cluster connection 
attempts to avoid races and rate<a name="line.98"></a>
-<span class="sourceLineNo">099</span>  // limit connections when multiple 
replication sources try to connect to<a name="line.99"></a>
-<span class="sourceLineNo">100</span>  // the peer cluster. If the peer 
cluster is down we can get out of control<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  // over time.<a name="line.101"></a>
-<span class="sourceLineNo">102</span>  public synchronized UUID getPeerUUID() 
{<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    UUID peerUUID = null;<a 
name="line.103"></a>
-<span class="sourceLineNo">104</span>    try {<a name="line.104"></a>
-<span class="sourceLineNo">105</span>      peerUUID = 
ZKClusterId.getUUIDForCluster(zkw);<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    } catch (KeeperException ke) {<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>      reconnect(ke);<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>    }<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    return peerUUID;<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>  /**<a name="line.112"></a>
-<span class="sourceLineNo">113</span>   * Get the ZK connection to this peer<a 
name="line.113"></a>
-<span class="sourceLineNo">114</span>   * @return zk connection<a 
name="line.114"></a>
-<span class="sourceLineNo">115</span>   */<a name="line.115"></a>
-<span class="sourceLineNo">116</span>  protected ZooKeeperWatcher getZkw() {<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>    return zkw;<a name="line.117"></a>
-<span class="sourceLineNo">118</span>  }<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span>  /**<a name="line.120"></a>
-<span class="sourceLineNo">121</span>   * Closes the current ZKW (if not null) 
and creates a new one<a name="line.121"></a>
-<span class="sourceLineNo">122</span>   * @throws IOException If anything goes 
wrong connecting<a name="line.122"></a>
-<span class="sourceLineNo">123</span>   */<a name="line.123"></a>
-<span class="sourceLineNo">124</span>  void reloadZkWatcher() throws 
IOException {<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    if (zkw != null) zkw.close();<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span>    zkw = new 
ZooKeeperWatcher(ctx.getConfiguration(),<a name="line.126"></a>
-<span class="sourceLineNo">127</span>        "connection to cluster: " + 
ctx.getPeerId(), this);<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    getZkw().registerListener(new 
PeerRegionServerListener(this));<a name="line.128"></a>
-<span class="sourceLineNo">129</span>  }<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span>  @Override<a name="line.131"></a>
-<span class="sourceLineNo">132</span>  public void abort(String why, Throwable 
e) {<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    LOG.error("The 
HBaseReplicationEndpoint corresponding to peer " + ctx.getPeerId()<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span>        + " was aborted for the following 
reason(s):" + why, e);<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>  @Override<a name="line.137"></a>
-<span class="sourceLineNo">138</span>  public boolean isAborted() {<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>    // Currently this is never "Aborted", 
we just log when the abort method is called.<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    return false;<a name="line.140"></a>
-<span class="sourceLineNo">141</span>  }<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>   * Get the list of all the region 
servers from the specified peer<a name="line.144"></a>
-<span class="sourceLineNo">145</span>   * @param zkw zk connection to use<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span>   * @return list of region server 
addresses or an empty list if the slave is unavailable<a name="line.146"></a>
-<span class="sourceLineNo">147</span>   */<a name="line.147"></a>
-<span class="sourceLineNo">148</span>  protected static List&lt;ServerName&gt; 
fetchSlavesAddresses(ZooKeeperWatcher zkw)<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      throws KeeperException {<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>    List&lt;String&gt; children = 
ZKUtil.listChildrenAndWatchForNewChildren(zkw, zkw.znodePaths.rsZNode);<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span>    if (children == null) {<a 
name="line.151"></a>
-<span class="sourceLineNo">152</span>      return Collections.emptyList();<a 
name="line.152"></a>
-<span class="sourceLineNo">153</span>    }<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    List&lt;ServerName&gt; addresses = 
new ArrayList&lt;&gt;(children.size());<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    for (String child : children) {<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>      
addresses.add(ServerName.parseServerName(child));<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    }<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    return addresses;<a 
name="line.158"></a>
-<span class="sourceLineNo">159</span>  }<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span>  /**<a name="line.161"></a>
-<span class="sourceLineNo">162</span>   * Get a list of all the addresses of 
all the region servers<a name="line.162"></a>
-<span class="sourceLineNo">163</span>   * for this peer cluster<a 
name="line.163"></a>
-<span class="sourceLineNo">164</span>   * @return list of addresses<a 
name="line.164"></a>
-<span class="sourceLineNo">165</span>   */<a name="line.165"></a>
-<span class="sourceLineNo">166</span>  // Synchronize peer cluster connection 
attempts to avoid races and rate<a name="line.166"></a>
-<span class="sourceLineNo">167</span>  // limit connections when multiple 
replication sources try to connect to<a name="line.167"></a>
-<span class="sourceLineNo">168</span>  // the peer cluster. If the peer 
cluster is down we can get out of control<a name="line.168"></a>
-<span class="sourceLineNo">169</span>  // over time.<a name="line.169"></a>
-<span class="sourceLineNo">170</span>  public synchronized 
List&lt;ServerName&gt; getRegionServers() {<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    try {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      
setRegionServers(fetchSlavesAddresses(this.getZkw()));<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    } catch (KeeperException ke) {<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span>      if (LOG.isDebugEnabled()) {<a 
name="line.174"></a>
-<span class="sourceLineNo">175</span>        LOG.debug("Fetch slaves addresses 
failed", ke);<a name="line.175"></a>
-<span class="sourceLineNo">176</span>      }<a name="line.176"></a>
-<span class="sourceLineNo">177</span>      reconnect(ke);<a 
name="line.177"></a>
-<span class="sourceLineNo">178</span>    }<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    return regionServers;<a 
name="line.179"></a>
-<span class="sourceLineNo">180</span>  }<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span>  /**<a name="line.182"></a>
-<span class="sourceLineNo">183</span>   * Set the list of region servers for 
that peer<a name="line.183"></a>
-<span class="sourceLineNo">184</span>   * @param regionServers list of 
addresses for the region servers<a name="line.184"></a>
-<span class="sourceLineNo">185</span>   */<a name="line.185"></a>
-<span class="sourceLineNo">186</span>  public synchronized void 
setRegionServers(List&lt;ServerName&gt; regionServers) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    this.regionServers = regionServers;<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>    lastRegionServerUpdate = 
System.currentTimeMillis();<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>  /**<a name="line.191"></a>
-<span class="sourceLineNo">192</span>   * Get the timestamp at which the last 
change occurred to the list of region servers to replicate<a 
name="line.192"></a>
-<span class="sourceLineNo">193</span>   * to.<a name="line.193"></a>
-<span class="sourceLineNo">194</span>   * @return The System.currentTimeMillis 
at the last time the list of peer region servers changed.<a name="line.194"></a>
+<span class="sourceLineNo">092</span>  protected void doStart() {<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>    try {<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      reloadZkWatcher();<a 
name="line.94"></a>
+<span class="sourceLineNo">095</span>      notifyStarted();<a 
name="line.95"></a>
+<span class="sourceLineNo">096</span>    } catch (IOException e) {<a 
name="line.96"></a>
+<span class="sourceLineNo">097</span>      notifyFailed(e);<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>    }<a name="line.98"></a>
+<span class="sourceLineNo">099</span>  }<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span>  @Override<a name="line.101"></a>
+<span class="sourceLineNo">102</span>  protected void doStop() {<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>    disconnect();<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    notifyStopped();<a 
name="line.104"></a>
+<span class="sourceLineNo">105</span>  }<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span>  @Override<a name="line.107"></a>
+<span class="sourceLineNo">108</span>  // Synchronize peer cluster connection 
attempts to avoid races and rate<a name="line.108"></a>
+<span class="sourceLineNo">109</span>  // limit connections when multiple 
replication sources try to connect to<a name="line.109"></a>
+<span class="sourceLineNo">110</span>  // the peer cluster. If the peer 
cluster is down we can get out of control<a name="line.110"></a>
+<span class="sourceLineNo">111</span>  // over time.<a name="line.111"></a>
+<span class="sourceLineNo">112</span>  public synchronized UUID getPeerUUID() 
{<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    UUID peerUUID = null;<a 
name="line.113"></a>
+<span class="sourceLineNo">114</span>    try {<a name="line.114"></a>
+<span class="sourceLineNo">115</span>      peerUUID = 
ZKClusterId.getUUIDForCluster(zkw);<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    } catch (KeeperException ke) {<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>      reconnect(ke);<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>    }<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    return peerUUID;<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>  }<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span>  /**<a name="line.122"></a>
+<span class="sourceLineNo">123</span>   * Get the ZK connection to this peer<a 
name="line.123"></a>
+<span class="sourceLineNo">124</span>   * @return zk connection<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>   */<a name="line.125"></a>
+<span class="sourceLineNo">126</span>  protected ZooKeeperWatcher getZkw() {<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span>    return zkw;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>  }<a name="line.128"></a>
+<span class="sourceLineNo">129</span><a name="line.129"></a>
+<span class="sourceLineNo">130</span>  /**<a name="line.130"></a>
+<span class="sourceLineNo">131</span>   * Closes the current ZKW (if not null) 
and creates a new one<a name="line.131"></a>
+<span class="sourceLineNo">132</span>   * @throws IOException If anything goes 
wrong connecting<a name="line.132"></a>
+<span class="sourceLineNo">133</span>   */<a name="line.133"></a>
+<span class="sourceLineNo">134</span>  void reloadZkWatcher() throws 
IOException {<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    if (zkw != null) zkw.close();<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>    zkw = new 
ZooKeeperWatcher(ctx.getConfiguration(),<a name="line.136"></a>
+<span class="sourceLineNo">137</span>        "connection to cluster: " + 
ctx.getPeerId(), this);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    getZkw().registerListener(new 
PeerRegionServerListener(this));<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>  @Override<a name="line.141"></a>
+<span class="sourceLineNo">142</span>  public void abort(String why, Throwable 
e) {<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    LOG.error("The 
HBaseReplicationEndpoint corresponding to peer " + ctx.getPeerId()<a 
name="line.143"></a>
+<span class="sourceLineNo">144</span>        + " was aborted for the following 
reason(s):" + why, e);<a name="line.144"></a>
+<span class="sourceLineNo">145</span>  }<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span>  @Override<a name="line.147"></a>
+<span class="sourceLineNo">148</span>  public boolean isAborted() {<a 
name="line.148"></a>
+<span class="sourceLineNo">149</span>    // Currently this is never "Aborted", 
we just log when the abort method is called.<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    return false;<a name="line.150"></a>
+<span class="sourceLineNo">151</span>  }<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">154</span>   * Get the list of all the region 
servers from the specified peer<a name="line.154"></a>
+<span class="sourceLineNo">155</span>   * @param zkw zk connection to use<a 
name="line.155"></a>
+<span class="sourceLineNo">156</span>   * @return list of region server 
addresses or an empty list if the slave is unavailable<a name="line.156"></a>
+<span class="sourceLineNo">157</span>   */<a name="line.157"></a>
+<span class="sourceLineNo">158</span>  protected static List&lt;ServerName&gt; 
fetchSlavesAddresses(ZooKeeperWatcher zkw)<a name="line.158"></a>
+<span class="sourceLineNo">159</span>      throws KeeperException {<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>    List&lt;String&gt; children = 
ZKUtil.listChildrenAndWatchForNewChildren(zkw, zkw.znodePaths.rsZNode);<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>    if (children == null) {<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>      return Collections.emptyList();<a 
name="line.162"></a>
+<span class="sourceLineNo">163</span>    }<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    List&lt;ServerName&gt; addresses = 
new ArrayList&lt;&gt;(children.size());<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    for (String child : children) {<a 
name="line.165"></a>
+<span class="sourceLineNo">166</span>      
addresses.add(ServerName.parseServerName(child));<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    }<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    return addresses;<a 
name="line.168"></a>
+<span class="sourceLineNo">169</span>  }<a name="line.169"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span>  /**<a name="line.171"></a>
+<span class="sourceLineNo">172</span>   * Get a list of all the addresses of 
all the region servers<a name="line.172"></a>
+<span class="sourceLineNo">173</span>   * for this peer cluster<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span>   * @return list of addresses<a 
name="line.174"></a>
+<span class="sourceLineNo">175</span>   */<a name="line.175"></a>
+<span class="sourceLineNo">176</span>  // Synchronize peer cluster connection 
attempts to avoid races and rate<a name="line.176"></a>
+<span class="sourceLineNo">177</span>  // limit connections when multiple 
replication sources try to connect to<a name="line.177"></a>
+<span class="sourceLineNo">178</span>  // the peer cluster. If the peer 
cluster is down we can get out of control<a name="line.178"></a>
+<span class="sourceLineNo">179</span>  // over time.<a name="line.179"></a>
+<span class="sourceLineNo">180</span>  public synchronized 
List&lt;ServerName&gt; getRegionServers() {<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    try {<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      
setRegionServers(fetchSlavesAddresses(this.getZkw()));<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    } catch (KeeperException ke) {<a 
name="line.183"></a>
+<span class="sourceLineNo">184</span>      if (LOG.isDebugEnabled()) {<a 
name="line.184"></a>
+<span class="sourceLineNo">185</span>        LOG.debug("Fetch slaves addresses 
failed", ke);<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      }<a name="line.186"></a>
+<span class="sourceLineNo">187</span>      reconnect(ke);<a 
name="line.187"></a>
+<span class="sourceLineNo">188</span>    }<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    return regionServers;<a 
name="line.189"></a>
+<span class="sourceLineNo">190</span>  }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span>  /**<a name="line.192"></a>
+<span class="sourceLineNo">193</span>   * Set the list of region servers for 
that peer<a name="line.193"></a>
+<span class="sourceLineNo">194</span>   * @param regionServers list of 
addresses for the region servers<a name="line.194"></a>
 <span class="sourceLineNo">195</span>   */<a name="line.195"></a>
-<span class="sourceLineNo">196</span>  public long getLastRegionServerUpdate() 
{<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    return lastRegionServerUpdate;<a 
name="line.197"></a>
-<span class="sourceLineNo">198</span>  }<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>   * Tracks changes to the list of region 
servers in a peer's cluster.<a name="line.201"></a>
-<span class="sourceLineNo">202</span>   */<a name="line.202"></a>
-<span class="sourceLineNo">203</span>  public static class 
PeerRegionServerListener extends ZooKeeperListener {<a name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span>    private final 
HBaseReplicationEndpoint replicationEndpoint;<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    private final String 
regionServerListNode;<a name="line.206"></a>
-<span class="sourceLineNo">207</span><a name="line.207"></a>
-<span class="sourceLineNo">208</span>    public 
PeerRegionServerListener(HBaseReplicationEndpoint replicationPeer) {<a 
name="line.208"></a>
-<span class="sourceLineNo">209</span>      super(replicationPeer.getZkw());<a 
name="line.209"></a>
-<span class="sourceLineNo">210</span>      this.replicationEndpoint = 
replicationPeer;<a name="line.210"></a>
-<span class="sourceLineNo">211</span>      this.regionServerListNode = 
replicationEndpoint.getZkw().znodePaths.rsZNode;<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    }<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span>    @Override<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    public synchronized void 
nodeChildrenChanged(String path) {<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      if 
(path.equals(regionServerListNode)) {<a name="line.216"></a>
-<span class="sourceLineNo">217</span>        try {<a name="line.217"></a>
-<span class="sourceLineNo">218</span>          LOG.info("Detected change to 
peer region servers, fetching updated list");<a name="line.218"></a>
-<span class="sourceLineNo">219</span>          
replicationEndpoint.setRegionServers(fetchSlavesAddresses(replicationEndpoint.getZkw()));<a
 name="line.219"></a>
-<span class="sourceLineNo">220</span>        } catch (KeeperException e) {<a 
name="line.220"></a>
-<span class="sourceLineNo">221</span>          LOG.error("Error reading slave 
addresses", e);<a name="line.221"></a>
-<span class="sourceLineNo">222</span>        }<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      }<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    }<a name="line.224"></a>
-<span class="sourceLineNo">225</span>  }<a name="line.225"></a>
-<span class="sourceLineNo">226</span>}<a name="line.226"></a>
+<span class="sourceLineNo">196</span>  public synchronized void 
setRegionServers(List&lt;ServerName&gt; regionServers) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    this.regionServers = regionServers;<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span>    lastRegionServerUpdate = 
System.currentTimeMillis();<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>  /**<a name="line.201"></a>
+<span class="sourceLineNo">202</span>   * Get the timestamp at which the last 
change occurred to the list of region servers to replicate<a 
name="line.202"></a>
+<span class="sourceLineNo">203</span>   * to.<a name="line.203"></a>
+<span class="sourceLineNo">204</span>   * @return The System.currentTimeMillis 
at the last time the list of peer region servers changed.<a name="line.204"></a>
+<span class="sourceLineNo">205</span>   */<a name="line.205"></a>
+<span class="sourceLineNo">206</span>  public long getLastRegionServerUpdate() 
{<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    return lastRegionServerUpdate;<a 
name="line.207"></a>
+<span class="sourceLineNo">208</span>  }<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span>  /**<a name="line.210"></a>
+<span class="sourceLineNo">211</span>   * Tracks changes to the list of region 
servers in a peer's cluster.<a name="line.211"></a>
+<span class="sourceLineNo">212</span>   */<a name="line.212"></a>
+<span class="sourceLineNo">213</span>  public static class 
PeerRegionServerListener extends ZooKeeperListener {<a name="line.213"></a>
+<span class="sourceLineNo">214</span><a name="line.214"></a>
+<span class="sourceLineNo">215</span>    private final 
HBaseReplicationEndpoint replicationEndpoint;<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    private final String 
regionServerListNode;<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span>    public 
PeerRegionServerListener(HBaseReplicationEndpoint replicationPeer) {<a 
name="line.218"></a>
+<span class="sourceLineNo">219</span>      super(replicationPeer.getZkw());<a 
name="line.219"></a>
+<span class="sourceLineNo">220</span>      this.replicationEndpoint = 
replicationPeer;<a name="line.220"></a>
+<span class="sourceLineNo">221</span>      this.regionServerListNode = 
replicationEndpoint.getZkw().znodePaths.rsZNode;<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    }<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span>    @Override<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    public synchronized void 
nodeChildrenChanged(String path) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span>      if 
(path.equals(regionServerListNode)) {<a name="line.226"></a>
+<span class="sourceLineNo">227</span>        try {<a name="line.227"></a>
+<span class="sourceLineNo">228</span>          LOG.info("Detected change to 
peer region servers, fetching updated list");<a name="line.228"></a>
+<span class="sourceLineNo">229</span>          
replicationEndpoint.setRegionServers(fetchSlavesAddresses(replicationEndpoint.getZkw()));<a
 name="line.229"></a>
+<span class="sourceLineNo">230</span>        } catch (KeeperException e) {<a 
name="line.230"></a>
+<span class="sourceLineNo">231</span>          LOG.error("Error reading slave 
addresses", e);<a name="line.231"></a>
+<span class="sourceLineNo">232</span>        }<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      }<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    }<a name="line.234"></a>
+<span class="sourceLineNo">235</span>  }<a name="line.235"></a>
+<span class="sourceLineNo">236</span>}<a name="line.236"></a>
 
 
 

Reply via email to