http://git-wip-us.apache.org/repos/asf/hbase-site/blob/62e361eb/apidocs/src-html/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.html
 
b/apidocs/src-html/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.html
index 0094b10..e237805 100644
--- 
a/apidocs/src-html/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.html
+++ 
b/apidocs/src-html/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.html
@@ -37,641 +37,525 @@
 <span class="sourceLineNo">029</span>import java.util.HashSet;<a 
name="line.29"></a>
 <span class="sourceLineNo">030</span>import java.util.List;<a 
name="line.30"></a>
 <span class="sourceLineNo">031</span>import java.util.Map;<a 
name="line.31"></a>
-<span class="sourceLineNo">032</span>import java.util.Map.Entry;<a 
name="line.32"></a>
-<span class="sourceLineNo">033</span>import java.util.Set;<a 
name="line.33"></a>
-<span class="sourceLineNo">034</span><a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.commons.logging.Log;<a 
name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.apache.commons.logging.LogFactory;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.Abortable;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.HTableDescriptor;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.TableNotFoundException;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.client.Admin;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.client.Connection;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import 
org.apache.hadoop.hbase.client.RegionLocator;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import 
org.apache.hadoop.hbase.replication.ReplicationException;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import 
org.apache.hadoop.hbase.replication.ReplicationFactory;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import 
org.apache.hadoop.hbase.replication.ReplicationPeer;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import 
org.apache.hadoop.hbase.replication.ReplicationPeerConfig;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import 
org.apache.hadoop.hbase.replication.ReplicationPeerZKImpl;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import 
org.apache.hadoop.hbase.replication.ReplicationPeers;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import 
org.apache.hadoop.hbase.replication.ReplicationQueuesClient;<a 
name="line.56"></a>
-<span class="sourceLineNo">057</span>import 
org.apache.hadoop.hbase.replication.ReplicationQueuesClientArguments;<a 
name="line.57"></a>
-<span class="sourceLineNo">058</span>import 
org.apache.hadoop.hbase.util.Pair;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import 
org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;<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> * &lt;p&gt;<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * This class provides the administrative 
interface to HBase cluster<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * replication. In order to use it, the 
cluster and the client using<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * ReplicationAdmin must be configured 
with &lt;code&gt;hbase.replication&lt;/code&gt;<a name="line.65"></a>
-<span class="sourceLineNo">066</span> * set to true.<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * &lt;/p&gt;<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * &lt;p&gt;<a name="line.68"></a>
-<span class="sourceLineNo">069</span> * Adding a new peer results in creating 
new outbound connections from every<a name="line.69"></a>
-<span class="sourceLineNo">070</span> * region server to a subset of region 
servers on the slave cluster. Each<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * new stream of replication will start 
replicating from the beginning of the<a name="line.71"></a>
-<span class="sourceLineNo">072</span> * current WAL, meaning that edits from 
that past will be replicated.<a name="line.72"></a>
-<span class="sourceLineNo">073</span> * &lt;/p&gt;<a name="line.73"></a>
-<span class="sourceLineNo">074</span> * &lt;p&gt;<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * Removing a peer is a destructive and 
irreversible operation that stops<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * all the replication streams for the 
given cluster and deletes the metadata<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * used to keep track of the replication 
state.<a name="line.77"></a>
-<span class="sourceLineNo">078</span> * &lt;/p&gt;<a name="line.78"></a>
-<span class="sourceLineNo">079</span> * &lt;p&gt;<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * To see which commands are available in 
the shell, type<a name="line.80"></a>
-<span class="sourceLineNo">081</span> * 
&lt;code&gt;replication&lt;/code&gt;.<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * &lt;/p&gt;<a name="line.82"></a>
-<span class="sourceLineNo">083</span> */<a name="line.83"></a>
-<span class="sourceLineNo">084</span>@InterfaceAudience.Public<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>@InterfaceStability.Evolving<a 
name="line.85"></a>
-<span class="sourceLineNo">086</span>public class ReplicationAdmin implements 
Closeable {<a name="line.86"></a>
-<span class="sourceLineNo">087</span>  private static final Log LOG = 
LogFactory.getLog(ReplicationAdmin.class);<a name="line.87"></a>
-<span class="sourceLineNo">088</span><a name="line.88"></a>
-<span class="sourceLineNo">089</span>  public static final String TNAME = 
"tableName";<a name="line.89"></a>
-<span class="sourceLineNo">090</span>  public static final String CFNAME = 
"columnFamilyName";<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span>  // only Global for now, can add other 
type<a name="line.92"></a>
-<span class="sourceLineNo">093</span>  // such as, 1) no global replication, 
or 2) the table is replicated to this cluster, etc.<a name="line.93"></a>
-<span class="sourceLineNo">094</span>  public static final String 
REPLICATIONTYPE = "replicationType";<a name="line.94"></a>
-<span class="sourceLineNo">095</span>  public static final String 
REPLICATIONGLOBAL =<a name="line.95"></a>
-<span class="sourceLineNo">096</span>      
Integer.toString(HConstants.REPLICATION_SCOPE_GLOBAL);<a name="line.96"></a>
-<span class="sourceLineNo">097</span>  public static final String 
REPLICATIONSERIAL =<a name="line.97"></a>
-<span class="sourceLineNo">098</span>      
Integer.toString(HConstants.REPLICATION_SCOPE_SERIAL);<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span>  private final Connection connection;<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>  // TODO: replication should be managed 
by master. All the classes except ReplicationAdmin should<a name="line.101"></a>
-<span class="sourceLineNo">102</span>  // be moved to hbase-server. Resolve it 
in HBASE-11392.<a name="line.102"></a>
-<span class="sourceLineNo">103</span>  private final ReplicationQueuesClient 
replicationQueuesClient;<a name="line.103"></a>
-<span class="sourceLineNo">104</span>  private final ReplicationPeers 
replicationPeers;<a name="line.104"></a>
-<span class="sourceLineNo">105</span>  /**<a name="line.105"></a>
-<span class="sourceLineNo">106</span>   * A watcher used by replicationPeers 
and replicationQueuesClient. Keep reference so can dispose<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>   * on {@link #close()}.<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>   */<a name="line.108"></a>
-<span class="sourceLineNo">109</span>  private final ZooKeeperWatcher zkw;<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>   * Constructor that creates a 
connection to the local ZooKeeper ensemble.<a name="line.112"></a>
-<span class="sourceLineNo">113</span>   * @param conf Configuration to use<a 
name="line.113"></a>
-<span class="sourceLineNo">114</span>   * @throws IOException if an internal 
replication error occurs<a name="line.114"></a>
-<span class="sourceLineNo">115</span>   * @throws RuntimeException if 
replication isn't enabled.<a name="line.115"></a>
-<span class="sourceLineNo">116</span>   */<a name="line.116"></a>
-<span class="sourceLineNo">117</span>  public ReplicationAdmin(Configuration 
conf) throws IOException {<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    this.connection = 
ConnectionFactory.createConnection(conf);<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    try {<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      zkw = createZooKeeperWatcher();<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span>      try {<a name="line.121"></a>
-<span class="sourceLineNo">122</span>        this.replicationQueuesClient =<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>            
ReplicationFactory.getReplicationQueuesClient(new 
ReplicationQueuesClientArguments(conf,<a name="line.123"></a>
-<span class="sourceLineNo">124</span>            this.connection, zkw));<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>        
this.replicationQueuesClient.init();<a name="line.125"></a>
-<span class="sourceLineNo">126</span>        this.replicationPeers = 
ReplicationFactory.getReplicationPeers(zkw, conf,<a name="line.126"></a>
-<span class="sourceLineNo">127</span>          this.replicationQueuesClient, 
this.connection);<a name="line.127"></a>
-<span class="sourceLineNo">128</span>        this.replicationPeers.init();<a 
name="line.128"></a>
-<span class="sourceLineNo">129</span>      } catch (Exception exception) {<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>        if (zkw != null) {<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span>          zkw.close();<a 
name="line.131"></a>
-<span class="sourceLineNo">132</span>        }<a name="line.132"></a>
-<span class="sourceLineNo">133</span>        throw exception;<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span>      }<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    } catch (Exception exception) {<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span>      if (connection != null) {<a 
name="line.136"></a>
-<span class="sourceLineNo">137</span>        connection.close();<a 
name="line.137"></a>
-<span class="sourceLineNo">138</span>      }<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      if (exception instanceof 
IOException) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span>        throw (IOException) exception;<a 
name="line.140"></a>
-<span class="sourceLineNo">141</span>      } else if (exception instanceof 
RuntimeException) {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>        throw (RuntimeException) 
exception;<a name="line.142"></a>
-<span class="sourceLineNo">143</span>      } else {<a name="line.143"></a>
-<span class="sourceLineNo">144</span>        throw new IOException("Error 
initializing the replication admin client.", exception);<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>  }<a name="line.147"></a>
-<span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span>  private ZooKeeperWatcher 
createZooKeeperWatcher() throws IOException {<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    // This Abortable doesn't 'abort'... 
it just logs.<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    return new 
ZooKeeperWatcher(connection.getConfiguration(), "ReplicationAdmin", new 
Abortable() {<a name="line.151"></a>
-<span class="sourceLineNo">152</span>      @Override<a name="line.152"></a>
-<span class="sourceLineNo">153</span>      public void abort(String why, 
Throwable e) {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>        LOG.error(why, e);<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span>        // We used to call system.exit 
here but this script can be embedded by other programs that<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>        // want to do replication 
stuff... so inappropriate calling System.exit. Just log for now.<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>      @Override<a name="line.159"></a>
-<span class="sourceLineNo">160</span>      public boolean isAborted() {<a 
name="line.160"></a>
-<span class="sourceLineNo">161</span>        return false;<a 
name="line.161"></a>
-<span class="sourceLineNo">162</span>      }<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    });<a name="line.163"></a>
-<span class="sourceLineNo">164</span>  }<a name="line.164"></a>
-<span class="sourceLineNo">165</span><a name="line.165"></a>
-<span class="sourceLineNo">166</span>  /**<a name="line.166"></a>
-<span class="sourceLineNo">167</span>   * Add a new remote slave cluster for 
replication.<a name="line.167"></a>
-<span class="sourceLineNo">168</span>   * @param id a short name that 
identifies the cluster<a name="line.168"></a>
-<span class="sourceLineNo">169</span>   * @param peerConfig configuration for 
the replication slave cluster<a name="line.169"></a>
-<span class="sourceLineNo">170</span>   * @param tableCfs the table and 
column-family list which will be replicated for this peer.<a 
name="line.170"></a>
-<span class="sourceLineNo">171</span>   * A map from tableName to column 
family names. An empty collection can be passed<a name="line.171"></a>
-<span class="sourceLineNo">172</span>   * to indicate replicating all column 
families. Pass null for replicating all table and column<a name="line.172"></a>
-<span class="sourceLineNo">173</span>   * families<a name="line.173"></a>
-<span class="sourceLineNo">174</span>   * @deprecated as release of 2.0.0, and 
it will be removed in 3.0.0,<a name="line.174"></a>
-<span class="sourceLineNo">175</span>   * use {@link #addPeer(String, 
ReplicationPeerConfig)} instead.<a name="line.175"></a>
-<span class="sourceLineNo">176</span>   */<a name="line.176"></a>
-<span class="sourceLineNo">177</span>  @Deprecated<a name="line.177"></a>
-<span class="sourceLineNo">178</span>  public void addPeer(String id, 
ReplicationPeerConfig peerConfig,<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      Map&lt;TableName, ? extends 
Collection&lt;String&gt;&gt; tableCfs) throws ReplicationException {<a 
name="line.179"></a>
-<span class="sourceLineNo">180</span>    if (tableCfs != null) {<a 
name="line.180"></a>
-<span class="sourceLineNo">181</span>      
peerConfig.setTableCFsMap(tableCfs);<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    }<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    
this.replicationPeers.registerPeer(id, peerConfig);<a name="line.183"></a>
-<span class="sourceLineNo">184</span>  }<a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span>  /**<a name="line.186"></a>
-<span class="sourceLineNo">187</span>   * Add a new remote slave cluster for 
replication.<a name="line.187"></a>
-<span class="sourceLineNo">188</span>   * @param id a short name that 
identifies the cluster<a name="line.188"></a>
-<span class="sourceLineNo">189</span>   * @param peerConfig configuration for 
the replication slave cluster<a name="line.189"></a>
-<span class="sourceLineNo">190</span>   */<a name="line.190"></a>
-<span class="sourceLineNo">191</span>  public void addPeer(String id, 
ReplicationPeerConfig peerConfig) throws ReplicationException {<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span>    
checkNamespacesAndTableCfsConfigConflict(peerConfig.getNamespaces(),<a 
name="line.192"></a>
-<span class="sourceLineNo">193</span>      peerConfig.getTableCFsMap());<a 
name="line.193"></a>
-<span class="sourceLineNo">194</span>    
this.replicationPeers.registerPeer(id, peerConfig);<a name="line.194"></a>
-<span class="sourceLineNo">195</span>  }<a name="line.195"></a>
-<span class="sourceLineNo">196</span><a name="line.196"></a>
-<span class="sourceLineNo">197</span>  /**<a name="line.197"></a>
-<span class="sourceLineNo">198</span>   *  @deprecated as release of 2.0.0, 
and it will be removed in 3.0.0<a name="line.198"></a>
-<span class="sourceLineNo">199</span>   * */<a name="line.199"></a>
-<span class="sourceLineNo">200</span>  @Deprecated<a name="line.200"></a>
-<span class="sourceLineNo">201</span>  public static Map&lt;TableName, 
List&lt;String&gt;&gt; parseTableCFsFromConfig(String tableCFsConfig) {<a 
name="line.201"></a>
-<span class="sourceLineNo">202</span>    return 
ReplicationSerDeHelper.parseTableCFsFromConfig(tableCFsConfig);<a 
name="line.202"></a>
+<span class="sourceLineNo">032</span>import java.util.TreeMap;<a 
name="line.32"></a>
+<span class="sourceLineNo">033</span>import java.util.Map.Entry;<a 
name="line.33"></a>
+<span class="sourceLineNo">034</span>import java.util.Set;<a 
name="line.34"></a>
+<span class="sourceLineNo">035</span><a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.commons.logging.Log;<a 
name="line.36"></a>
+<span class="sourceLineNo">037</span>import 
org.apache.commons.logging.LogFactory;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.Abortable;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.HTableDescriptor;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.ReplicationPeerNotFoundException;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.TableNotFoundException;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.client.Admin;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import 
org.apache.hadoop.hbase.client.Connection;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import 
org.apache.hadoop.hbase.client.HBaseAdmin;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import 
org.apache.hadoop.hbase.client.RegionLocator;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import 
org.apache.hadoop.hbase.replication.ReplicationException;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import 
org.apache.hadoop.hbase.replication.ReplicationFactory;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import 
org.apache.hadoop.hbase.replication.ReplicationPeer;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import 
org.apache.hadoop.hbase.replication.ReplicationPeerConfig;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import 
org.apache.hadoop.hbase.replication.ReplicationPeerDescription;<a 
name="line.57"></a>
+<span class="sourceLineNo">058</span>import 
org.apache.hadoop.hbase.replication.ReplicationPeerZKImpl;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import 
org.apache.hadoop.hbase.replication.ReplicationPeers;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import 
org.apache.hadoop.hbase.replication.ReplicationQueuesClient;<a 
name="line.60"></a>
+<span class="sourceLineNo">061</span>import 
org.apache.hadoop.hbase.replication.ReplicationQueuesClientArguments;<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>import 
org.apache.hadoop.hbase.util.Pair;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>import 
org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;<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> * &lt;p&gt;<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * This class provides the administrative 
interface to HBase cluster<a name="line.67"></a>
+<span class="sourceLineNo">068</span> * replication.<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * &lt;/p&gt;<a name="line.69"></a>
+<span class="sourceLineNo">070</span> * &lt;p&gt;<a name="line.70"></a>
+<span class="sourceLineNo">071</span> * Adding a new peer results in creating 
new outbound connections from every<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * region server to a subset of region 
servers on the slave cluster. Each<a name="line.72"></a>
+<span class="sourceLineNo">073</span> * new stream of replication will start 
replicating from the beginning of the<a name="line.73"></a>
+<span class="sourceLineNo">074</span> * current WAL, meaning that edits from 
that past will be replicated.<a name="line.74"></a>
+<span class="sourceLineNo">075</span> * &lt;/p&gt;<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * &lt;p&gt;<a name="line.76"></a>
+<span class="sourceLineNo">077</span> * Removing a peer is a destructive and 
irreversible operation that stops<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * all the replication streams for the 
given cluster and deletes the metadata<a name="line.78"></a>
+<span class="sourceLineNo">079</span> * used to keep track of the replication 
state.<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * &lt;/p&gt;<a name="line.80"></a>
+<span class="sourceLineNo">081</span> * &lt;p&gt;<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * To see which commands are available in 
the shell, type<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * 
&lt;code&gt;replication&lt;/code&gt;.<a name="line.83"></a>
+<span class="sourceLineNo">084</span> * &lt;/p&gt;<a name="line.84"></a>
+<span class="sourceLineNo">085</span> *<a name="line.85"></a>
+<span class="sourceLineNo">086</span> * @deprecated use {@link 
org.apache.hadoop.hbase.client.Admin} instead.<a name="line.86"></a>
+<span class="sourceLineNo">087</span> */<a name="line.87"></a>
+<span class="sourceLineNo">088</span>@InterfaceAudience.Public<a 
name="line.88"></a>
+<span class="sourceLineNo">089</span>@InterfaceStability.Evolving<a 
name="line.89"></a>
+<span class="sourceLineNo">090</span>@Deprecated<a name="line.90"></a>
+<span class="sourceLineNo">091</span>public class ReplicationAdmin implements 
Closeable {<a name="line.91"></a>
+<span class="sourceLineNo">092</span>  private static final Log LOG = 
LogFactory.getLog(ReplicationAdmin.class);<a name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span>  public static final String TNAME = 
"tableName";<a name="line.94"></a>
+<span class="sourceLineNo">095</span>  public static final String CFNAME = 
"columnFamilyName";<a name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span>  // only Global for now, can add other 
type<a name="line.97"></a>
+<span class="sourceLineNo">098</span>  // such as, 1) no global replication, 
or 2) the table is replicated to this cluster, etc.<a name="line.98"></a>
+<span class="sourceLineNo">099</span>  public static final String 
REPLICATIONTYPE = "replicationType";<a name="line.99"></a>
+<span class="sourceLineNo">100</span>  public static final String 
REPLICATIONGLOBAL =<a name="line.100"></a>
+<span class="sourceLineNo">101</span>      
Integer.toString(HConstants.REPLICATION_SCOPE_GLOBAL);<a name="line.101"></a>
+<span class="sourceLineNo">102</span>  public static final String 
REPLICATIONSERIAL =<a name="line.102"></a>
+<span class="sourceLineNo">103</span>      
Integer.toString(HConstants.REPLICATION_SCOPE_SERIAL);<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span>  private final Connection connection;<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>  // TODO: replication should be managed 
by master. All the classes except ReplicationAdmin should<a name="line.106"></a>
+<span class="sourceLineNo">107</span>  // be moved to hbase-server. Resolve it 
in HBASE-11392.<a name="line.107"></a>
+<span class="sourceLineNo">108</span>  private final ReplicationQueuesClient 
replicationQueuesClient;<a name="line.108"></a>
+<span class="sourceLineNo">109</span>  private final ReplicationPeers 
replicationPeers;<a name="line.109"></a>
+<span class="sourceLineNo">110</span>  /**<a name="line.110"></a>
+<span class="sourceLineNo">111</span>   * A watcher used by replicationPeers 
and replicationQueuesClient. Keep reference so can dispose<a 
name="line.111"></a>
+<span class="sourceLineNo">112</span>   * on {@link #close()}.<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>   */<a name="line.113"></a>
+<span class="sourceLineNo">114</span>  private final ZooKeeperWatcher zkw;<a 
name="line.114"></a>
+<span class="sourceLineNo">115</span><a name="line.115"></a>
+<span class="sourceLineNo">116</span>  private Admin admin;<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>
+<span class="sourceLineNo">119</span>   * Constructor that creates a 
connection to the local ZooKeeper ensemble.<a name="line.119"></a>
+<span class="sourceLineNo">120</span>   * @param conf Configuration to use<a 
name="line.120"></a>
+<span class="sourceLineNo">121</span>   * @throws IOException if an internal 
replication error occurs<a name="line.121"></a>
+<span class="sourceLineNo">122</span>   * @throws RuntimeException if 
replication isn't enabled.<a name="line.122"></a>
+<span class="sourceLineNo">123</span>   */<a name="line.123"></a>
+<span class="sourceLineNo">124</span>  public ReplicationAdmin(Configuration 
conf) throws IOException {<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    this.connection = 
ConnectionFactory.createConnection(conf);<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    admin = connection.getAdmin();<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span>    try {<a name="line.127"></a>
+<span class="sourceLineNo">128</span>      zkw = createZooKeeperWatcher();<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>      try {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>        this.replicationQueuesClient =<a 
name="line.130"></a>
+<span class="sourceLineNo">131</span>            
ReplicationFactory.getReplicationQueuesClient(new 
ReplicationQueuesClientArguments(conf,<a name="line.131"></a>
+<span class="sourceLineNo">132</span>            this.connection, zkw));<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>        
this.replicationQueuesClient.init();<a name="line.133"></a>
+<span class="sourceLineNo">134</span>        this.replicationPeers = 
ReplicationFactory.getReplicationPeers(zkw, conf,<a name="line.134"></a>
+<span class="sourceLineNo">135</span>          this.replicationQueuesClient, 
this.connection);<a name="line.135"></a>
+<span class="sourceLineNo">136</span>        this.replicationPeers.init();<a 
name="line.136"></a>
+<span class="sourceLineNo">137</span>      } catch (Exception exception) {<a 
name="line.137"></a>
+<span class="sourceLineNo">138</span>        if (zkw != null) {<a 
name="line.138"></a>
+<span class="sourceLineNo">139</span>          zkw.close();<a 
name="line.139"></a>
+<span class="sourceLineNo">140</span>        }<a name="line.140"></a>
+<span class="sourceLineNo">141</span>        throw exception;<a 
name="line.141"></a>
+<span class="sourceLineNo">142</span>      }<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    } catch (Exception exception) {<a 
name="line.143"></a>
+<span class="sourceLineNo">144</span>      connection.close();<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>      if (exception instanceof 
IOException) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>        throw (IOException) exception;<a 
name="line.146"></a>
+<span class="sourceLineNo">147</span>      } else if (exception instanceof 
RuntimeException) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span>        throw (RuntimeException) 
exception;<a name="line.148"></a>
+<span class="sourceLineNo">149</span>      } else {<a name="line.149"></a>
+<span class="sourceLineNo">150</span>        throw new IOException("Error 
initializing the replication admin client.", exception);<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><a name="line.154"></a>
+<span class="sourceLineNo">155</span>  private ZooKeeperWatcher 
createZooKeeperWatcher() throws IOException {<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    // This Abortable doesn't 'abort'... 
it just logs.<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    return new 
ZooKeeperWatcher(connection.getConfiguration(), "ReplicationAdmin", new 
Abortable() {<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      @Override<a name="line.158"></a>
+<span class="sourceLineNo">159</span>      public void abort(String why, 
Throwable e) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>        LOG.error(why, e);<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>        // We used to call system.exit 
here but this script can be embedded by other programs that<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>        // want to do replication 
stuff... so inappropriate calling System.exit. Just log for now.<a 
name="line.162"></a>
+<span class="sourceLineNo">163</span>      }<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span>      @Override<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      public boolean isAborted() {<a 
name="line.166"></a>
+<span class="sourceLineNo">167</span>        return false;<a 
name="line.167"></a>
+<span class="sourceLineNo">168</span>      }<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>  /**<a name="line.172"></a>
+<span class="sourceLineNo">173</span>   * Add a new remote slave cluster for 
replication.<a name="line.173"></a>
+<span class="sourceLineNo">174</span>   * @param id a short name that 
identifies the cluster<a name="line.174"></a>
+<span class="sourceLineNo">175</span>   * @param peerConfig configuration for 
the replication slave cluster<a name="line.175"></a>
+<span class="sourceLineNo">176</span>   * @param tableCfs the table and 
column-family list which will be replicated for this peer.<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>   * A map from tableName to column 
family names. An empty collection can be passed<a name="line.177"></a>
+<span class="sourceLineNo">178</span>   * to indicate replicating all column 
families. Pass null for replicating all table and column<a name="line.178"></a>
+<span class="sourceLineNo">179</span>   * families<a name="line.179"></a>
+<span class="sourceLineNo">180</span>   * @deprecated as release of 2.0.0, and 
it will be removed in 3.0.0,<a name="line.180"></a>
+<span class="sourceLineNo">181</span>   * use {@link #addPeer(String, 
ReplicationPeerConfig)} instead.<a name="line.181"></a>
+<span class="sourceLineNo">182</span>   */<a name="line.182"></a>
+<span class="sourceLineNo">183</span>  @Deprecated<a name="line.183"></a>
+<span class="sourceLineNo">184</span>  public void addPeer(String id, 
ReplicationPeerConfig peerConfig,<a name="line.184"></a>
+<span class="sourceLineNo">185</span>      Map&lt;TableName, ? extends 
Collection&lt;String&gt;&gt; tableCfs) throws ReplicationException,<a 
name="line.185"></a>
+<span class="sourceLineNo">186</span>      IOException {<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    if (tableCfs != null) {<a 
name="line.187"></a>
+<span class="sourceLineNo">188</span>      
peerConfig.setTableCFsMap(tableCfs);<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    }<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    this.admin.addReplicationPeer(id, 
peerConfig);<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>  /**<a name="line.193"></a>
+<span class="sourceLineNo">194</span>   * Add a new remote slave cluster for 
replication.<a name="line.194"></a>
+<span class="sourceLineNo">195</span>   * @param id a short name that 
identifies the cluster<a name="line.195"></a>
+<span class="sourceLineNo">196</span>   * @param peerConfig configuration for 
the replication slave cluster<a name="line.196"></a>
+<span class="sourceLineNo">197</span>   */<a name="line.197"></a>
+<span class="sourceLineNo">198</span>  public void addPeer(String id, 
ReplicationPeerConfig peerConfig) throws ReplicationException,<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span>      IOException {<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    
checkNamespacesAndTableCfsConfigConflict(peerConfig.getNamespaces(),<a 
name="line.200"></a>
+<span class="sourceLineNo">201</span>      peerConfig.getTableCFsMap());<a 
name="line.201"></a>
+<span class="sourceLineNo">202</span>    this.admin.addReplicationPeer(id, 
peerConfig);<a name="line.202"></a>
 <span class="sourceLineNo">203</span>  }<a name="line.203"></a>
 <span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span>  public void updatePeerConfig(String id, 
ReplicationPeerConfig peerConfig)<a name="line.205"></a>
-<span class="sourceLineNo">206</span>      throws ReplicationException {<a 
name="line.206"></a>
-<span class="sourceLineNo">207</span>    
checkNamespacesAndTableCfsConfigConflict(peerConfig.getNamespaces(),<a 
name="line.207"></a>
-<span class="sourceLineNo">208</span>      peerConfig.getTableCFsMap());<a 
name="line.208"></a>
-<span class="sourceLineNo">209</span>    
this.replicationPeers.updatePeerConfig(id, peerConfig);<a name="line.209"></a>
-<span class="sourceLineNo">210</span>  }<a name="line.210"></a>
-<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span>  /**<a name="line.212"></a>
-<span class="sourceLineNo">213</span>   * Removes a peer cluster and stops the 
replication to it.<a name="line.213"></a>
-<span class="sourceLineNo">214</span>   * @param id a short name that 
identifies the cluster<a name="line.214"></a>
-<span class="sourceLineNo">215</span>   */<a name="line.215"></a>
-<span class="sourceLineNo">216</span>  public void removePeer(String id) 
throws ReplicationException {<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    
this.replicationPeers.unregisterPeer(id);<a name="line.217"></a>
-<span class="sourceLineNo">218</span>  }<a name="line.218"></a>
-<span class="sourceLineNo">219</span><a name="line.219"></a>
-<span class="sourceLineNo">220</span>  /**<a name="line.220"></a>
-<span class="sourceLineNo">221</span>   * Restart the replication stream to 
the specified peer.<a name="line.221"></a>
-<span class="sourceLineNo">222</span>   * @param id a short name that 
identifies the cluster<a name="line.222"></a>
-<span class="sourceLineNo">223</span>   */<a name="line.223"></a>
-<span class="sourceLineNo">224</span>  public void enablePeer(String id) 
throws ReplicationException {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    
this.replicationPeers.enablePeer(id);<a name="line.225"></a>
-<span class="sourceLineNo">226</span>  }<a name="line.226"></a>
-<span class="sourceLineNo">227</span><a name="line.227"></a>
-<span class="sourceLineNo">228</span>  /**<a name="line.228"></a>
-<span class="sourceLineNo">229</span>   * Stop the replication stream to the 
specified peer.<a name="line.229"></a>
-<span class="sourceLineNo">230</span>   * @param id a short name that 
identifies the cluster<a name="line.230"></a>
-<span class="sourceLineNo">231</span>   */<a name="line.231"></a>
-<span class="sourceLineNo">232</span>  public void disablePeer(String id) 
throws ReplicationException {<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    
this.replicationPeers.disablePeer(id);<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>
-<span class="sourceLineNo">237</span>   * Get the number of slave clusters the 
local cluster has.<a name="line.237"></a>
-<span class="sourceLineNo">238</span>   * @return number of slave clusters<a 
name="line.238"></a>
-<span class="sourceLineNo">239</span>   */<a name="line.239"></a>
-<span class="sourceLineNo">240</span>  public int getPeersCount() {<a 
name="line.240"></a>
-<span class="sourceLineNo">241</span>    return 
this.replicationPeers.getAllPeerIds().size();<a name="line.241"></a>
-<span class="sourceLineNo">242</span>  }<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span>  public Map&lt;String, 
ReplicationPeerConfig&gt; listPeerConfigs() {<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    return 
this.replicationPeers.getAllPeerConfigs();<a name="line.245"></a>
-<span class="sourceLineNo">246</span>  }<a name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span>  public ReplicationPeerConfig 
getPeerConfig(String id) throws ReplicationException {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    return 
this.replicationPeers.getReplicationPeerConfig(id);<a name="line.249"></a>
-<span class="sourceLineNo">250</span>  }<a name="line.250"></a>
-<span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span>  /**<a name="line.252"></a>
-<span class="sourceLineNo">253</span>   * Get the replicable table-cf config 
of the specified peer.<a name="line.253"></a>
-<span class="sourceLineNo">254</span>   * @param id a short name that 
identifies the cluster<a name="line.254"></a>
-<span class="sourceLineNo">255</span>   * @deprecated as release of 2.0.0, and 
it will be removed in 3.0.0,<a name="line.255"></a>
-<span class="sourceLineNo">256</span>   * use {@link #getPeerConfig(String)} 
instead.<a name="line.256"></a>
-<span class="sourceLineNo">257</span>   * */<a name="line.257"></a>
-<span class="sourceLineNo">258</span>  @Deprecated<a name="line.258"></a>
-<span class="sourceLineNo">259</span>  public String getPeerTableCFs(String 
id) throws ReplicationException {<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    return 
ReplicationSerDeHelper.convertToString(this.replicationPeers.getPeerTableCFsConfig(id));<a
 name="line.260"></a>
+<span class="sourceLineNo">205</span>  /**<a name="line.205"></a>
+<span class="sourceLineNo">206</span>   *  @deprecated as release of 2.0.0, 
and it will be removed in 3.0.0<a name="line.206"></a>
+<span class="sourceLineNo">207</span>   * */<a name="line.207"></a>
+<span class="sourceLineNo">208</span>  @Deprecated<a name="line.208"></a>
+<span class="sourceLineNo">209</span>  public static Map&lt;TableName, 
List&lt;String&gt;&gt; parseTableCFsFromConfig(String tableCFsConfig) {<a 
name="line.209"></a>
+<span class="sourceLineNo">210</span>    return 
ReplicationSerDeHelper.parseTableCFsFromConfig(tableCFsConfig);<a 
name="line.210"></a>
+<span class="sourceLineNo">211</span>  }<a name="line.211"></a>
+<span class="sourceLineNo">212</span><a name="line.212"></a>
+<span class="sourceLineNo">213</span>  public void updatePeerConfig(String id, 
ReplicationPeerConfig peerConfig) throws IOException {<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    
this.admin.updateReplicationPeerConfig(id, peerConfig);<a name="line.214"></a>
+<span class="sourceLineNo">215</span>  }<a name="line.215"></a>
+<span class="sourceLineNo">216</span><a name="line.216"></a>
+<span class="sourceLineNo">217</span>  /**<a name="line.217"></a>
+<span class="sourceLineNo">218</span>   * Removes a peer cluster and stops the 
replication to it.<a name="line.218"></a>
+<span class="sourceLineNo">219</span>   * @param id a short name that 
identifies the cluster<a name="line.219"></a>
+<span class="sourceLineNo">220</span>   */<a name="line.220"></a>
+<span class="sourceLineNo">221</span>  public void removePeer(String id) 
throws IOException {<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    
this.admin.removeReplicationPeer(id);<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>   * Restart the replication stream to 
the specified peer.<a name="line.226"></a>
+<span class="sourceLineNo">227</span>   * @param id a short name that 
identifies the cluster<a name="line.227"></a>
+<span class="sourceLineNo">228</span>   */<a name="line.228"></a>
+<span class="sourceLineNo">229</span>  public void enablePeer(String id) 
throws IOException {<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    
this.admin.enableReplicationPeer(id);<a name="line.230"></a>
+<span class="sourceLineNo">231</span>  }<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>   * Stop the replication stream to the 
specified peer.<a name="line.234"></a>
+<span class="sourceLineNo">235</span>   * @param id a short name that 
identifies the cluster<a name="line.235"></a>
+<span class="sourceLineNo">236</span>   */<a name="line.236"></a>
+<span class="sourceLineNo">237</span>  public void disablePeer(String id) 
throws IOException {<a name="line.237"></a>
+<span class="sourceLineNo">238</span>    
this.admin.disableReplicationPeer(id);<a name="line.238"></a>
+<span class="sourceLineNo">239</span>  }<a name="line.239"></a>
+<span class="sourceLineNo">240</span><a name="line.240"></a>
+<span class="sourceLineNo">241</span>  /**<a name="line.241"></a>
+<span class="sourceLineNo">242</span>   * Get the number of slave clusters the 
local cluster has.<a name="line.242"></a>
+<span class="sourceLineNo">243</span>   * @return number of slave clusters<a 
name="line.243"></a>
+<span class="sourceLineNo">244</span>   * @throws IOException<a 
name="line.244"></a>
+<span class="sourceLineNo">245</span>   */<a name="line.245"></a>
+<span class="sourceLineNo">246</span>  public int getPeersCount() throws 
IOException {<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    return 
this.admin.listReplicationPeers().size();<a name="line.247"></a>
+<span class="sourceLineNo">248</span>  }<a name="line.248"></a>
+<span class="sourceLineNo">249</span><a name="line.249"></a>
+<span class="sourceLineNo">250</span>  public Map&lt;String, 
ReplicationPeerConfig&gt; listPeerConfigs() throws IOException {<a 
name="line.250"></a>
+<span class="sourceLineNo">251</span>    
List&lt;ReplicationPeerDescription&gt; peers = 
this.admin.listReplicationPeers();<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    Map&lt;String, 
ReplicationPeerConfig&gt; result = new TreeMap&lt;String, 
ReplicationPeerConfig&gt;();<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    for (ReplicationPeerDescription peer 
: peers) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      result.put(peer.getPeerId(), 
peer.getPeerConfig());<a name="line.254"></a>
+<span class="sourceLineNo">255</span>    }<a name="line.255"></a>
+<span class="sourceLineNo">256</span>    return result;<a name="line.256"></a>
+<span class="sourceLineNo">257</span>  }<a name="line.257"></a>
+<span class="sourceLineNo">258</span><a name="line.258"></a>
+<span class="sourceLineNo">259</span>  public ReplicationPeerConfig 
getPeerConfig(String id) throws IOException {<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    return 
admin.getReplicationPeerConfig(id);<a name="line.260"></a>
 <span class="sourceLineNo">261</span>  }<a name="line.261"></a>
 <span class="sourceLineNo">262</span><a name="line.262"></a>
 <span class="sourceLineNo">263</span>  /**<a name="line.263"></a>
-<span class="sourceLineNo">264</span>   * Append the replicable table-cf 
config of the specified peer<a name="line.264"></a>
-<span class="sourceLineNo">265</span>   * @param id a short that identifies 
the cluster<a name="line.265"></a>
-<span class="sourceLineNo">266</span>   * @param tableCfs table-cfs config 
str<a name="line.266"></a>
-<span class="sourceLineNo">267</span>   * @throws ReplicationException<a 
name="line.267"></a>
-<span class="sourceLineNo">268</span>   * @deprecated as release of 2.0.0, and 
it will be removed in 3.0.0,<a name="line.268"></a>
-<span class="sourceLineNo">269</span>   * use {@link 
#appendPeerTableCFs(String, Map)} instead.<a name="line.269"></a>
-<span class="sourceLineNo">270</span>   */<a name="line.270"></a>
-<span class="sourceLineNo">271</span>  @Deprecated<a name="line.271"></a>
-<span class="sourceLineNo">272</span>  public void appendPeerTableCFs(String 
id, String tableCfs) throws ReplicationException {<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    appendPeerTableCFs(id, 
ReplicationSerDeHelper.parseTableCFsFromConfig(tableCfs));<a 
name="line.273"></a>
-<span class="sourceLineNo">274</span>  }<a name="line.274"></a>
-<span class="sourceLineNo">275</span><a name="line.275"></a>
-<span class="sourceLineNo">276</span>  /**<a name="line.276"></a>
-<span class="sourceLineNo">277</span>   * Append the replicable table-cf 
config of the specified peer<a name="line.277"></a>
-<span class="sourceLineNo">278</span>   * @param id a short that identifies 
the cluster<a name="line.278"></a>
-<span class="sourceLineNo">279</span>   * @param tableCfs A map from tableName 
to column family names<a name="line.279"></a>
-<span class="sourceLineNo">280</span>   * @throws ReplicationException<a 
name="line.280"></a>
-<span class="sourceLineNo">281</span>   */<a name="line.281"></a>
-<span class="sourceLineNo">282</span>  public void appendPeerTableCFs(String 
id, Map&lt;TableName, ? extends Collection&lt;String&gt;&gt; tableCfs)<a 
name="line.282"></a>
-<span class="sourceLineNo">283</span>      throws ReplicationException {<a 
name="line.283"></a>
-<span class="sourceLineNo">284</span>    if (tableCfs == null) {<a 
name="line.284"></a>
-<span class="sourceLineNo">285</span>      throw new 
ReplicationException("tableCfs is null");<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    }<a name="line.286"></a>
-<span class="sourceLineNo">287</span>    Map&lt;TableName, 
List&lt;String&gt;&gt; preTableCfs = 
this.replicationPeers.getPeerTableCFsConfig(id);<a name="line.287"></a>
-<span class="sourceLineNo">288</span>    if (preTableCfs == null) {<a 
name="line.288"></a>
-<span class="sourceLineNo">289</span>      setPeerTableCFs(id, tableCfs);<a 
name="line.289"></a>
-<span class="sourceLineNo">290</span>      return;<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    }<a name="line.291"></a>
-<span class="sourceLineNo">292</span>    for (Map.Entry&lt;TableName, ? 
extends Collection&lt;String&gt;&gt; entry : tableCfs.entrySet()) {<a 
name="line.292"></a>
-<span class="sourceLineNo">293</span>      TableName table = entry.getKey();<a 
name="line.293"></a>
-<span class="sourceLineNo">294</span>      Collection&lt;String&gt; appendCfs 
= entry.getValue();<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      if (preTableCfs.containsKey(table)) 
{<a name="line.295"></a>
-<span class="sourceLineNo">296</span>        List&lt;String&gt; cfs = 
preTableCfs.get(table);<a name="line.296"></a>
-<span class="sourceLineNo">297</span>        if (cfs == null || appendCfs == 
null || appendCfs.isEmpty()) {<a name="line.297"></a>
-<span class="sourceLineNo">298</span>          preTableCfs.put(table, null);<a 
name="line.298"></a>
-<span class="sourceLineNo">299</span>        } else {<a name="line.299"></a>
-<span class="sourceLineNo">300</span>          Set&lt;String&gt; cfSet = new 
HashSet&lt;String&gt;(cfs);<a name="line.300"></a>
-<span class="sourceLineNo">301</span>          cfSet.addAll(appendCfs);<a 
name="line.301"></a>
-<span class="sourceLineNo">302</span>          preTableCfs.put(table, 
Lists.newArrayList(cfSet));<a name="line.302"></a>
-<span class="sourceLineNo">303</span>        }<a name="line.303"></a>
-<span class="sourceLineNo">304</span>      } else {<a name="line.304"></a>
-<span class="sourceLineNo">305</span>        if (appendCfs == null || 
appendCfs.isEmpty()) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span>          preTableCfs.put(table, null);<a 
name="line.306"></a>
-<span class="sourceLineNo">307</span>        } else {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>          preTableCfs.put(table, 
Lists.newArrayList(appendCfs));<a name="line.308"></a>
-<span class="sourceLineNo">309</span>        }<a name="line.309"></a>
-<span class="sourceLineNo">310</span>      }<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    }<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    setPeerTableCFs(id, preTableCfs);<a 
name="line.312"></a>
-<span class="sourceLineNo">313</span>  }<a name="line.313"></a>
-<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span>  /**<a name="line.315"></a>
-<span class="sourceLineNo">316</span>   * Remove some table-cfs from table-cfs 
config of the specified peer<a name="line.316"></a>
-<span class="sourceLineNo">317</span>   * @param id a short name that 
identifies the cluster<a name="line.317"></a>
-<span class="sourceLineNo">318</span>   * @param tableCf table-cfs config 
str<a name="line.318"></a>
-<span class="sourceLineNo">319</span>   * @throws ReplicationException<a 
name="line.319"></a>
-<span class="sourceLineNo">320</span>   * @deprecated as release of 2.0.0, and 
it will be removed in 3.0.0,<a name="line.320"></a>
-<span class="sourceLineNo">321</span>   * use {@link 
#removePeerTableCFs(String, Map)} instead.<a name="line.321"></a>
-<span class="sourceLineNo">322</span>   */<a name="line.322"></a>
-<span class="sourceLineNo">323</span>  @Deprecated<a name="line.323"></a>
-<span class="sourceLineNo">324</span>  public void removePeerTableCFs(String 
id, String tableCf) throws ReplicationException {<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    removePeerTableCFs(id, 
ReplicationSerDeHelper.parseTableCFsFromConfig(tableCf));<a name="line.325"></a>
-<span class="sourceLineNo">326</span>  }<a name="line.326"></a>
-<span class="sourceLineNo">327</span><a name="line.327"></a>
-<span class="sourceLineNo">328</span>  /**<a name="line.328"></a>
-<span class="sourceLineNo">329</span>   * Remove some table-cfs from config of 
the specified peer<a name="line.329"></a>
-<span class="sourceLineNo">330</span>   * @param id a short name that 
identifies the cluster<a name="line.330"></a>
-<span class="sourceLineNo">331</span>   * @param tableCfs A map from tableName 
to column family names<a name="line.331"></a>
-<span class="sourceLineNo">332</span>   * @throws ReplicationException<a 
name="line.332"></a>
-<span class="sourceLineNo">333</span>   */<a name="line.333"></a>
-<span class="sourceLineNo">334</span>  public void removePeerTableCFs(String 
id, Map&lt;TableName, ? extends Collection&lt;String&gt;&gt; tableCfs)<a 
name="line.334"></a>
-<span class="sourceLineNo">335</span>      throws ReplicationException {<a 
name="line.335"></a>
-<span class="sourceLineNo">336</span>    if (tableCfs == null) {<a 
name="line.336"></a>
-<span class="sourceLineNo">337</span>      throw new 
ReplicationException("tableCfs is null");<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    }<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    Map&lt;TableName, 
List&lt;String&gt;&gt; preTableCfs = 
this.replicationPeers.getPeerTableCFsConfig(id);<a name="line.339"></a>
-<span class="sourceLineNo">340</span>    if (preTableCfs == null) {<a 
name="line.340"></a>
-<span class="sourceLineNo">341</span>      throw new 
ReplicationException("Table-Cfs for peer" + id + " is null");<a 
name="line.341"></a>
-<span class="sourceLineNo">342</span>    }<a name="line.342"></a>
-<span class="sourceLineNo">343</span>    for (Map.Entry&lt;TableName, ? 
extends Collection&lt;String&gt;&gt; entry: tableCfs.entrySet()) {<a 
name="line.343"></a>
-<span class="sourceLineNo">344</span><a name="line.344"></a>
-<span class="sourceLineNo">345</span>      TableName table = entry.getKey();<a 
name="line.345"></a>
-<span class="sourceLineNo">346</span>      Collection&lt;String&gt; removeCfs 
= entry.getValue();<a name="line.346"></a>
-<span class="sourceLineNo">347</span>      if (preTableCfs.containsKey(table)) 
{<a name="line.347"></a>
-<span class="sourceLineNo">348</span>        List&lt;String&gt; cfs = 
preTableCfs.get(table);<a name="line.348"></a>
-<span class="sourceLineNo">349</span>        if (cfs == null &amp;&amp; 
(removeCfs == null || removeCfs.isEmpty())) {<a name="line.349"></a>
-<span class="sourceLineNo">350</span>          preTableCfs.remove(table);<a 
name="line.350"></a>
-<span class="sourceLineNo">351</span>        } else if (cfs != null &amp;&amp; 
(removeCfs != null &amp;&amp; !removeCfs.isEmpty())) {<a name="line.351"></a>
-<span class="sourceLineNo">352</span>          Set&lt;String&gt; cfSet = new 
HashSet&lt;String&gt;(cfs);<a name="line.352"></a>
-<span class="sourceLineNo">353</span>          cfSet.removeAll(removeCfs);<a 
name="line.353"></a>
-<span class="sourceLineNo">354</span>          if (cfSet.isEmpty()) {<a 
name="line.354"></a>
-<span class="sourceLineNo">355</span>            preTableCfs.remove(table);<a 
name="line.355"></a>
-<span class="sourceLineNo">356</span>          } else {<a name="line.356"></a>
-<span class="sourceLineNo">357</span>            preTableCfs.put(table, 
Lists.newArrayList(cfSet));<a name="line.357"></a>
-<span class="sourceLineNo">358</span>          }<a name="line.358"></a>
-<span class="sourceLineNo">359</span>        } else if (cfs == null &amp;&amp; 
(removeCfs != null &amp;&amp; !removeCfs.isEmpty())) {<a name="line.359"></a>
-<span class="sourceLineNo">360</span>          throw new 
ReplicationException("Cannot remove cf of table: " + table<a 
name="line.360"></a>
-<span class="sourceLineNo">361</span>              + " which doesn't specify 
cfs from table-cfs config in peer: " + id);<a name="line.361"></a>
-<span class="sourceLineNo">362</span>        } else if (cfs != null &amp;&amp; 
(removeCfs == null || removeCfs.isEmpty())) {<a name="line.362"></a>
-<span class="sourceLineNo">363</span>          throw new 
ReplicationException("Cannot remove table: " + table<a name="line.363"></a>
-<span class="sourceLineNo">364</span>              + " which has specified cfs 
from table-cfs config in peer: " + id);<a name="line.364"></a>
-<span class="sourceLineNo">365</span>        }<a name="line.365"></a>
-<span class="sourceLineNo">366</span>      } else {<a name="line.366"></a>
-<span class="sourceLineNo">367</span>        throw new 
ReplicationException("No table: " + table + " in table-cfs config of peer: " + 
id);<a name="line.367"></a>
-<span class="sourceLineNo">368</span>      }<a name="line.368"></a>
-<span class="sourceLineNo">369</span>    }<a name="line.369"></a>
-<span class="sourceLineNo">370</span>    setPeerTableCFs(id, preTableCfs);<a 
name="line.370"></a>
-<span class="sourceLineNo">371</span>  }<a name="line.371"></a>
-<span class="sourceLineNo">372</span><a name="line.372"></a>
-<span class="sourceLineNo">373</span>  /**<a name="line.373"></a>
-<span class="sourceLineNo">374</span>   * Set the replicable table-cf config 
of the specified peer<a name="line.374"></a>
-<span class="sourceLineNo">375</span>   * @param id a short name that 
identifies the cluster<a name="line.375"></a>
-<span class="sourceLineNo">376</span>   * @param tableCfs the table and 
column-family list which will be replicated for this peer.<a 
name="line.376"></a>
-<span class="sourceLineNo">377</span>   * A map from tableName to column 
family names. An empty collection can be passed<a name="line.377"></a>
-<span class="sourceLineNo">378</span>   * to indicate replicating all column 
families. Pass null for replicating all table and column<a name="line.378"></a>
-<span class="sourceLineNo">379</span>   * families<a name="line.379"></a>
-<span class="sourceLineNo">380</span>   */<a name="line.380"></a>
-<span class="sourceLineNo">381</span>  public void setPeerTableCFs(String id, 
Map&lt;TableName, ? extends Collection&lt;String&gt;&gt; tableCfs)<a 
name="line.381"></a>
-<span class="sourceLineNo">382</span>      throws ReplicationException {<a 
name="line.382"></a>
-<span class="sourceLineNo">383</span>    
checkNamespacesAndTableCfsConfigConflict(<a name="line.383"></a>
-<span class="sourceLineNo">384</span>      
this.replicationPeers.getReplicationPeerConfig(id).getNamespaces(), 
tableCfs);<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    
this.replicationPeers.setPeerTableCFsConfig(id, tableCfs);<a 
name="line.385"></a>
-<span class="sourceLineNo">386</span>  }<a name="line.386"></a>
-<span class="sourceLineNo">387</span><a name="line.387"></a>
-<span class="sourceLineNo">388</span>  /**<a name="line.388"></a>
-<span class="sourceLineNo">389</span>   * Get the state of the specified peer 
cluster<a name="line.389"></a>
-<span class="sourceLineNo">390</span>   * @param id String format of the Short 
name that identifies the peer,<a name="line.390"></a>
-<span class="sourceLineNo">391</span>   * an IllegalArgumentException is 
thrown if it doesn't exist<a name="line.391"></a>
-<span class="sourceLineNo">392</span>   * @return true if replication is 
enabled to that peer, false if it isn't<a name="line.392"></a>
-<span class="sourceLineNo">393</span>   */<a name="line.393"></a>
-<span class="sourceLineNo">394</span>  public boolean getPeerState(String id) 
throws ReplicationException {<a name="line.394"></a>
-<span class="sourceLineNo">395</span>    return 
this.replicationPeers.getStatusOfPeerFromBackingStore(id);<a 
name="line.395"></a>
-<span class="sourceLineNo">396</span>  }<a name="line.396"></a>
-<span class="sourceLineNo">397</span><a name="line.397"></a>
-<span class="sourceLineNo">398</span>  @Override<a name="line.398"></a>
-<span class="sourceLineNo">399</span>  public void close() throws IOException 
{<a name="line.399"></a>
-<span class="sourceLineNo">400</span>    if (this.zkw != null) {<a 
name="line.400"></a>
-<span class="sourceLineNo">401</span>      this.zkw.close();<a 
name="line.401"></a>
-<span class="sourceLineNo">402</span>    }<a name="line.402"></a>
-<span class="sourceLineNo">403</span>    if (this.connection != null) {<a 
name="line.403"></a>
-<span class="sourceLineNo">404</span>      this.connection.close();<a 
name="line.404"></a>
-<span class="sourceLineNo">405</span>    }<a name="line.405"></a>
+<span class="sourceLineNo">264</span>   * Get the replicable table-cf config 
of the specified peer.<a name="line.264"></a>
+<span class="sourceLineNo">265</span>   * @param id a short name that 
identifies the cluster<a name="line.265"></a>
+<span class="sourceLineNo">266</span>   * @deprecated as release of 2.0.0, and 
it will be removed in 3.0.0,<a name="line.266"></a>
+<span class="sourceLineNo">267</span>   * use {@link #getPeerConfig(String)} 
instead.<a name="line.267"></a>
+<span class="sourceLineNo">268</span>   * */<a name="line.268"></a>
+<span class="sourceLineNo">269</span>  @Deprecated<a name="line.269"></a>
+<span class="sourceLineNo">270</span>  public String getPeerTableCFs(String 
id) throws IOException {<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    ReplicationPeerConfig peerConfig = 
admin.getReplicationPeerConfig(id);<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    return 
ReplicationSerDeHelper.convertToString(peerConfig.getTableCFsMap());<a 
name="line.272"></a>
+<span class="sourceLineNo">273</span>  }<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span>  /**<a name="line.275"></a>
+<span class="sourceLineNo">276</span>   * Append the replicable table-cf 
config of the specified peer<a name="line.276"></a>
+<span class="sourceLineNo">277</span>   * @param id a short that identifies 
the cluster<a name="line.277"></a>
+<span class="sourceLineNo">278</span>   * @param tableCfs table-cfs config 
str<a name="line.278"></a>
+<span class="sourceLineNo">279</span>   * @throws ReplicationException<a 
name="line.279"></a>
+<span class="sourceLineNo">280</span>   * @throws IOException<a 
name="line.280"></a>
+<span class="sourceLineNo">281</span>   * @deprecated as release of 2.0.0, and 
it will be removed in 3.0.0,<a name="line.281"></a>
+<span class="sourceLineNo">282</span>   * use {@link 
#appendPeerTableCFs(String, Map)} instead.<a name="line.282"></a>
+<span class="sourceLineNo">283</span>   */<a name="line.283"></a>
+<span class="sourceLineNo">284</span>  @Deprecated<a name="line.284"></a>
+<span class="sourceLineNo">285</span>  public void appendPeerTableCFs(String 
id, String tableCfs) throws ReplicationException,<a name="line.285"></a>
+<span class="sourceLineNo">286</span>      IOException {<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    appendPeerTableCFs(id, 
ReplicationSerDeHelper.parseTableCFsFromConfig(tableCfs));<a 
name="line.287"></a>
+<span class="sourceLineNo">288</span>  }<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span>  /**<a name="line.290"></a>
+<span class="sourceLineNo">291</span>   * Append the replicable table-cf 
config of the specified peer<a name="line.291"></a>
+<span class="sourceLineNo">292</span>   * @param id a short that identifies 
the cluster<a name="line.292"></a>
+<span class="sourceLineNo">293</span>   * @param tableCfs A map from tableName 
to column family names<a name="line.293"></a>
+<span class="sourceLineNo">294</span>   * @throws ReplicationException<a 
name="line.294"></a>
+<span class="sourceLineNo">295</span>   * @throws IOException<a 
name="line.295"></a>
+<span class="sourceLineNo">296</span>   */<a name="line.296"></a>
+<span class="sourceLineNo">297</span>  public void appendPeerTableCFs(String 
id, Map&lt;TableName, ? extends Collection&lt;String&gt;&gt; tableCfs)<a 
name="line.297"></a>
+<span class="sourceLineNo">298</span>      throws ReplicationException, 
IOException {<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    if (tableCfs == null) {<a 
name="line.299"></a>
+<span class="sourceLineNo">300</span>      throw new 
ReplicationException("tableCfs is null");<a name="line.300"></a>
+<span class="sourceLineNo">301</span>    }<a name="line.301"></a>
+<span class="sourceLineNo">302</span>    ReplicationPeerConfig peerConfig = 
admin.getReplicationPeerConfig(id);<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    Map&lt;TableName, 
List&lt;String&gt;&gt; preTableCfs = peerConfig.getTableCFsMap();<a 
name="line.303"></a>
+<span class="sourceLineNo">304</span>    if (preTableCfs == null) {<a 
name="line.304"></a>
+<span class="sourceLineNo">305</span>      setPeerTableCFs(id, tableCfs);<a 
name="line.305"></a>
+<span class="sourceLineNo">306</span>      return;<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    }<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    for (Map.Entry&lt;TableName, ? 
extends Collection&lt;String&gt;&gt; entry : tableCfs.entrySet()) {<a 
name="line.308"></a>
+<span class="sourceLineNo">309</span>      TableName table = entry.getKey();<a 
name="line.309"></a>
+<span class="sourceLineNo">310</span>      Collection&lt;String&gt; appendCfs 
= entry.getValue();<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      if (preTableCfs.containsKey(table)) 
{<a name="line.311"></a>
+<span class="sourceLineNo">312</span>        List&lt;String&gt; cfs = 
preTableCfs.get(table);<a name="line.312"></a>
+<span class="sourceLineNo">313</span>        if (cfs == null || appendCfs == 
null || appendCfs.isEmpty()) {<a name="line.313"></a>
+<span class="sourceLineNo">314</span>          preTableCfs.put(table, null);<a 
name="line.314"></a>
+<span class="sourceLineNo">315</span>        } else {<a name="line.315"></a>
+<span class="sourceLineNo">316</span>          Set&lt;String&gt; cfSet = new 
HashSet&lt;String&gt;(cfs);<a name="line.316"></a>
+<span class="sourceLineNo">317</span>          cfSet.addAll(appendCfs);<a 
name="line.317"></a>
+<span class="sourceLineNo">318</span>          preTableCfs.put(table, 
Lists.newArrayList(cfSet));<a name="line.318"></a>
+<span class="sourceLineNo">319</span>        }<a name="line.319"></a>
+<span class="sourceLineNo">320</span>      } else {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>        if (appendCfs == null || 
appendCfs.isEmpty()) {<a name="line.321"></a>
+<span class="sourceLineNo">322</span>          preTableCfs.put(table, null);<a 
name="line.322"></a>
+<span class="sourceLineNo">323</span>        } else {<a name="line.323"></a>
+<span class="sourceLineNo">324</span>          preTableCfs.put(table, 
Lists.newArrayList(appendCfs));<a name="line.324"></a>
+<span class="sourceLineNo">325</span>        }<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      }<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    }<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    updatePeerConfig(id, peerConfig);<a 
name="line.328"></a>
+<span class="sourceLineNo">329</span>  }<a name="line.329"></a>
+<span class="sourceLineNo">330</span><a name="line.330"></a>
+<span class="sourceLineNo">331</span>  /**<a name="line.331"></a>
+<span class="sourceLineNo">332</span>   * Remove some table-cfs from table-cfs 
config of the specified peer<a name="line.332"></a>
+<span class="sourceLineNo">333</span>   * @param id a short name that 
identifies the cluster<a name="line.333"></a>
+<span class="sourceLineNo">334</span>   * @param tableCf table-cfs config 
str<a name="line.334"></a>
+<span class="sourceLineNo">335</span>   * @throws ReplicationException<a 
name="line.335"></a>
+<span class="sourceLineNo">336</span>   * @throws IOException<a 
name="line.336"></a>
+<span class="sourceLineNo">337</span>   * @deprecated as release of 2.0.0, and 
it will be removed in 3.0.0,<a name="line.337"></a>
+<span class="sourceLineNo">338</span>   * use {@link 
#removePeerTableCFs(String, Map)} instead.<a name="line.338"></a>
+<span class="sourceLineNo">339</span>   */<a name="line.339"></a>
+<span class="sourceLineNo">340</span>  @Deprecated<a name="line.340"></a>
+<span class="sourceLineNo">341</span>  public void removePeerTableCFs(String 
id, String tableCf) throws ReplicationException,<a name="line.341"></a>
+<span class="sourceLineNo">342</span>      IOException {<a name="line.342"></a>
+<span class="sourceLineNo">343</span>    removePeerTableCFs(id, 
ReplicationSerDeHelper.parseTableCFsFromConfig(tableCf));<a name="line.343"></a>
+<span class="sourceLineNo">344</span>  }<a name="line.344"></a>
+<span class="sourceLineNo">345</span><a name="line.345"></a>
+<span class="sourceLineNo">346</span>  /**<a name="line.346"></a>
+<span class="sourceLineNo">347</span>   * Remove some table-cfs from config of 
the specified peer<a name="line.347"></a>
+<span class="sourceLineNo">348</span>   * @param id a short name that 
identifies the cluster<a name="line.348"></a>
+<span class="sourceLineNo">349</span>   * @param tableCfs A map from tableName 
to column family names<a name="line.349"></a>
+<span class="sourceLineNo">350</span>   * @throws ReplicationException<a 
name="line.350"></a>
+<span class="sourceLineNo">351</span>   * @throws IOException<a 
name="line.351"></a>
+<span class="sourceLineNo">352</span>   */<a name="line.352"></a>
+<span class="sourceLineNo">353</span>  public void removePeerTableCFs(String 
id, Map&lt;TableName, ? extends Collection&lt;String&gt;&gt; tableCfs)<a 
name="line.353"></a>
+<span class="sourceLineNo">354</span>      throws ReplicationException, 
IOException {<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    if (tableCfs == null) {<a 
name="line.355"></a>
+<span class="sourceLineNo">356</span>      throw new 
ReplicationException("tableCfs is null");<a name="line.356"></a>
+<span class="sourceLineNo">357</span>    }<a name="line.357"></a>
+<span class="sourceLineNo">358</span>    ReplicationPeerConfig peerConfig = 
admin.getReplicationPeerConfig(id);<a name="line.358"></a>
+<span class="sourceLineNo">359</span>    Map&lt;TableName, 
List&lt;String&gt;&gt; preTableCfs = peerConfig.getTableCFsMap();<a 
name="line.359"></a>
+<span class="sourceLineNo">360</span>    if (preTableCfs == null) {<a 
name="line.360"></a>
+<span class="sourceLineNo">361</span>      throw new 
ReplicationException("Table-Cfs for peer" + id + " is null");<a 
name="line.361"></a>
+<span class="sourceLineNo">362</span>    }<a name="line.362"></a>
+<span class="sourceLineNo">363</span>    for (Map.Entry&lt;TableName, ? 
extends Collection&lt;String&gt;&gt; entry: tableCfs.entrySet()) {<a 
name="line.363"></a>
+<span class="sourceLineNo">364</span><a name="line.364"></a>
+<span class="sourceLineNo">365</span>      TableName table = entry.getKey();<a 
name="line.365"></a>
+<span class="sourceLineNo">366</span>      Collection&lt;String&gt; removeCfs 
= entry.getValue();<a name="line.366"></a>
+<span class="sourceLineNo">367</span>      if (preTableCfs.containsKey(table)) 
{<a name="line.367"></a>
+<span class="sourceLineNo">368</span>        List&lt;String&gt; cfs = 
preTableCfs.get(table);<a name="line.368"></a>
+<span class="sourceLineNo">369</span>        if (cfs == null &amp;&amp; 
(removeCfs == null || removeCfs.isEmpty())) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span>          preTableCfs.remove(table);<a 
name="line.370"></a>
+<span class="sourceLineNo">371</span>        } else if (cfs != null &amp;&amp; 
(removeCfs != null &amp;&amp; !removeCfs.isEmpty())) {<a name="line.371"></a>
+<span class="sourceLineNo">372</span>          Set&lt;String&gt; cfSet = new 
HashSet&lt;String&gt;(cfs);<a name="line.372"></a>
+<span class="sourceLineNo">373</span>          cfSet.removeAll(removeCfs);<a 
name="line.373"></a>
+<span class="sourceLineNo">374</span>          if (cfSet.isEmpty()) {<a 
name="line.374"></a>
+<span class="sourceLineNo">375</span>            preTableCfs.remove(table);<a 
name="line.375"></a>
+<span class="sourceLineNo">376</span>          } else {<a name="line.376"></a>
+<span class="sourceLineNo">377</span>            preTableCfs.put(table, 
Lists.newArrayList(cfSet));<a name="line.377"></a>
+<span class="sourceLineNo">378</span>          }<a name="line.378"></a>
+<span class="sourceLineNo">379</span>        } else if (cfs == null &amp;&amp; 
(removeCfs != null &amp;&amp; !removeCfs.isEmpty())) {<a name="line.379"></a>
+<span class="sourceLineNo">380</span>          throw new 
ReplicationException("Cannot remove cf of table: " + table<a 
name="line.380"></a>
+<span class="sourceLineNo">381</span>              + " which doesn't specify 
cfs from table-cfs config in peer: " + id);<a name="line.381"></a>
+<span class="sourceLineNo">382</span>        } else if (cfs != null &amp;&amp; 
(removeCfs == null || removeCfs.isEmpty())) {<a name="line.382"></a>
+<span class="sourceLineNo">383</span>          throw new 
ReplicationException("Cannot remove table: " + table<a name="line.383"></a>
+<span class="sourceLineNo">384</span>              + " which has specified cfs 
from table-cfs config in peer: " + id);<a name="line.384"></a>
+<span class="sourceLineNo">385</span>        }<a name="line.385"></a>
+<span class="sourceLineNo">386</span>      } else {<a name="line.386"></a>
+<span class="sourceLineNo">387</span>        throw new 
ReplicationException("No table: " + table + " in table-cfs config of peer: " + 
id);<a name="line.387"></a>
+<span class="sourceLineNo">388</span>      }<a name="line.388"></a>
+<span class="sourceLineNo">389</span>    }<a name="line.389"></a>
+<span class="sourceLineNo">390</span>    updatePeerConfig(id, peerConfig);<a 
name="line.390"></a>
+<span class="sourceLineNo">391</span>  }<a name="line.391"></a>
+<span class="sourceLineNo">392</span><a name="line.392"></a>
+<span class="sourceLineNo">393</span>  /**<a name="line.393"></a>
+<span class="sourceLineNo">394</span>   * Set the replicable table-cf config 
of the specified peer<a name="line.394"></a>
+<span class="sourceLineNo">395</span>   * @param id a short name that 
identifies the cluster<a name="line.395"></a>
+<span class="sourceLineNo">396</span>   * @param tableCfs the table and 
column-family list which will be replicated for this peer.<a 
name="line.396"></a>
+<span class="sourceLineNo">397</span>   * A map from tableName to column 
family names. An empty collection can be passed<a name="line.397"></a>
+<span class="sourceLineNo">398</span>   * to indicate replicating all column 
families. Pass null for replicating all table and column<a name="line.398"></a>
+<span class="sourceLineNo">399</span>   * families<a name="line.399"></a>
+<span class="sourceLineNo">400</span>   */<a name="line.400"></a>
+<span class="sourceLineNo">401</span>  public void setPeerTableCFs(String id, 
Map&lt;TableName, ? extends Collection&lt;String&gt;&gt; tableCfs)<a 
name="line.401"></a>
+<span class="sourceLineNo">402</span>      throws IOException {<a 
name="line.402"></a>
+<span class="sourceLineNo">403</span>    ReplicationPeerConfig peerConfig = 
getPeerConfig(id);<a name="line.403"></a>
+<span class="sourceLineNo">404</span>    
peerConfig.setTableCFsMap(tableCfs);<a name="line.404"></a>
+<span class="sourceLineNo">405</span>    updatePeerConfig(id, peerConfig);<a 
name="line.405"></a>
 <span class="sourceLineNo">406</span>  }<a name="line.406"></a>
 <span class="sourceLineNo">407</span><a name="line.407"></a>
-<span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span>  /**<a name="line.409"></a>
-<span class="sourceLineNo">410</span>   * Find all column families that are 
replicated from this cluster<a name="line.410"></a>
-<span class="sourceLineNo">411</span>   * @return the full list of the 
replicated column families of this cluster as:<a name="line.411"></a>
-<span class="sourceLineNo">412</span>   *        tableName, family name, 
replicationType<a name="line.412"></a>
-<span class="sourceLineNo">413</span>   *<a name="line.413"></a>
-<span class="sourceLineNo">414</span>   * Currently replicationType is Global. 
In the future, more replication<a name="line.414"></a>
-<span class="sourceLineNo">415</span>   * types may be extended here. For 
example<a name="line.415"></a>
-<span class="sourceLineNo">416</span>   *  1) the replication may only apply 
to selected peers instead of all peers<a name="line.416"></a>
-<span class="sourceLineNo">417</span>   *  2) the replicationType may indicate 
the host Cluster servers as Slave<a name="line.417"></a>
-<span class="sourceLineNo">418</span>   *     for the table:columnFam.<a 
name="line.418"></a>
-<span class="sourceLineNo">419</span>   */<a name="line.419"></a>
-<span class="sourceLineNo">420</span>  public List&lt;HashMap&lt;String, 
String&gt;&gt; listReplicated() throws IOException {<a name="line.420"></a>
-<span class="sourceLineNo">421</span>    List&lt;HashMap&lt;String, 
String&gt;&gt; replicationColFams = new ArrayList&lt;HashMap&lt;String, 
String&gt;&gt;();<a name="line.421"></a>
-<span class="sourceLineNo">422</span><a name="line.422"></a>
-<span class="sourceLineNo">423</span>    Admin admin = 
connection.getAdmin();<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    HTableDescriptor[] tables;<a 
name="line.424"></a>
-<span class="sourceLineNo">425</span>    try {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>      tables = admin.listTables();<a 
name="line.426"></a>
-<span class="sourceLineNo">427</span>    } finally {<a name="line.427"></a>
-<span class="sourceLineNo">428</span>      if (admin!= null) admin.close();<a 
name="line.428"></a>
+<span class="sourceLineNo">408</span>  /**<a name="line.408"></a>
+<span class="sourceLineNo">409</span>   * Get the state of the specified peer 
cluster<a name="line.409"></a>
+<span class="sourceLineNo">410</span>   * @param id String format of the Short 
name that identifies the peer,<a name="line.410"></a>
+<span class="sourceLineNo">411</span>   * an IllegalArgumentException is 
thrown if it doesn't exist<a name="line.411"></a>
+<span class="sourceLineNo">412</span>   * @return true if replication is 
enabled to that peer, false if it isn't<a name="line.412"></a>
+<span class="sourceLineNo">413</span>   */<a name="line.413"></a>
+<span class="sourceLineNo">414</span>  public boolean getPeerState(String id) 
throws ReplicationException, IOException {<a name="line.414"></a>
+<span class="sourceLineNo">415</span>    
List&lt;ReplicationPeerDescription&gt; peers = 
admin.listReplicationPeers(id);<a name="line.415"></a>
+<span class="sourceLineNo">416</span>    if (peers.isEmpty() || 
!id.equals(peers.get(0).getPeerId())) {<a name="line.416"></a>
+<span class="sourceLineNo">417</span>      throw new 
ReplicationPeerNotFoundException(id);<a name="line.417"></a>
+<span class="sourceLineNo">418</span>    }<a name="line.418"></a>
+<span class="sourceLineNo">419</span>    return peers.get(0).isEnabled();<a 
name="line.419"></a>
+<span class="sourceLineNo">420</span>  }<a name="line.420"></a>
+<span class="sourceLineNo">421</span><a name="line.421"></a>
+<span class="sourceLineNo">422</span>  @Override<a name="line.422"></a>
+<span class="sourceLineNo">423</span>  public void close() throws IOException 
{<a name="line.423"></a>
+<span class="sourceLineNo">424</span>    if (this.zkw != null) {<a 
name="line.424"></a>
+<span class="sourceLineNo">425</span>      this.zkw.close();<a 
name="line.425"></a>
+<span class="sourceLineNo">426</span>    }<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    if (this.connection != null) {<a 
name="line.427"></a>
+<span class="sourceLineNo">428</span>      this.connection.close();<a 
name="line.428"></a>
 <span class="sourceLineNo">429</span>    }<a name="line.429"></a>
-<span class="sourceLineNo">430</span><a name="line.430"></a>
-<span class="sourceLineNo">431</span>    for (HTableDescriptor table : tables) 
{<a name="line.431"></a>
-<span class="sourceLineNo">432</span>      HColumnDescriptor[] columns = 
table.getColumnFamilies();<a name="line.432"></a>
-<span class="sourceLineNo">433</span>      String tableName = 
table.getNameAsString();<a name="line.433"></a>
-<span class="sourceLineNo">434</span>      for (HColumnDescriptor column : 
columns) {<a name="line.434"></a>
-<span class="sourceLineNo">435</span>        if (column.getScope() != 
HConstants.REPLICATION_SCOPE_LOCAL) {<a name="line.435"></a>
-<span class="sourceLineNo">436</span>          // At this moment, the columfam 
is replicated to all peers<a name="line.436"></a>
-<span class="sourceLineNo">437</span>          HashMap&lt;String, String&gt; 
replicationEntry = new HashMap&lt;String, String&gt;();<a name="line.437"></a>
-<span class="sourceLineNo">438</span>          replicationEntry.put(TNAME, 
tableName);<a name="line.438"></a>
-<span class="sourceLineNo">439</span>          replicationEntry.put(CFNAME, 
column.getNameAsString());<a name="line.439"></a>
-<span class="sourceLineNo">440</span>          
replicationEntry.put(REPLICATIONTYPE,<a name="line.440"></a>
-<span class="sourceLineNo">441</span>              column.getScope() == 
HConstants.REPLICATION_SCOPE_GLOBAL ?<a name="line.441"></a>
-<span class="sourceLineNo">442</span>                  REPLICATIONGLOBAL :<a 
name="line.442"></a>
-<span class="sourceLineNo">443</span>                  REPLICATIONSERIAL);<a 
name="line.443"></a>
-<span class="sourceLineNo">444</span>          
replicationColFams.add(replicationEntry);<a name="line.444"></a>
-<span class="sourceLineNo">445</span>        }<a name="line.445"></a>
-<span class="sourceLineNo">446</span>      }<a name="line.446"></a>
-<span class="sourceLineNo">447</span>    }<a name="line.447"></a>
-<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span>    return replicationColFams;<a 
name="line.449"></a>
-<span class="sourceLineNo">450</span>  }<a name="line.450"></a>
-<span class="sourceLineNo">451</span><a name="line.451"></a>
-<span class="sourceLineNo">452</span>  /**<a name="line.452"></a>
-<span class="sourceLineNo">453</span>   * Enable a table's replication 
switch.<a name="line.453"></a>
-<span class="sourceLineNo">454</span>   * @param tableName name of the table<a 
name="line.454"></a>
-<span class="sourceLineNo">455</span>   * @throws IOException if a remote or 
network exception occurs<a name="line.455"></a>
-<span class="sourceLineNo">456</span>   */<a name="line.456"></a>
-<span class="sourceLineNo">457</span>  public void enableTableRep(final 
TableName tableName) throws IOException {<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    if (tableName == null) {<a 
name="line.458"></a>
-<span class="sourceLineNo">459</span>      throw new 
IllegalArgumentException("Table name cannot be null");<a name="line.459"></a>
-<span class="sourceLineNo">460</span>    }<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    try (Admin admin = 
this.connection.getAdmin()) {<a name="line.461"></a>
-<span class="sourceLineNo">462</span>      if (!admin.tableExists(tableName)) 
{<a name="line.462"></a>
-<span class="sourceLineNo">463</span>        throw new 
TableNotFoundException("Table '" + tableName.getNameAsString()<a 
name="line.463"></a>
-<span class="sourceLineNo">464</span>            + "' does not exists.");<a 
name="line.464"></a>
-<span class="sourceLineNo">465</span>      }<a name="line.465"></a>
-<span class="sourceLineNo">466</span>    }<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    byte[][] splits = 
getTableSplitRowKeys(tableName);<a name="line.467"></a>
-<span class="sourceLineNo">468</span>    
checkAndSyncTableDescToPeers(tableName, splits);<a name="line.468"></a>
-<span class="sourceLineNo">469</span>    setTableRep(tableName, true);<a 
name="line.469"></a>
-<span class="sourceLineNo">470</span>  }<a name="line.470"></a>
-<span class="sourceLineNo">471</span><a name="line.471"></a>
-<span class="sourceLineNo">472</span>  /**<a name="line.472"></a>
-<span class="sourceLineNo">473</span>   * Disable a table's replication 
switch.<a name="line.473"></a>
-<span class="sourceLineNo">474</span>   * @param tableName name of the table<a 
name="line.474"></a>
-<span class="sourceLineNo">475</span>   * @throws IOException if a remote or 
network exception occurs<a name="line.475"></a>
-<span class="sourceLineNo">476</span>   */<a name="line.476"></a>
-<span class="sourceLineNo">477</span>  public void disableTableRep(final 
TableName tableName) throws IOException {<a name="line.477"></a>
-<span class="sourceLineNo">478</span>    if (tableName == null) {<a 
name="line.478"></a>
-<span class="sourceLineNo">479</span>      throw new 
IllegalArgumentException("Table name is null");<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    }<a name="line.480"></a>
-<span class="sourceLineNo">481</span>    try (Admin admin = 
this.connection.getAdmin()) {<a name="line.481"></a>
-<span class="sourceLineNo">482</span>      if (!admin.tableExists(tableName)) 
{<a name="line.482"></a>
-<span class="sourceLineNo">483</span>        throw new 
TableNotFoundException("Table '" + tableName.getNamespaceAsString()<a 
name="line.483"></a>
-<span class="sourceLineNo">484</span>            + "' does not exists.");<a 
name="line.484"></a>
-<span class="sourceLineNo">485</span>      }<a name="line.485"></a>
-<span class="sourceLineNo">486</span>    }<a name="line.486"></a>
-<span class="sourceLineNo">487</span>    setTableRep(tableName, false);<a 
name="line.487"></a>
+<span class="sourceLineNo">430</span>    admin.close();<a name="line.430"></a>
+<span class="sourceLineNo">431</span>  }<a name="line.431"></a>
+<span class="sourceLineNo">432</span><a name="line.432"></a>
+<span class="sourceLineNo">433</span>  /**<a name="line.433"></a>
+<span class="sourceLineNo">434</span>   * Find all column families that are 
replicated from this cluster<a name="line.434"></a>
+<span class="sourceLineNo">435</span>   * @return the full list of the 
replicated column families of this cluster as:<a name="line.435"></a>
+<span class="sourceLineNo">436</span>   *        tableName, family name, 
replicationType<a name="line.436"></a>
+<span class="sourceLineNo">437</span>   *<a name="line.437"></a>
+<span class="sourceLineNo">438</span>   * Currently replicationType is Global. 
In the future, more replication<a name="line.438"></a>
+<span class="sourceLineNo">439</span>   * types may be extended here. For 
example<a name="line.439"></a>
+<span class="sourceLineNo">440</span>   *  1) the replication may only apply 
to selected peers instead of all peers<a name="line.440"></a>
+<span class="sourceLineNo">441</span>   *  2) the replicationType may indicate 
the host Cluster servers as Slave<a name="line.441"></a>
+<span class="sourceLineNo">442</span>   *     for the table:columnFam.<a 
name="line.442"></a>
+<span class="sourceLineNo">443</span>   * @deprecated use {@link 
org.apache.hadoop.hbase.client.Admin#listReplicatedTableCFs()} instead<a 
name="line.443"></a>
+<span class="sourceLineNo">444</span>   */<a name="line.444"></a>
+<span class="sourceLineNo">445</span>  @Deprecated<a name="line.445"></a>
+<span class="sourceLineNo">446</span>  public List&lt;HashMap&lt;String, 
String&gt;&gt; listReplicated() throws IOException {<a name="line.446"></a>
+<span class="sourceLineNo">447</span>    List&lt;HashMap&lt;String, 
String&gt;&gt; replicationColFams = new ArrayList&lt;&gt;();<a 
name="line.447"></a>
+<span class="sourceLineNo">448</span>    
admin.listReplicatedTableCFs().forEach(<a name="line.448"></a>
+<span class="sourceLineNo">449</span>      (tableCFs) -&gt; {<a 
name="line.449"></a>
+<span class="sourceLineNo">450</span>        String table = 
tableCFs.getTable().getNameAsString();<a name="line.450"></a>
+<span class="sourceLineNo">451</span>        tableCFs.getColumnFamilyMap()<a 
name="line.451"></a>
+<span class="sourceLineNo">452</span>            .forEach(<a 
name="line.452"></a>
+<span class="sourceLineNo">453</span>              (cf, scope) -&gt; {<a 
name="line.453"></a>
+<span class="sour

<TRUNCATED>

Reply via email to