http://git-wip-us.apache.org/repos/asf/hbase-site/blob/044b3379/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 a0f0e21..b4f5eb1 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
@@ -197,445 +197,481 @@
 <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>    
this.replicationPeers.registerPeer(id, peerConfig);<a name="line.192"></a>
-<span class="sourceLineNo">193</span>  }<a name="line.193"></a>
-<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span>  /**<a name="line.195"></a>
-<span class="sourceLineNo">196</span>   *  @deprecated as release of 2.0.0, 
and it will be removed in 3.0.0<a name="line.196"></a>
-<span class="sourceLineNo">197</span>   * */<a name="line.197"></a>
-<span class="sourceLineNo">198</span>  @Deprecated<a name="line.198"></a>
-<span class="sourceLineNo">199</span>  public static Map&lt;TableName, 
List&lt;String&gt;&gt; parseTableCFsFromConfig(String tableCFsConfig) {<a 
name="line.199"></a>
-<span class="sourceLineNo">200</span>    return 
ReplicationSerDeHelper.parseTableCFsFromConfig(tableCFsConfig);<a 
name="line.200"></a>
-<span class="sourceLineNo">201</span>  }<a name="line.201"></a>
-<span class="sourceLineNo">202</span><a name="line.202"></a>
-<span class="sourceLineNo">203</span>  public void updatePeerConfig(String id, 
ReplicationPeerConfig peerConfig)<a name="line.203"></a>
-<span class="sourceLineNo">204</span>      throws ReplicationException {<a 
name="line.204"></a>
-<span class="sourceLineNo">205</span>    
this.replicationPeers.updatePeerConfig(id, peerConfig);<a name="line.205"></a>
-<span class="sourceLineNo">206</span>  }<a name="line.206"></a>
-<span class="sourceLineNo">207</span>  /**<a name="line.207"></a>
-<span class="sourceLineNo">208</span>   * Removes a peer cluster and stops the 
replication to it.<a name="line.208"></a>
-<span class="sourceLineNo">209</span>   * @param id a short name that 
identifies the cluster<a name="line.209"></a>
-<span class="sourceLineNo">210</span>   */<a name="line.210"></a>
-<span class="sourceLineNo">211</span>  public void removePeer(String id) 
throws ReplicationException {<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    
this.replicationPeers.unregisterPeer(id);<a name="line.212"></a>
-<span class="sourceLineNo">213</span>  }<a name="line.213"></a>
-<span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span>  /**<a name="line.215"></a>
-<span class="sourceLineNo">216</span>   * Restart the replication stream to 
the specified peer.<a name="line.216"></a>
-<span class="sourceLineNo">217</span>   * @param id a short name that 
identifies the cluster<a name="line.217"></a>
-<span class="sourceLineNo">218</span>   */<a name="line.218"></a>
-<span class="sourceLineNo">219</span>  public void enablePeer(String id) 
throws ReplicationException {<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    
this.replicationPeers.enablePeer(id);<a name="line.220"></a>
-<span class="sourceLineNo">221</span>  }<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>   * Stop the replication stream to the 
specified peer.<a name="line.224"></a>
-<span class="sourceLineNo">225</span>   * @param id a short name that 
identifies the cluster<a name="line.225"></a>
-<span class="sourceLineNo">226</span>   */<a name="line.226"></a>
-<span class="sourceLineNo">227</span>  public void disablePeer(String id) 
throws ReplicationException {<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    
this.replicationPeers.disablePeer(id);<a name="line.228"></a>
-<span class="sourceLineNo">229</span>  }<a name="line.229"></a>
-<span class="sourceLineNo">230</span><a name="line.230"></a>
-<span class="sourceLineNo">231</span>  /**<a name="line.231"></a>
-<span class="sourceLineNo">232</span>   * Get the number of slave clusters the 
local cluster has.<a name="line.232"></a>
-<span class="sourceLineNo">233</span>   * @return number of slave clusters<a 
name="line.233"></a>
-<span class="sourceLineNo">234</span>   */<a name="line.234"></a>
-<span class="sourceLineNo">235</span>  public int getPeersCount() {<a 
name="line.235"></a>
-<span class="sourceLineNo">236</span>    return 
this.replicationPeers.getAllPeerIds().size();<a name="line.236"></a>
-<span class="sourceLineNo">237</span>  }<a name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span>  public Map&lt;String, 
ReplicationPeerConfig&gt; listPeerConfigs() {<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    return 
this.replicationPeers.getAllPeerConfigs();<a name="line.240"></a>
-<span class="sourceLineNo">241</span>  }<a name="line.241"></a>
-<span class="sourceLineNo">242</span><a name="line.242"></a>
-<span class="sourceLineNo">243</span>  public ReplicationPeerConfig 
getPeerConfig(String id) throws ReplicationException {<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    return 
this.replicationPeers.getReplicationPeerConfig(id);<a name="line.244"></a>
-<span class="sourceLineNo">245</span>  }<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>   * Get the replicable table-cf config 
of the specified peer.<a name="line.248"></a>
-<span class="sourceLineNo">249</span>   * @param id a short name that 
identifies the cluster<a name="line.249"></a>
-<span class="sourceLineNo">250</span>   * @deprecated as release of 2.0.0, and 
it will be removed in 3.0.0,<a name="line.250"></a>
-<span class="sourceLineNo">251</span>   * use {@link #getPeerConfig(String)} 
instead.<a name="line.251"></a>
-<span class="sourceLineNo">252</span>   * */<a name="line.252"></a>
-<span class="sourceLineNo">253</span>  @Deprecated<a name="line.253"></a>
-<span class="sourceLineNo">254</span>  public String getPeerTableCFs(String 
id) throws ReplicationException {<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    return 
ReplicationSerDeHelper.convertToString(this.replicationPeers.getPeerTableCFsConfig(id));<a
 name="line.255"></a>
-<span class="sourceLineNo">256</span>  }<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>   * Append the replicable table-cf 
config of the specified peer<a name="line.259"></a>
-<span class="sourceLineNo">260</span>   * @param id a short that identifies 
the cluster<a name="line.260"></a>
-<span class="sourceLineNo">261</span>   * @param tableCfs table-cfs config 
str<a name="line.261"></a>
-<span class="sourceLineNo">262</span>   * @throws ReplicationException<a 
name="line.262"></a>
-<span class="sourceLineNo">263</span>   * @deprecated as release of 2.0.0, and 
it will be removed in 3.0.0,<a name="line.263"></a>
-<span class="sourceLineNo">264</span>   * use {@link 
#appendPeerTableCFs(String, Map)} instead.<a name="line.264"></a>
-<span class="sourceLineNo">265</span>   */<a name="line.265"></a>
-<span class="sourceLineNo">266</span>  @Deprecated<a name="line.266"></a>
-<span class="sourceLineNo">267</span>  public void appendPeerTableCFs(String 
id, String tableCfs) throws ReplicationException {<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    appendPeerTableCFs(id, 
ReplicationSerDeHelper.parseTableCFsFromConfig(tableCfs));<a 
name="line.268"></a>
-<span class="sourceLineNo">269</span>  }<a name="line.269"></a>
-<span class="sourceLineNo">270</span><a name="line.270"></a>
-<span class="sourceLineNo">271</span>  /**<a name="line.271"></a>
-<span class="sourceLineNo">272</span>   * Append the replicable table-cf 
config of the specified peer<a name="line.272"></a>
-<span class="sourceLineNo">273</span>   * @param id a short that identifies 
the cluster<a name="line.273"></a>
-<span class="sourceLineNo">274</span>   * @param tableCfs A map from tableName 
to column family names<a name="line.274"></a>
-<span class="sourceLineNo">275</span>   * @throws ReplicationException<a 
name="line.275"></a>
-<span class="sourceLineNo">276</span>   */<a name="line.276"></a>
-<span class="sourceLineNo">277</span>  public void appendPeerTableCFs(String 
id, Map&lt;TableName, ? extends Collection&lt;String&gt;&gt; tableCfs)<a 
name="line.277"></a>
-<span class="sourceLineNo">278</span>      throws ReplicationException {<a 
name="line.278"></a>
-<span class="sourceLineNo">279</span>    if (tableCfs == null) {<a 
name="line.279"></a>
-<span class="sourceLineNo">280</span>      throw new 
ReplicationException("tableCfs is null");<a name="line.280"></a>
-<span class="sourceLineNo">281</span>    }<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    Map&lt;TableName, 
List&lt;String&gt;&gt; preTableCfs = 
this.replicationPeers.getPeerTableCFsConfig(id);<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    if (preTableCfs == null) {<a 
name="line.283"></a>
-<span class="sourceLineNo">284</span>      setPeerTableCFs(id, tableCfs);<a 
name="line.284"></a>
-<span class="sourceLineNo">285</span>      return;<a name="line.285"></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">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">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>    for (Map.Entry&lt;TableName, ? 
extends Collection&lt;String&gt;&gt; entry : tableCfs.entrySet()) {<a 
name="line.287"></a>
-<span class="sourceLineNo">288</span>      TableName table = entry.getKey();<a 
name="line.288"></a>
-<span class="sourceLineNo">289</span>      Collection&lt;String&gt; appendCfs 
= entry.getValue();<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      if (preTableCfs.containsKey(table)) 
{<a name="line.290"></a>
-<span class="sourceLineNo">291</span>        List&lt;String&gt; cfs = 
preTableCfs.get(table);<a name="line.291"></a>
-<span class="sourceLineNo">292</span>        if (cfs == null || appendCfs == 
null || appendCfs.isEmpty()) {<a name="line.292"></a>
-<span class="sourceLineNo">293</span>          preTableCfs.put(table, null);<a 
name="line.293"></a>
-<span class="sourceLineNo">294</span>        } else {<a name="line.294"></a>
-<span class="sourceLineNo">295</span>          Set&lt;String&gt; cfSet = new 
HashSet&lt;String&gt;(cfs);<a name="line.295"></a>
-<span class="sourceLineNo">296</span>          cfSet.addAll(appendCfs);<a 
name="line.296"></a>
-<span class="sourceLineNo">297</span>          preTableCfs.put(table, 
Lists.newArrayList(cfSet));<a name="line.297"></a>
-<span class="sourceLineNo">298</span>        }<a name="line.298"></a>
-<span class="sourceLineNo">299</span>      } else {<a name="line.299"></a>
-<span class="sourceLineNo">300</span>        if (appendCfs == null || 
appendCfs.isEmpty()) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span>          preTableCfs.put(table, null);<a 
name="line.301"></a>
-<span class="sourceLineNo">302</span>        } else {<a name="line.302"></a>
-<span class="sourceLineNo">303</span>          preTableCfs.put(table, 
Lists.newArrayList(appendCfs));<a name="line.303"></a>
-<span class="sourceLineNo">304</span>        }<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      }<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    }<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    setPeerTableCFs(id, preTableCfs);<a 
name="line.307"></a>
-<span class="sourceLineNo">308</span>  }<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>   * Remove some table-cfs from table-cfs 
config of the specified peer<a name="line.311"></a>
-<span class="sourceLineNo">312</span>   * @param id a short name that 
identifies the cluster<a name="line.312"></a>
-<span class="sourceLineNo">313</span>   * @param tableCf table-cfs config 
str<a name="line.313"></a>
-<span class="sourceLineNo">314</span>   * @throws ReplicationException<a 
name="line.314"></a>
-<span class="sourceLineNo">315</span>   * @deprecated as release of 2.0.0, and 
it will be removed in 3.0.0,<a name="line.315"></a>
-<span class="sourceLineNo">316</span>   * use {@link 
#removePeerTableCFs(String, Map)} instead.<a name="line.316"></a>
-<span class="sourceLineNo">317</span>   */<a name="line.317"></a>
-<span class="sourceLineNo">318</span>  @Deprecated<a name="line.318"></a>
-<span class="sourceLineNo">319</span>  public void removePeerTableCFs(String 
id, String tableCf) throws ReplicationException {<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    removePeerTableCFs(id, 
ReplicationSerDeHelper.parseTableCFsFromConfig(tableCf));<a name="line.320"></a>
-<span class="sourceLineNo">321</span>  }<a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span>  /**<a name="line.323"></a>
-<span class="sourceLineNo">324</span>   * Remove some table-cfs from config of 
the specified peer<a name="line.324"></a>
-<span class="sourceLineNo">325</span>   * @param id a short name that 
identifies the cluster<a name="line.325"></a>
-<span class="sourceLineNo">326</span>   * @param tableCfs A map from tableName 
to column family names<a name="line.326"></a>
-<span class="sourceLineNo">327</span>   * @throws ReplicationException<a 
name="line.327"></a>
-<span class="sourceLineNo">328</span>   */<a name="line.328"></a>
-<span class="sourceLineNo">329</span>  public void removePeerTableCFs(String 
id, Map&lt;TableName, ? extends Collection&lt;String&gt;&gt; tableCfs)<a 
name="line.329"></a>
-<span class="sourceLineNo">330</span>      throws ReplicationException {<a 
name="line.330"></a>
-<span class="sourceLineNo">331</span>    if (tableCfs == null) {<a 
name="line.331"></a>
-<span class="sourceLineNo">332</span>      throw new 
ReplicationException("tableCfs is null");<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    }<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    Map&lt;TableName, 
List&lt;String&gt;&gt; preTableCfs = 
this.replicationPeers.getPeerTableCFsConfig(id);<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    if (preTableCfs == null) {<a 
name="line.335"></a>
-<span class="sourceLineNo">336</span>      throw new 
ReplicationException("Table-Cfs for peer" + id + " is null");<a 
name="line.336"></a>
-<span class="sourceLineNo">337</span>    }<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    for (Map.Entry&lt;TableName, ? 
extends Collection&lt;String&gt;&gt; entry: tableCfs.entrySet()) {<a 
name="line.338"></a>
-<span class="sourceLineNo">339</span><a name="line.339"></a>
-<span class="sourceLineNo">340</span>      TableName table = entry.getKey();<a 
name="line.340"></a>
-<span class="sourceLineNo">341</span>      Collection&lt;String&gt; removeCfs 
= entry.getValue();<a name="line.341"></a>
-<span class="sourceLineNo">342</span>      if (preTableCfs.containsKey(table)) 
{<a name="line.342"></a>
-<span class="sourceLineNo">343</span>        List&lt;String&gt; cfs = 
preTableCfs.get(table);<a name="line.343"></a>
-<span class="sourceLineNo">344</span>        if (cfs == null &amp;&amp; 
(removeCfs == null || removeCfs.isEmpty())) {<a name="line.344"></a>
-<span class="sourceLineNo">345</span>          preTableCfs.remove(table);<a 
name="line.345"></a>
-<span class="sourceLineNo">346</span>        } else if (cfs != null &amp;&amp; 
(removeCfs != null &amp;&amp; !removeCfs.isEmpty())) {<a name="line.346"></a>
-<span class="sourceLineNo">347</span>          Set&lt;String&gt; cfSet = new 
HashSet&lt;String&gt;(cfs);<a name="line.347"></a>
-<span class="sourceLineNo">348</span>          cfSet.removeAll(removeCfs);<a 
name="line.348"></a>
-<span class="sourceLineNo">349</span>          if (cfSet.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 {<a name="line.351"></a>
-<span class="sourceLineNo">352</span>            preTableCfs.put(table, 
Lists.newArrayList(cfSet));<a name="line.352"></a>
-<span class="sourceLineNo">353</span>          }<a name="line.353"></a>
-<span class="sourceLineNo">354</span>        } else if (cfs == null &amp;&amp; 
(removeCfs != null &amp;&amp; !removeCfs.isEmpty())) {<a name="line.354"></a>
-<span class="sourceLineNo">355</span>          throw new 
ReplicationException("Cannot remove cf of table: " + table<a 
name="line.355"></a>
-<span class="sourceLineNo">356</span>              + " which doesn't specify 
cfs from table-cfs config in peer: " + id);<a name="line.356"></a>
-<span class="sourceLineNo">357</span>        } else if (cfs != null &amp;&amp; 
(removeCfs == null || removeCfs.isEmpty())) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span>          throw new 
ReplicationException("Cannot remove table: " + table<a name="line.358"></a>
-<span class="sourceLineNo">359</span>              + " which has specified cfs 
from table-cfs config in peer: " + id);<a name="line.359"></a>
-<span class="sourceLineNo">360</span>        }<a name="line.360"></a>
-<span class="sourceLineNo">361</span>      } else {<a name="line.361"></a>
-<span class="sourceLineNo">362</span>        throw new 
ReplicationException("No table: " + table + " in table-cfs config of peer: " + 
id);<a name="line.362"></a>
-<span class="sourceLineNo">363</span><a name="line.363"></a>
-<span class="sourceLineNo">364</span>      }<a name="line.364"></a>
-<span class="sourceLineNo">365</span>    }<a name="line.365"></a>
-<span class="sourceLineNo">366</span>    setPeerTableCFs(id, preTableCfs);<a 
name="line.366"></a>
-<span class="sourceLineNo">367</span>  }<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>   * Set the replicable table-cf config 
of the specified peer<a name="line.370"></a>
-<span class="sourceLineNo">371</span>   * @param id a short name that 
identifies the cluster<a name="line.371"></a>
-<span class="sourceLineNo">372</span>   * @param tableCfs the table and 
column-family list which will be replicated for this peer.<a 
name="line.372"></a>
-<span class="sourceLineNo">373</span>   * A map from tableName to column 
family names. An empty collection can be passed<a name="line.373"></a>
-<span class="sourceLineNo">374</span>   * to indicate replicating all column 
families. Pass null for replicating all table and column<a name="line.374"></a>
-<span class="sourceLineNo">375</span>   * families<a name="line.375"></a>
-<span class="sourceLineNo">376</span>   */<a name="line.376"></a>
-<span class="sourceLineNo">377</span>  public void setPeerTableCFs(String id, 
Map&lt;TableName, ? extends Collection&lt;String&gt;&gt; tableCfs)<a 
name="line.377"></a>
-<span class="sourceLineNo">378</span>      throws ReplicationException {<a 
name="line.378"></a>
-<span class="sourceLineNo">379</span>    
this.replicationPeers.setPeerTableCFsConfig(id, tableCfs);<a 
name="line.379"></a>
-<span class="sourceLineNo">380</span>  }<a name="line.380"></a>
-<span class="sourceLineNo">381</span><a name="line.381"></a>
-<span class="sourceLineNo">382</span>  /**<a name="line.382"></a>
-<span class="sourceLineNo">383</span>   * Get the state of the specified peer 
cluster<a name="line.383"></a>
-<span class="sourceLineNo">384</span>   * @param id String format of the Short 
name that identifies the peer,<a name="line.384"></a>
-<span class="sourceLineNo">385</span>   * an IllegalArgumentException is 
thrown if it doesn't exist<a name="line.385"></a>
-<span class="sourceLineNo">386</span>   * @return true if replication is 
enabled to that peer, false if it isn't<a name="line.386"></a>
-<span class="sourceLineNo">387</span>   */<a name="line.387"></a>
-<span class="sourceLineNo">388</span>  public boolean getPeerState(String id) 
throws ReplicationException {<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    return 
this.replicationPeers.getStatusOfPeerFromBackingStore(id);<a 
name="line.389"></a>
-<span class="sourceLineNo">390</span>  }<a name="line.390"></a>
-<span class="sourceLineNo">391</span><a name="line.391"></a>
-<span class="sourceLineNo">392</span>  @Override<a name="line.392"></a>
-<span class="sourceLineNo">393</span>  public void close() throws IOException 
{<a name="line.393"></a>
-<span class="sourceLineNo">394</span>    if (this.zkw != null) {<a 
name="line.394"></a>
-<span class="sourceLineNo">395</span>      this.zkw.close();<a 
name="line.395"></a>
-<span class="sourceLineNo">396</span>    }<a name="line.396"></a>
-<span class="sourceLineNo">397</span>    if (this.connection != null) {<a 
name="line.397"></a>
-<span class="sourceLineNo">398</span>      this.connection.close();<a 
name="line.398"></a>
-<span class="sourceLineNo">399</span>    }<a name="line.399"></a>
-<span class="sourceLineNo">400</span>  }<a name="line.400"></a>
-<span class="sourceLineNo">401</span><a name="line.401"></a>
-<span class="sourceLineNo">402</span><a name="line.402"></a>
-<span class="sourceLineNo">403</span>  /**<a name="line.403"></a>
-<span class="sourceLineNo">404</span>   * Find all column families that are 
replicated from this cluster<a name="line.404"></a>
-<span class="sourceLineNo">405</span>   * @return the full list of the 
replicated column families of this cluster as:<a name="line.405"></a>
-<span class="sourceLineNo">406</span>   *        tableName, family name, 
replicationType<a name="line.406"></a>
-<span class="sourceLineNo">407</span>   *<a name="line.407"></a>
-<span class="sourceLineNo">408</span>   * Currently replicationType is Global. 
In the future, more replication<a name="line.408"></a>
-<span class="sourceLineNo">409</span>   * types may be extended here. For 
example<a name="line.409"></a>
-<span class="sourceLineNo">410</span>   *  1) the replication may only apply 
to selected peers instead of all peers<a name="line.410"></a>
-<span class="sourceLineNo">411</span>   *  2) the replicationType may indicate 
the host Cluster servers as Slave<a name="line.411"></a>
-<span class="sourceLineNo">412</span>   *     for the table:columnFam.<a 
name="line.412"></a>
-<span class="sourceLineNo">413</span>   */<a name="line.413"></a>
-<span class="sourceLineNo">414</span>  public List&lt;HashMap&lt;String, 
String&gt;&gt; listReplicated() throws IOException {<a name="line.414"></a>
-<span class="sourceLineNo">415</span>    List&lt;HashMap&lt;String, 
String&gt;&gt; replicationColFams = new ArrayList&lt;HashMap&lt;String, 
String&gt;&gt;();<a name="line.415"></a>
-<span class="sourceLineNo">416</span><a name="line.416"></a>
-<span class="sourceLineNo">417</span>    Admin admin = 
connection.getAdmin();<a name="line.417"></a>
-<span class="sourceLineNo">418</span>    HTableDescriptor[] tables;<a 
name="line.418"></a>
-<span class="sourceLineNo">419</span>    try {<a name="line.419"></a>
-<span class="sourceLineNo">420</span>      tables = admin.listTables();<a 
name="line.420"></a>
-<span class="sourceLineNo">421</span>    } finally {<a name="line.421"></a>
-<span class="sourceLineNo">422</span>      if (admin!= null) admin.close();<a 
name="line.422"></a>
-<span class="sourceLineNo">423</span>    }<a name="line.423"></a>
-<span class="sourceLineNo">424</span><a name="line.424"></a>
-<span class="sourceLineNo">425</span>    for (HTableDescriptor table : tables) 
{<a name="line.425"></a>
-<span class="sourceLineNo">426</span>      HColumnDescriptor[] columns = 
table.getColumnFamilies();<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      String tableName = 
table.getNameAsString();<a name="line.427"></a>
-<span class="sourceLineNo">428</span>      for (HColumnDescriptor column : 
columns) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span>        if (column.getScope() != 
HConstants.REPLICATION_SCOPE_LOCAL) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span>          // At this moment, the columfam 
is replicated to all peers<a name="line.430"></a>
-<span class="sourceLineNo">431</span>          HashMap&lt;String, String&gt; 
replicationEntry = new HashMap&lt;String, String&gt;();<a name="line.431"></a>
-<span class="sourceLineNo">432</span>          replicationEntry.put(TNAME, 
tableName);<a name="line.432"></a>
-<span class="sourceLineNo">433</span>          replicationEntry.put(CFNAME, 
column.getNameAsString());<a name="line.433"></a>
-<span class="sourceLineNo">434</span>          
replicationEntry.put(REPLICATIONTYPE,<a name="line.434"></a>
-<span class="sourceLineNo">435</span>              column.getScope() == 
HConstants.REPLICATION_SCOPE_GLOBAL ?<a name="line.435"></a>
-<span class="sourceLineNo">436</span>                  REPLICATIONGLOBAL :<a 
name="line.436"></a>
-<span class="sourceLineNo">437</span>                  REPLICATIONSERIAL);<a 
name="line.437"></a>
-<span class="sourceLineNo">438</span>          
replicationColFams.add(replicationEntry);<a name="line.438"></a>
-<span class="sourceLineNo">439</span>        }<a name="line.439"></a>
-<span class="sourceLineNo">440</span>      }<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    }<a name="line.441"></a>
-<span class="sourceLineNo">442</span><a name="line.442"></a>
-<span class="sourceLineNo">443</span>    return replicationColFams;<a 
name="line.443"></a>
-<span class="sourceLineNo">444</span>  }<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>   * Enable a table's replication 
switch.<a name="line.447"></a>
-<span class="sourceLineNo">448</span>   * @param tableName name of the table<a 
name="line.448"></a>
-<span class="sourceLineNo">449</span>   * @throws IOException if a remote or 
network exception occurs<a name="line.449"></a>
-<span class="sourceLineNo">450</span>   */<a name="line.450"></a>
-<span class="sourceLineNo">451</span>  public void enableTableRep(final 
TableName tableName) throws IOException {<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    if (tableName == null) {<a 
name="line.452"></a>
-<span class="sourceLineNo">453</span>      throw new 
IllegalArgumentException("Table name cannot be null");<a name="line.453"></a>
-<span class="sourceLineNo">454</span>    }<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    try (Admin admin = 
this.connection.getAdmin()) {<a name="line.455"></a>
-<span class="sourceLineNo">456</span>      if (!admin.tableExists(tableName)) 
{<a name="line.456"></a>
-<span class="sourceLineNo">457</span>        throw new 
TableNotFoundException("Table '" + tableName.getNameAsString()<a 
name="line.457"></a>
-<span class="sourceLineNo">458</span>            + "' does not exists.");<a 
name="line.458"></a>
-<span class="sourceLineNo">459</span>      }<a name="line.459"></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">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">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>    byte[][] splits = 
getTableSplitRowKeys(tableName);<a name="line.461"></a>
-<span class="sourceLineNo">462</span>    
checkAndSyncTableDescToPeers(tableName, splits);<a name="line.462"></a>
-<span class="sourceLineNo">463</span>    setTableRep(tableName, true);<a 
name="line.463"></a>
-<span class="sourceLineNo">464</span>  }<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>   * Disable a table's replication 
switch.<a name="line.467"></a>
-<span class="sourceLineNo">468</span>   * @param tableName name of the table<a 
name="line.468"></a>
-<span class="sourceLineNo">469</span>   * @throws IOException if a remote or 
network exception occurs<a name="line.469"></a>
-<span class="sourceLineNo">470</span>   */<a name="line.470"></a>
-<span class="sourceLineNo">471</span>  public void disableTableRep(final 
TableName tableName) throws IOException {<a name="line.471"></a>
-<span class="sourceLineNo">472</span>    if (tableName == null) {<a 
name="line.472"></a>
-<span class="sourceLineNo">473</span>      throw new 
IllegalArgumentException("Table name is null");<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    }<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    try (Admin admin = 
this.connection.getAdmin()) {<a name="line.475"></a>
-<span class="sourceLineNo">476</span>      if (!admin.tableExists(tableName)) 
{<a name="line.476"></a>
-<span class="sourceLineNo">477</span>        throw new 
TableNotFoundException("Table '" + tableName.getNamespaceAsString()<a 
name="line.477"></a>
-<span class="sourceLineNo">478</span>            + "' does not exists.");<a 
name="line.478"></a>
-<span class="sourceLineNo">479</span>      }<a name="line.479"></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>    setTableRep(tableName, false);<a 
name="line.481"></a>
-<span class="sourceLineNo">482</span>  }<a name="line.482"></a>
-<span class="sourceLineNo">483</span><a name="line.483"></a>
-<span class="sourceLineNo">484</span>  /**<a name="line.484"></a>
-<span class="sourceLineNo">485</span>   * Get the split row keys of table<a 
name="line.485"></a>
-<span class="sourceLineNo">486</span>   * @param tableName table name<a 
name="line.486"></a>
-<span class="sourceLineNo">487</span>   * @return array of split row keys<a 
name="line.487"></a>
-<span class="sourceLineNo">488</span>   * @throws IOException<a 
name="line.488"></a>
-<span class="sourceLineNo">489</span>   */<a name="line.489"></a>
-<span class="sourceLineNo">490</span>  private byte[][] 
getTableSplitRowKeys(TableName tableName) throws IOException {<a 
name="line.490"></a>
-<span class="sourceLineNo">491</span>    try (RegionLocator locator = 
connection.getRegionLocator(tableName);) {<a name="line.491"></a>
-<span class="sourceLineNo">492</span>      byte[][] startKeys = 
locator.getStartKeys();<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      if (startKeys.length == 1) {<a 
name="line.493"></a>
-<span class="sourceLineNo">494</span>        return null;<a 
name="line.494"></a>
-<span class="sourceLineNo">495</span>      }<a name="line.495"></a>
-<span class="sourceLineNo">496</span>      byte[][] splits = new 
byte[startKeys.length - 1][];<a name="line.496"></a>
-<span class="sourceLineNo">497</span>      for (int i = 1; i &lt; 
startKeys.length; i++) {<a name="line.497"></a>
-<span class="sourceLineNo">498</span>        splits[i - 1] = startKeys[i];<a 
name="line.498"></a>
-<span class="sourceLineNo">499</span>      }<a name="line.499"></a>
-<span class="sourceLineNo">500</span>      return splits;<a 
name="line.500"></a>
-<span class="sourceLineNo">501</span>    }<a name="line.501"></a>
-<span class="sourceLineNo">502</span>  }<a name="line.502"></a>
-<span class="sourceLineNo">503</span><a name="line.503"></a>
-<span class="sourceLineNo">504</span>  /**<a name="line.504"></a>
-<span class="sourceLineNo">505</span>   * Connect to peer and check the table 
descriptor on peer:<a name="line.505"></a>
-<span class="sourceLineNo">506</span>   * &lt;ol&gt;<a name="line.506"></a>
-<span class="sourceLineNo">507</span>   * &lt;li&gt;Create the same table on 
peer when not exist.&lt;/li&gt;<a name="line.507"></a>
-<span class="sourceLineNo">508</span>   * &lt;li&gt;Throw exception if the 
table exists on peer cluster but descriptors are not same.&lt;/li&gt;<a 
name="line.508"></a>
-<span class="sourceLineNo">509</span>   * &lt;/ol&gt;<a name="line.509"></a>
-<span class="sourceLineNo">510</span>   * @param tableName name of the table 
to sync to the peer<a name="line.510"></a>
-<span class="sourceLineNo">511</span>   * @param splits table split keys<a 
name="line.511"></a>
-<span class="sourceLineNo">512</span>   * @throws IOException<a 
name="line.512"></a>
-<span class="sourceLineNo">513</span>   */<a name="line.513"></a>
-<span class="sourceLineNo">514</span>  private void 
checkAndSyncTableDescToPeers(final TableName tableName, final byte[][] 
splits)<a name="line.514"></a>
-<span class="sourceLineNo">515</span>      throws IOException {<a 
name="line.515"></a>
-<span class="sourceLineNo">516</span>    List&lt;ReplicationPeer&gt; repPeers 
= listReplicationPeers();<a name="line.516"></a>
-<span class="sourceLineNo">517</span>    if (repPeers == null || 
repPeers.size() &lt;= 0) {<a name="line.517"></a>
-<span class="sourceLineNo">518</span>      throw new 
IllegalArgumentException("Found no peer cluster for replication.");<a 
name="line.518"></a>
-<span class="sourceLineNo">519</span>    }<a name="line.519"></a>
-<span class="sourceLineNo">520</span><a name="line.520"></a>
-<span class="sourceLineNo">521</span>    final TableName 
onlyTableNameQualifier = TableName.valueOf(tableName.getQualifierAsString());<a 
name="line.521"></a>
-<span class="sourceLineNo">522</span><a name="line.522"></a>
-<span class="sourceLineNo">523</span>    for (ReplicationPeer repPeer : 
repPeers) {<a name="line.523"></a>
-<span class="sourceLineNo">524</span>      Map&lt;TableName, 
List&lt;String&gt;&gt; tableCFMap = repPeer.getTableCFs();<a 
name="line.524"></a>
-<span class="sourceLineNo">525</span>      // TODO Currently peer TableCFs 
will not include namespace so we need to check only for table<a 
name="line.525"></a>
-<span class="sourceLineNo">526</span>      // name without namespace in it. 
Need to correct this logic once we fix HBASE-11386.<a name="line.526"></a>
-<span class="sourceLineNo">527</span>      if (tableCFMap != null &amp;&amp; 
!tableCFMap.containsKey(onlyTableNameQualifier)) {<a name="line.527"></a>
-<span class="sourceLineNo">528</span>        continue;<a name="line.528"></a>
-<span class="sourceLineNo">529</span>      }<a name="line.529"></a>
-<span class="sourceLineNo">530</span><a name="line.530"></a>
-<span class="sourceLineNo">531</span>      Configuration peerConf = 
repPeer.getConfiguration();<a name="line.531"></a>
-<span class="sourceLineNo">532</span>      HTableDescriptor htd = null;<a 
name="line.532"></a>
-<span class="sourceLineNo">533</span>      try (Connection conn = 
ConnectionFactory.createConnection(peerConf);<a name="line.533"></a>
-<span class="sourceLineNo">534</span>          Admin admin = 
this.connection.getAdmin();<a name="line.534"></a>
-<span class="sourceLineNo">535</span>          Admin repHBaseAdmin = 
conn.getAdmin()) {<a name="line.535"></a>
-<span class="sourceLineNo">536</span>        htd = 
admin.getTableDescriptor(tableName);<a name="line.536"></a>
-<span class="sourceLineNo">537</span>        HTableDescriptor peerHtd = 
null;<a name="line.537"></a>
-<span class="sourceLineNo">538</span>        if 
(!repHBaseAdmin.tableExists(tableName)) {<a name="line.538"></a>
-<span class="sourceLineNo">539</span>          repHBaseAdmin.createTable(htd, 
splits);<a name="line.539"></a>
-<span class="sourceLineNo">540</span>        } else {<a name="line.540"></a>
-<span class="sourceLineNo">541</span>          peerHtd = 
repHBaseAdmin.getTableDescriptor(tableName);<a name="line.541"></a>
-<span class="sourceLineNo">542</span>          if (peerHtd == null) {<a 
name="line.542"></a>
-<span class="sourceLineNo">543</span>            throw new 
IllegalArgumentException("Failed to get table descriptor for table "<a 
name="line.543"></a>
-<span class="sourceLineNo">544</span>                + 
tableName.getNameAsString() + " from peer cluster " + repPeer.getId());<a 
name="line.544"></a>
-<span class="sourceLineNo">545</span>          } else if 
(!peerHtd.equals(htd)) {<a name="line.545"></a>
-<span class="sourceLineNo">546</span>            throw new 
IllegalArgumentException("Table " + tableName.getNameAsString()<a 
name="line.546"></a>
-<span class="sourceLineNo">547</span>                + " exists in peer 
cluster " + repPeer.getId()<a name="line.547"></a>
-<span class="sourceLineNo">548</span>                + ", but the table 
descriptors are not same when comapred with source cluster."<a 
name="line.548"></a>
-<span class="sourceLineNo">549</span>                + " Thus can not enable 
the table's replication switch.");<a name="line.549"></a>
-<span class="sourceLineNo">550</span>          }<a name="line.550"></a>
-<span class="sourceLineNo">551</span>        }<a name="line.551"></a>
-<span class="sourceLineNo">552</span>      }<a name="line.552"></a>
-<span class="sourceLineNo">553</span>    }<a name="line.553"></a>
-<span class="sourceLineNo">554</span>  }<a name="line.554"></a>
-<span class="sourceLineNo">555</span><a name="line.555"></a>
-<span class="sourceLineNo">556</span>  @VisibleForTesting<a 
name="line.556"></a>
-<span class="sourceLineNo">557</span>  public void peerAdded(String id) throws 
ReplicationException {<a name="line.557"></a>
-<span class="sourceLineNo">558</span>    
this.replicationPeers.peerConnected(id);<a name="line.558"></a>
-<span class="sourceLineNo">559</span>  }<a name="line.559"></a>
-<span class="sourceLineNo">560</span><a name="line.560"></a>
-<span class="sourceLineNo">561</span>  @VisibleForTesting<a 
name="line.561"></a>
-<span class="sourceLineNo">562</span>  List&lt;ReplicationPeer&gt; 
listReplicationPeers() {<a name="line.562"></a>
-<span class="sourceLineNo">563</span>    Map&lt;String, 
ReplicationPeerConfig&gt; peers = listPeerConfigs();<a name="line.563"></a>
-<span class="sourceLineNo">564</span>    if (peers == null || peers.size() 
&lt;= 0) {<a name="line.564"></a>
-<span class="sourceLineNo">565</span>      return null;<a name="line.565"></a>
-<span class="sourceLineNo">566</span>    }<a name="line.566"></a>
-<span class="sourceLineNo">567</span>    List&lt;ReplicationPeer&gt; 
listOfPeers = new ArrayList&lt;ReplicationPeer&gt;(peers.size());<a 
name="line.567"></a>
-<span class="sourceLineNo">568</span>    for (Entry&lt;String, 
ReplicationPeerConfig&gt; peerEntry : peers.entrySet()) {<a name="line.568"></a>
-<span class="sourceLineNo">569</span>      String peerId = 
peerEntry.getKey();<a name="line.569"></a>
-<span class="sourceLineNo">570</span>      try {<a name="line.570"></a>
-<span class="sourceLineNo">571</span>        Pair&lt;ReplicationPeerConfig, 
Configuration&gt; pair = this.replicationPeers.getPeerConf(peerId);<a 
name="line.571"></a>
-<span class="sourceLineNo">572</span>        Configuration peerConf = 
pair.getSecond();<a name="line.572"></a>
-<span class="sourceLineNo">573</span>        ReplicationPeer peer = new 
ReplicationPeerZKImpl(zkw, pair.getSecond(),<a name="line.573"></a>
-<span class="sourceLineNo">574</span>          peerId, pair.getFirst(), 
this.connection);<a name="line.574"></a>
-<span class="sourceLineNo">575</span>        listOfPeers.add(peer);<a 
name="line.575"></a>
-<span class="sourceLineNo">576</span>      } catch (ReplicationException e) 
{<a name="line.576"></a>
-<span class="sourceLineNo">577</span>        LOG.warn("Failed to get valid 
replication peers. "<a name="line.577"></a>
-<span class="sourceLineNo">578</span>            + "Error connecting to peer 
cluster with peerId=" + peerId + ". Error message="<a name="line.578"></a>
-<span class="sourceLineNo">579</span>            + e.getMessage());<a 
name="line.579"></a>
-<span class="sourceLineNo">580</span>        LOG.debug("Failure details to get 
valid replication peers.", e);<a name="line.580"></a>
-<span class="sourceLineNo">581</span>        continue;<a name="line.581"></a>
-<span class="sourceLineNo">582</span>      }<a name="line.582"></a>
-<span class="sourceLineNo">583</span>    }<a name="line.583"></a>
-<span class="sourceLineNo">584</span>    return listOfPeers;<a 
name="line.584"></a>
-<span class="sourceLineNo">585</span>  }<a name="line.585"></a>
-<span class="sourceLineNo">586</span><a name="line.586"></a>
-<span class="sourceLineNo">587</span>  /**<a name="line.587"></a>
-<span class="sourceLineNo">588</span>   * Set the table's replication switch 
if the table's replication switch is already not set.<a name="line.588"></a>
-<span class="sourceLineNo">589</span>   * @param tableName name of the table<a 
name="line.589"></a>
-<span class="sourceLineNo">590</span>   * @param isRepEnabled is replication 
switch enable or disable<a name="line.590"></a>
-<span class="sourceLineNo">591</span>   * @throws IOException if a remote or 
network exception occurs<a name="line.591"></a>
-<span class="sourceLineNo">592</span>   */<a name="line.592"></a>
-<span class="sourceLineNo">593</span>  private void setTableRep(final 
TableName tableName, boolean isRepEnabled) throws IOException {<a 
name="line.593"></a>
-<span class="sourceLineNo">594</span>    Admin admin = null;<a 
name="line.594"></a>
-<span class="sourceLineNo">595</span>    try {<a name="line.595"></a>
-<span class="sourceLineNo">596</span>      admin = 
this.connection.getAdmin();<a name="line.596"></a>
-<span class="sourceLineNo">597</span>      HTableDescriptor htd = 
admin.getTableDescriptor(tableName);<a name="line.597"></a>
-<span class="sourceLineNo">598</span>      if (isTableRepEnabled(htd) ^ 
isRepEnabled) {<a name="line.598"></a>
-<span class="sourceLineNo">599</span>        for (HColumnDescriptor hcd : 
htd.getFamilies()) {<a name="line.599"></a>
-<span class="sourceLineNo">600</span>          hcd.setScope(isRepEnabled ? 
HConstants.REPLICATION_SCOPE_GLOBAL<a name="line.600"></a>
-<span class="sourceLineNo">601</span>              : 
HConstants.REPLICATION_SCOPE_LOCAL);<a name="line.601"></a>
-<span class="sourceLineNo">602</span>        }<a name="line.602"></a>
-<span class="sourceLineNo">603</span>        admin.modifyTable(tableName, 
htd);<a name="line.603"></a>
-<span class="sourceLineNo">604</span>      }<a name="line.604"></a>
-<span class="sourceLineNo">605</span>    } finally {<a name="line.605"></a>
-<span class="sourceLineNo">606</span>      if (admin != null) {<a 
name="line.606"></a>
-<span class="sourceLineNo">607</span>        try {<a name="line.607"></a>
-<span class="sourceLineNo">608</span>          admin.close();<a 
name="line.608"></a>
-<span class="sourceLineNo">609</span>        } catch (IOException e) {<a 
name="line.609"></a>
-<span class="sourceLineNo">610</span>          LOG.warn("Failed to close admin 
connection.");<a name="line.610"></a>
-<span class="sourceLineNo">611</span>          LOG.debug("Details on failure 
to close admin connection.", e);<a name="line.611"></a>
-<span class="sourceLineNo">612</span>        }<a name="line.612"></a>
-<span class="sourceLineNo">613</span>      }<a name="line.613"></a>
-<span class="sourceLineNo">614</span>    }<a name="line.614"></a>
-<span class="sourceLineNo">615</span>  }<a name="line.615"></a>
-<span class="sourceLineNo">616</span><a name="line.616"></a>
-<span class="sourceLineNo">617</span>  /**<a name="line.617"></a>
-<span class="sourceLineNo">618</span>   * @param htd table descriptor details 
for the table to check<a name="line.618"></a>
-<span class="sourceLineNo">619</span>   * @return true if table's replication 
switch is enabled<a name="line.619"></a>
-<span class="sourceLineNo">620</span>   */<a name="line.620"></a>
-<span class="sourceLineNo">621</span>  private boolean 
isTableRepEnabled(HTableDescriptor htd) {<a name="line.621"></a>
-<span class="sourceLineNo">622</span>    for (HColumnDescriptor hcd : 
htd.getFamilies()) {<a name="line.622"></a>
-<span class="sourceLineNo">623</span>      if (hcd.getScope() != 
HConstants.REPLICATION_SCOPE_GLOBAL<a name="line.623"></a>
-<span class="sourceLineNo">624</span>          &amp;&amp; hcd.getScope() != 
HConstants.REPLICATION_SCOPE_SERIAL) {<a name="line.624"></a>
-<span class="sourceLineNo">625</span>        return false;<a 
name="line.625"></a>
-<span class="sourceLineNo">626</span>      }<a name="line.626"></a>
-<span class="sourceLineNo">627</span>    }<a name="line.627"></a>
-<span class="sourceLineNo">628</span>    return true;<a name="line.628"></a>
-<span class="sourceLineNo">629</span>  }<a name="line.629"></a>
-<span class="sourceLineNo">630</span>}<a name="line.630"></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">488</span>  }<a name="line.488"></a>
+<span class="sourceLineNo">489</span><a name="line.489"></a>
+<span class="sourceLineNo">490</span>  /**<a name="line.490"></a>
+<span class="sourceLineNo">491</span>   * Get the split row keys of table<a 
name="line.491"></a>
+<span class="sourceLineNo">492</span>   * @param tableName table name<a 
name="line.492"></a>
+<span class="sourceLineNo">493</span>   * @return array of split row keys<a 
name="line.493"></a>
+<span class="sourceLineNo">494</span>   * @throws IOException<a 
name="line.494"></a>
+<span class="sourceLineNo">495</span>   */<a name="line.495"></a>
+<span class="sourceLineNo">496</span>  private byte[][] 
getTableSplitRowKeys(TableName tableName) throws IOException {<a 
name="line.496"></a>
+<span class="sourceLineNo">497</span>    try (RegionLocator locator = 
connection.getRegionLocator(tableName);) {<a name="line.497"></a>
+<span class="sourceLineNo">498</span>      byte[][] startKeys = 
locator.getStartKeys();<a name="line.498"></a>
+<span class="sourceLineNo">499</span>      if (startKeys.length == 1) {<a 
name="line.499"></a>
+<span class="sourceLineNo">500</span>        return null;<a 
name="line.500"></a>
+<span class="sourceLineNo">501</span>      }<a name="line.501"></a>
+<span class="sourceLineNo">502</span>      byte[][] splits = new 
byte[startKeys.length - 1][];<a name="line.502"></a>
+<span class="sourceLineNo">503</span>      for (int i = 1; i &lt; 
startKeys.length; i++) {<a name="line.503"></a>
+<span class="sourceLineNo">504</span>        splits[i - 1] = startKeys[i];<a 
name="line.504"></a>
+<span class="sourceLineNo">505</span>      }<a name="line.505"></a>
+<span class="sourceLineNo">506</span>      return splits;<a 
name="line.506"></a>
+<span class="sourceLineNo">507</span>    }<a name="line.507"></a>
+<span class="sourceLineNo">508</span>  }<a name="line.508"></a>
+<span class="sourceLineNo">509</span><a name="line.509"></a>
+<span class="sourceLineNo">510</span>  /**<a name="line.510"></a>
+<span class="sourceLineNo">511</span>   * Connect to peer and check the table 
descriptor on peer:<a name="line.511"></a>
+<span class="sourceLineNo">512</span>   * &lt;ol&gt;<a name="line.512"></a>
+<span class="sourceLineNo">513</span>   * &lt;li&gt;Create the same table on 
peer when not exist.&lt;/li&gt;<a name="line.513"></a>
+<span class="sourceLineNo">514</span>   * &lt;li&gt;Throw exception if the 
table exists on peer cluster but descriptors are not same.&lt;/li&gt;<a 
name="line.514"></a>
+<span class="sourceLineNo">515</span>   * &lt;/ol&gt;<a name="line.515"></a>
+<span class="sourceLineNo">516</span>   * @param tableName name of the table 
to sync to the peer<a name="line.516"></a>
+<span class="sourceLineNo">517</span>   * @param splits table split keys<a 
name="line.517"></a>
+<span class="sourceLineNo">518</span>   * @throws IOException<a 
name="line.518"></a>
+<span class="sourceLineNo">519</span>   */<a name="line.519"></a>
+<span class="sourceLineNo">520</span>  private void 
checkAndSyncTableDescToPeers(final TableName tableName, final byte[][] 
splits)<a name="line.520"></a>
+<span class="sourceLineNo">521</span>      throws IOException {<a 
name="line.521"></a>
+<span class="sourceLineNo">522</span>    List&lt;ReplicationPeer&gt; repPeers 
= listReplicationPeers();<a name="line.522"></a>
+<span class="sourceLineNo">523</span>    if (repPeers == null || 
repPeers.size() &lt;= 0) {<a name="line.523"></a>
+<span class="sourceLineNo">524</span>      throw new 
IllegalArgumentException("Found no peer cluster for replication.");<a 
name="line.524"></a>
+<span class="sourceLineNo">525</span>    }<a name="line.525"></a>
+<span class="sourceLineNo">526</span><a name="line.526"></a>
+<span class="sourceLineNo">527</span>    final TableName 
onlyTableNameQualifier = TableName.valueOf(tableName.getQualifierAsString());<a 
name="line.527"></a>
+<span class="sourceLineNo">528</span><a name="line.528"></a>
+<span class="sourceLineNo">529</span>    for (ReplicationPeer repPeer : 
repPeers) {<a name="line.529"></a>
+<span class="sourceLineNo">530</span>      Map&lt;TableName, 
List&lt;String&gt;&gt; tableCFMap = repPeer.getTableCFs();<a 
name="line.530"></a>
+<span class="sourceLineNo">531</span>      // TODO Currently peer TableCFs 
will not include namespace so we need to check only for table<a 
name="line.531"></a>
+<span class="sourceLineNo">532</span>      // name without namespace in it. 
Need to correct this logic once we fix HBASE-11386.<a name="line.532"></a>
+<span class="sourceLineNo">533</span>      if (tableCFMap != null &amp;&amp; 
!tableCFMap.containsKey(onlyTableNameQualifier)) {<a name="line.533"></a>
+<span class="sourceLineNo">534</span>        continue;<a name="line.534"></a>
+<span class="sourceLineNo">535</span>      }<a name="line.535"></a>
+<span class="sourceLineNo">536</span><a name="line.536"></a>
+<span class="sourceLineNo">537</span>      Configuration peerConf = 
repPeer.getConfiguration();<a name="line.537"></a>
+<span class="sourceLineNo">538</span>      HTableDescriptor htd = null;<a 
name="line.538"></a>
+<span class="sourceLineNo">539</span>      try (Connection conn = 
ConnectionFactory.createConnection(peerConf);<a name="line.539"></a>
+<span class="sourceLineNo">540</span>          Admin admin = 
this.connection.getAdmin();<a name="line.540"></a>
+<span class="sourceLineNo">541</span>          Admin repHBaseAdmin = 
conn.getAdmin()) {<a name="line.541"></a>
+<span class="sourceLineNo">542</span>        htd = 
admin.getTableDescriptor(tableName);<a name="line.542"></a>
+<span class="sourceLineNo">543</span>        HTableDescriptor peerHtd = 
null;<a name="line.543"></a>
+<span class="sourceLineNo">544</span>        if 
(!repHBaseAdmin.tableExists(tableName)) {<a name="line.544"></a>
+<span class="sourceLineNo">545</span>          repHBaseAdmin.createTable(htd, 
splits);<a name="line.545"></a>
+<span class="sourceLineNo">546</span>        } else {<a name="line.546"></a>
+<span class="sourceLineNo">547</span>          peerHtd = 
repHBaseAdmin.getTableDescriptor(tableName);<a name="line.547"></a>
+<span class="sourceLineNo">548</span>          if (peerHtd == null) {<a 
name="line.548"></a>
+<span class="sourceLineNo">549</span>            throw new 
IllegalArgumentException("Failed to get table descriptor for table "<a 
name="line.549"></a>
+<span class="sourceLineNo">550</span>                + 
tableName.getNameAsString() + " from peer cluster " + repPeer.getId());<a 
name="line.550"></a>
+<span class="sourceLineNo">551</span>          } else if 
(!peerHtd.equals(htd)) {<a name="line.551"></a>
+<span class="sourceLineNo">552</span>            throw new 
IllegalArgumentException("Table " + tableName.getNameAsString()<a 
name="line.552"></a>
+<span class="sourceLineNo">553</span>                + " exists in peer 
cluster " + repPeer.getId()<a name="line.553"></a>
+<span class="sourceLineNo">554</span>                + ", but the table 
descriptors are not same when comapred with source cluster."<a 
name="line.554"></a>
+<span class="sourceLineNo">555</span>                + " Thus can not enable 
the table's replication switch.");<a name="line.555"></a>
+<span class="sourceLineNo">556</span>          }<a name="line.556"></a>
+<span class="sourceLineNo">557</span>        }<a name="line.557"></a>
+<span class="sourceLineNo">558</span>      }<a name="line.558"></a>
+<span class="sourceLineNo">559</span>    }<a name="line.559"></a>
+<span class="sourceLineNo">560</span>  }<a name="line.560"></a>
+<span class="sourceLineNo">561</span><a name="line.561"></a>
+<span class="sourceLineNo">562</span>  @VisibleForTesting<a 
name="line.562"></a>
+<span class="sourceLineNo">563</span>  public void peerAdded(String id) throws 
ReplicationException {<a name="line.563"></a>
+<span class="sourceLineNo">564</span>    
this.replicationPeers.peerConnected(id);<a name="line.564"></a>
+<span class="sourceLineNo">565</span>  }<a name="line.565"></a>
+<span class="sourceLineNo">566</span><a name="line.566"></a>
+<span class="sourceLineNo">567</span>  @VisibleForTesting<a 
name="line.567"></a>
+<span class="sourceLineNo">568</span>  List&lt;ReplicationPeer&gt; 
listReplicationPeers() {<a name="line.568"></a>
+<span class="sourceLineNo">569</span>    Map&lt;String, 
ReplicationPeerConfig&gt; peers = listPeerConfigs();<a name="line.569"></a>
+<span class="sourceLineNo">570</span>    if (peers == null || peers.size() 
&lt;= 0) {<a name="line.570"></a>
+<span class="sourceLineNo">571</span>      return null;<a name="line.571"></a>
+<span class="sourceLineNo">572</span>    }<a name="line.572"></a>
+<span class="sourceLineNo">573</span>    List&lt;ReplicationPeer&gt; 
listOfPeers = new ArrayList&lt;ReplicationPeer&gt;(peers.size());<a 
name="line.573"></a>
+<span class="sourceLineNo">574</span>    for (Entry&lt;String, 
ReplicationPeerConfig&gt; peerEntry : peers.entrySet()) {<a name="line.574"></a>
+<span class="sourceLineNo">575</span>      String peerId = 
peerEntry.getKey();<a name="line.575"></a>
+<span class="sourceLineNo">576</span>      try {<a name="line.576"></a>
+<span class="sourceLineNo">577</span>        Pair&lt;ReplicationPeerConfig, 
Configuration&gt; pair = this.replicationPeers.getPeerConf(peerId);<a 
name="line.577"></a>
+<span class="sourceLineNo">578</span>        Configuration peerConf = 
pair.getSecond();<a name="line.578"></a>
+<span class="sourceLineNo">579</span>        ReplicationPeer peer = new 
ReplicationPeerZKImpl(zkw, pair.getSecond(),<a name="line.579"></a>
+<span class="sourceLineNo">580</span>          peerId, pair.getFirst(), 
this.connection);<a name="line.580"></a>
+<span class="sourceLineNo">581</span>        listOfPeers.add(peer);<a 
name="line.581"></a>
+<span class="sourceLineNo">582</span>      } catch (ReplicationException e) 
{<a name="line.582"></a>
+<span class="sourceLineNo">583</span>        LOG.warn("Failed to get valid 
replication peers. "<a name="line.583"></a>
+<span class="sourceLineNo">584</span>            + "Error connecting to peer 
cluster with peerId=" + peerId + ". Error message="<a name="line.584"></a>
+<span class="sourceLineNo">585</span>            + e.getMessage());<a 
name="line.585"></a>
+<span class="sourceLineNo">586</span>        LOG.debug("Failure details to get 
valid replication peers.", e);<a name="line.586"></a>
+<span class="sourceLineNo">587</span>        continue;<a name="line.587"></a>
+<span class="sourceLineNo">588</span>      }<a name="line.588"></a>
+<span class="sourceLineNo">589</span>    }<a name="line.589"></a>
+<span class="sourceLineNo">590</span>    return listOfPeers;<a 
name="line.590"></a>
+<span class="sourceLineNo">591</span>  }<a name="line.591"></a>
+<span class="sourceLineNo">592</span><a name="line.592"></a>
+<span class="sourceLineNo">593</span>  /**<a name="line.593"></a>
+<span class="sourceLineNo">594</span>   * Set the table's replication switch 
if the table's replication switch is already not set.<a name="line.594"></a>
+<span class="sourceLineNo">595</span>   * @param tableName name of the table<a 
name="line.595"></a>
+<span class="sourceLineNo">596</span>   * @param isRepEnabled is replication 
switch enable or disable<a name="line.596"></a>
+<span class="sourceLineNo">597</span>   * @throws IOException if a remote or 
network exception occurs<a name="line.597"></a>
+<span class="sourceLineNo">598</span>   */<a name="line.598"></a>
+<span class="sourceLineNo">599</span>  private void setTableRep(final 
TableName tableName, boolean isRepEnabled) throws IOException {<a 
name="line.599"></a>
+<span class="sourceLineNo">600</span>    Admin admin = null;<a 
name="line.600"></a>
+<span class="sourceLineNo">601</span>    try {<a name="line.601"></a>
+<span class="sourceLineNo">602</span>      admin = 
this.connection.getAdmin();<a name="line.602"></a>
+<span class="sourceLineNo">603</span>      HTableDescriptor htd = 
admin.getTableDescriptor(tableName);<a name="line.603"></a>
+<span class="sourceLineNo">604</span>      if (isTableRepEnabled(htd) ^ 
isRepEnabled) {<a name="line.604"></a>
+<span class="sourceLineNo">605</span>        for (HColumnDescriptor hcd : 
htd.getFamilies()) {<a name="line.605"></a>
+<span class="sourceLineNo">606</span>          hcd.setScope(isRepEnabled ? 
HConstants.REPLICATION_SCOPE_GLOBAL<a name="line.606"></a>
+<span class="sourceLineNo">607</span>              : 
HConstants.REPLICATION_SCOPE_LOCAL);<a name="line.607"></a>
+<span class="sourceLineNo">608</span>        }<a name="line.608"></a>
+<span class="sourceLineNo">609</span>        admin.modifyTable(tableName, 
htd);<a name="line.609"></a>
+<span class="sourceLineNo">610</span>      }<a name="line.610"></a>
+<span class="sourceLineNo">611</span>    } finally {<a name="line.611"></a>
+<span class="sourceLineNo">612</span>      if (admin != null) {<a 
name="line.612"></a>
+<span class="sourceLineNo">613</span>        try {<a name="line.613"></a>
+<span class="sourceLineNo">614</span>          admin.close();<a 
name="line.614"></a>
+<span class="sourceLineNo">615</span>        } catch (IOException e) {<a 
name="line.615"></a>
+<span class="sourceLineNo">616</span>          LOG.warn("Failed to close admin 
connection.");<a name="line.616"></a>
+<span class="sourceLineNo">617</span>          LOG.debug("Details on failure 
to close admin connection.", e);<a name="line.617"></a>
+<span class="sourceLineNo">618</span>        }<a name="line.618"></a>
+<span class="sourceLineNo">619</span>      }<a name="line.619"></a>
+<span class="sourceLineNo">620</span>    }<a name="line.620"></a>
+<span class="sourceLineNo">621</span>  }<a name="line.621"></a>
+<span class="sourceLineNo">622</span><a name="line.622"></a>
+<span class="sourceLineNo">623</span>  /**<a name="line.623"></a>
+<span class="sourceLineNo">624</span>   * @param htd table descriptor details 
for the table to check<a name="line.624"></a>
+<span class="sourceLineNo">625</span>   * @return true if table's replication 
switch is enabled<a name="line.625"></a>
+<span class="sourceLineNo">626</span>   */<a name="line.626"></a>
+<span class="sourceLineNo">627</span>  private boolean 
isTableRepEnabled(HTableDescriptor htd) {<a name="line.627"></a>
+<span class="sourceLineNo">628</span>    for (HColumnDescriptor hcd : 
htd.getFamilies()) {<a name="line.628"></a>
+<span class="sourceLineNo">629</span>      if (hcd.getScope() != 
HConstants.REPLICATION_SCOPE_GLOBAL<a name="line.629"></a>
+<span class="sourceLineNo">630</span>          &amp;&amp; hcd.getScope() != 
HConstants.REPLICATION_SCOPE_SERIAL) {<a name="line.630"></a>
+<span class="sourceLineNo">631</span>        return false;<a 
name="line.631"></a>
+<span class="sourceLineNo">632</span>      }<a name="line.632"></a>
+<span class="sourceLineNo">633</span>    }<a name="line.633"></a>
+<span class="sourceLineNo">634</span>    return true;<a name="line.634"></a>
+<span class="sourceLineNo">635</span>  }<a name="line.635"></a>
+<span class="sourceLineNo">636</span><a name="line.636"></a>
+<span class="sourceLineNo">637</span>  /**<a name="line.637"></a>
+<span class="sourceLineNo">638</span>   

<TRUNCATED>

Reply via email to