hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From git-site-r...@apache.org
Subject [37/51] [partial] hbase-site git commit: Published site at .
Date Thu, 23 Nov 2017 15:25:02 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9118853f/devapidocs/overview-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/overview-tree.html b/devapidocs/overview-tree.html
index b65b675..9804046 100644
--- a/devapidocs/overview-tree.html
+++ b/devapidocs/overview-tree.html
@@ -1619,6 +1619,15 @@
 <li type="circle">org.apache.hadoop.hbase.regionserver.throttle.<a href="org/apache/hadoop/hbase/regionserver/throttle/FlushThroughputControllerFactory.html" title="class in org.apache.hadoop.hbase.regionserver.throttle"><span class="typeNameLink">FlushThroughputControllerFactory</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.errorhandling.<a href="org/apache/hadoop/hbase/errorhandling/ForeignExceptionDispatcher.html" title="class in org.apache.hadoop.hbase.errorhandling"><span class="typeNameLink">ForeignExceptionDispatcher</span></a> (implements org.apache.hadoop.hbase.errorhandling.<a href="org/apache/hadoop/hbase/errorhandling/ForeignExceptionListener.html" title="interface in org.apache.hadoop.hbase.errorhandling">ForeignExceptionListener</a>, org.apache.hadoop.hbase.errorhandling.<a href="org/apache/hadoop/hbase/errorhandling/ForeignExceptionSnare.html" title="interface in org.apache.hadoop.hbase.errorhandling">ForeignExceptionSnare</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.util.<a href="org/apache/hadoop/hbase/util/ForeignExceptionUtil.html" title="class in org.apache.hadoop.hbase.util"><span class="typeNameLink">ForeignExceptionUtil</span></a></li>
+<li type="circle">java.util.concurrent.<a href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ForkJoinTask.html?is-external=true" title="class or interface in java.util.concurrent"><span class="typeNameLink">ForkJoinTask</span></a>&lt;V&gt; (implements java.util.concurrent.<a href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Future.html?is-external=true" title="class or interface in java.util.concurrent">Future</a>&lt;V&gt;, java.io.<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
+<ul>
+<li type="circle">java.util.concurrent.<a href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/RecursiveTask.html?is-external=true" title="class or interface in java.util.concurrent"><span class="typeNameLink">RecursiveTask</span></a>&lt;V&gt;
+<ul>
+<li type="circle">org.apache.hadoop.hbase.master.cleaner.<a href="org/apache/hadoop/hbase/master/cleaner/CleanerChore.CleanerTask.html" title="class in org.apache.hadoop.hbase.master.cleaner"><span class="typeNameLink">CleanerChore.CleanerTask</span></a></li>
+</ul>
+</li>
+</ul>
+</li>
 <li type="circle">org.apache.hadoop.hbase.io.<a href="org/apache/hadoop/hbase/io/FSDataInputStreamWrapper.html" title="class in org.apache.hadoop.hbase.io"><span class="typeNameLink">FSDataInputStreamWrapper</span></a> (implements java.io.<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html?is-external=true" title="class or interface in java.io">Closeable</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.security.token.<a href="org/apache/hadoop/hbase/security/token/FsDelegationToken.html" title="class in org.apache.hadoop.hbase.security.token"><span class="typeNameLink">FsDelegationToken</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.wal.<a href="org/apache/hadoop/hbase/regionserver/wal/FSHLog.RingBufferEventHandler.html" title="class in org.apache.hadoop.hbase.regionserver.wal"><span class="typeNameLink">FSHLog.RingBufferEventHandler</span></a> (implements com.lmax.disruptor.EventHandler&lt;T&gt;, com.lmax.disruptor.LifecycleAware)</li>
@@ -2067,6 +2076,7 @@
 <li type="circle">org.apache.hadoop.hbase.master.locking.<a href="org/apache/hadoop/hbase/master/locking/LockProcedure.TableExclusiveLock.html" title="class in org.apache.hadoop.hbase.master.locking"><span class="typeNameLink">LockProcedure.TableExclusiveLock</span></a> (implements org.apache.hadoop.hbase.master.locking.<a href="org/apache/hadoop/hbase/master/locking/LockProcedure.LockInterface.html" title="interface in org.apache.hadoop.hbase.master.locking">LockProcedure.LockInterface</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.master.locking.<a href="org/apache/hadoop/hbase/master/locking/LockProcedure.TableSharedLock.html" title="class in org.apache.hadoop.hbase.master.locking"><span class="typeNameLink">LockProcedure.TableSharedLock</span></a> (implements org.apache.hadoop.hbase.master.locking.<a href="org/apache/hadoop/hbase/master/locking/LockProcedure.LockInterface.html" title="interface in org.apache.hadoop.hbase.master.locking">LockProcedure.LockInterface</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.client.locking.<a href="org/apache/hadoop/hbase/client/locking/LockServiceClient.html" title="class in org.apache.hadoop.hbase.client.locking"><span class="typeNameLink">LockServiceClient</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.cleaner.<a href="org/apache/hadoop/hbase/master/cleaner/LogCleaner.CleanerContext.html" title="class in org.apache.hadoop.hbase.master.cleaner"><span class="typeNameLink">LogCleaner.CleanerContext</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.http.log.<a href="org/apache/hadoop/hbase/http/log/LogLevel.html" title="class in org.apache.hadoop.hbase.http.log"><span class="typeNameLink">LogLevel</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.monitoring.<a href="org/apache/hadoop/hbase/monitoring/LogMonitoring.html" title="class in org.apache.hadoop.hbase.monitoring"><span class="typeNameLink">LogMonitoring</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.backup.regionserver.<a href="org/apache/hadoop/hbase/backup/regionserver/LogRollBackupSubprocedure.RSRollLogTask.html" title="class in org.apache.hadoop.hbase.backup.regionserver"><span class="typeNameLink">LogRollBackupSubprocedure.RSRollLogTask</span></a> (implements java.util.concurrent.<a href="http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Callable.html?is-external=true" title="class or interface in java.util.concurrent">Callable</a>&lt;V&gt;)</li>
@@ -2997,13 +3007,13 @@
 <li type="circle">org.apache.hadoop.hbase.replication.regionserver.<a href="org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.WALEntryBatch.html" title="class in org.apache.hadoop.hbase.replication.regionserver"><span class="typeNameLink">ReplicationSourceWALReader.WALEntryBatch</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.replication.<a href="org/apache/hadoop/hbase/replication/ReplicationStateZKBase.html" title="class in org.apache.hadoop.hbase.replication"><span class="typeNameLink">ReplicationStateZKBase</span></a>
 <ul>
+<li type="circle">org.apache.hadoop.hbase.replication.master.<a href="org/apache/hadoop/hbase/replication/master/ReplicationPeerConfigUpgrader.html" title="class in org.apache.hadoop.hbase.replication.master"><span class="typeNameLink">ReplicationPeerConfigUpgrader</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.replication.<a href="org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.html" title="class in org.apache.hadoop.hbase.replication"><span class="typeNameLink">ReplicationPeersZKImpl</span></a> (implements org.apache.hadoop.hbase.replication.<a href="org/apache/hadoop/hbase/replication/ReplicationPeers.html" title="interface in org.apache.hadoop.hbase.replication">ReplicationPeers</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.replication.<a href="org/apache/hadoop/hbase/replication/ReplicationPeerZKImpl.html" title="class in org.apache.hadoop.hbase.replication"><span class="typeNameLink">ReplicationPeerZKImpl</span></a> (implements org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/Abortable.html" title="interface in org.apache.hadoop.hbase">Abortable</a>, java.io.<a href="http://docs.oracle.com/javase/8/docs/api/java/io/Closeable.html?is-external=true" title="class or interface in java.io">Closeable</a>, org.apache.hadoop.hbase.replication.<a href="org/apache/hadoop/hbase/replication/ReplicationPeer.html" title="interface in org.apache.hadoop.hbase.replication">ReplicationPeer</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.replication.<a href="org/apache/hadoop/hbase/replication/ReplicationQueuesClientZKImpl.html" title="class in org.apache.hadoop.hbase.replication"><span class="typeNameLink">ReplicationQueuesClientZKImpl</span></a> (implements org.apache.hadoop.hbase.replication.<a href="org/apache/hadoop/hbase/replication/ReplicationQueuesClient.html" title="interface in org.apache.hadoop.hbase.replication">ReplicationQueuesClient</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.replication.<a href="org/apache/hadoop/hbase/replication/ReplicationQueuesZKImpl.html" title="class in org.apache.hadoop.hbase.replication"><span class="typeNameLink">ReplicationQueuesZKImpl</span></a> (implements org.apache.hadoop.hbase.replication.<a href="org/apache/hadoop/hbase/replication/ReplicationQueues.html" title="interface in org.apache.hadoop.hbase.replication">ReplicationQueues</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.replication.<a href="org/apache/hadoop/hbase/replication/ReplicationTrackerZKImpl.html" title="class in org.apache.hadoop.hbase.replication"><span class="typeNameLink">ReplicationTrackerZKImpl</span></a> (implements org.apache.hadoop.hbase.replication.<a href="org/apache/hadoop/hbase/replication/ReplicationTracker.html" title="interface in org.apache.hadoop.hbase.replication">ReplicationTracker</a>)</li>
 <li type="circle">org.apache.hadoop.hbase.master.cleaner.<a href="org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.ReplicationQueueDeletor.html" title="class in org.apache.hadoop.hbase.master.cleaner"><span class="typeNameLink">ReplicationZKNodeCleaner.ReplicationQueueDeletor</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.replication.master.<a href="org/apache/hadoop/hbase/replication/master/TableCFsUpdater.html" title="class in org.apache.hadoop.hbase.replication.master"><span class="typeNameLink">TableCFsUpdater</span></a></li>
 </ul>
 </li>
 <li type="circle">org.apache.hadoop.hbase.replication.regionserver.<a href="org/apache/hadoop/hbase/replication/regionserver/ReplicationSyncUp.DummyServer.html" title="class in org.apache.hadoop.hbase.replication.regionserver"><span class="typeNameLink">ReplicationSyncUp.DummyServer</span></a> (implements org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/Server.html" title="interface in org.apache.hadoop.hbase">Server</a>)</li>
@@ -3231,9 +3241,9 @@
 <ul>
 <li type="circle">org.apache.hadoop.hbase.master.balancer.<a href="org/apache/hadoop/hbase/master/balancer/BalancerChore.html" title="class in org.apache.hadoop.hbase.master.balancer"><span class="typeNameLink">BalancerChore</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/CatalogJanitor.html" title="class in org.apache.hadoop.hbase.master"><span class="typeNameLink">CatalogJanitor</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.master.cleaner.<a href="org/apache/hadoop/hbase/master/cleaner/CleanerChore.html" title="class in org.apache.hadoop.hbase.master.cleaner"><span class="typeNameLink">CleanerChore</span></a>&lt;T&gt;
+<li type="circle">org.apache.hadoop.hbase.master.cleaner.<a href="org/apache/hadoop/hbase/master/cleaner/CleanerChore.html" title="class in org.apache.hadoop.hbase.master.cleaner"><span class="typeNameLink">CleanerChore</span></a>&lt;T&gt; (implements org.apache.hadoop.hbase.conf.<a href="org/apache/hadoop/hbase/conf/ConfigurationObserver.html" title="interface in org.apache.hadoop.hbase.conf">ConfigurationObserver</a>)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.master.cleaner.<a href="org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html" title="class in org.apache.hadoop.hbase.master.cleaner"><span class="typeNameLink">HFileCleaner</span></a> (implements org.apache.hadoop.hbase.conf.<a href="org/apache/hadoop/hbase/conf/ConfigurationObserver.html" title="interface in org.apache.hadoop.hbase.conf">ConfigurationObserver</a>)</li>
+<li type="circle">org.apache.hadoop.hbase.master.cleaner.<a href="org/apache/hadoop/hbase/master/cleaner/HFileCleaner.html" title="class in org.apache.hadoop.hbase.master.cleaner"><span class="typeNameLink">HFileCleaner</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.cleaner.<a href="org/apache/hadoop/hbase/master/cleaner/LogCleaner.html" title="class in org.apache.hadoop.hbase.master.cleaner"><span class="typeNameLink">LogCleaner</span></a></li>
 </ul>
 </li>
@@ -4495,6 +4505,7 @@
 </ul>
 </li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="org/apache/hadoop/hbase/regionserver/ChangedReadersObserver.html" title="interface in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ChangedReadersObserver</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.cleaner.<a href="org/apache/hadoop/hbase/master/cleaner/CleanerChore.Action.html" title="interface in org.apache.hadoop.hbase.master.cleaner"><span class="typeNameLink">CleanerChore.Action</span></a>&lt;T&gt;</li>
 <li type="circle">org.apache.hadoop.hbase.client.backoff.<a href="org/apache/hadoop/hbase/client/backoff/ClientBackoffPolicy.html" title="interface in org.apache.hadoop.hbase.client.backoff"><span class="typeNameLink">ClientBackoffPolicy</span></a></li>
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/8/docs/api/java/lang/Cloneable.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Cloneable</span></a>
 <ul>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9118853f/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
index 29c4efa..4841343 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
@@ -16,11 +16,11 @@
 <span class="sourceLineNo">008</span>@InterfaceAudience.Private<a name="line.8"></a>
 <span class="sourceLineNo">009</span>public class Version {<a name="line.9"></a>
 <span class="sourceLineNo">010</span>  public static final String version = "3.0.0-SNAPSHOT";<a name="line.10"></a>
-<span class="sourceLineNo">011</span>  public static final String revision = "7acf3f9a9cfc6a93107428c3e75b94b8af7a174a";<a name="line.11"></a>
+<span class="sourceLineNo">011</span>  public static final String revision = "3e2941a49e58080618fd2d2e6757694c96651e0a";<a name="line.11"></a>
 <span class="sourceLineNo">012</span>  public static final String user = "jenkins";<a name="line.12"></a>
-<span class="sourceLineNo">013</span>  public static final String date = "Wed Nov 22 14:42:08 UTC 2017";<a name="line.13"></a>
+<span class="sourceLineNo">013</span>  public static final String date = "Thu Nov 23 14:47:54 UTC 2017";<a name="line.13"></a>
 <span class="sourceLineNo">014</span>  public static final String url = "git://asf920.gq1.ygridcore.net/home/jenkins/jenkins-slave/workspace/hbase_generate_website/hbase";<a name="line.14"></a>
-<span class="sourceLineNo">015</span>  public static final String srcChecksum = "eab00f0d49279140dccde92f849b11c2";<a name="line.15"></a>
+<span class="sourceLineNo">015</span>  public static final String srcChecksum = "a5fa5a4477f3daab08c7ecf0b18600de";<a name="line.15"></a>
 <span class="sourceLineNo">016</span>}<a name="line.16"></a>
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9118853f/devapidocs/src-html/org/apache/hadoop/hbase/client/replication/ReplicationPeerConfigUtil.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/replication/ReplicationPeerConfigUtil.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/replication/ReplicationPeerConfigUtil.html
index a303b9e..e673188 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/replication/ReplicationPeerConfigUtil.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/replication/ReplicationPeerConfigUtil.html
@@ -294,186 +294,194 @@
 <span class="sourceLineNo">286</span>    if (tableCFsMap != null) {<a name="line.286"></a>
 <span class="sourceLineNo">287</span>      peerConfig.setTableCFsMap(tableCFsMap);<a name="line.287"></a>
 <span class="sourceLineNo">288</span>    }<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    List&lt;ByteString&gt; namespacesList = peer.getNamespacesList();<a name="line.289"></a>
-<span class="sourceLineNo">290</span>    if (namespacesList != null &amp;&amp; namespacesList.size() != 0) {<a name="line.290"></a>
-<span class="sourceLineNo">291</span>      Set&lt;String&gt; namespaces = new HashSet&lt;&gt;();<a name="line.291"></a>
-<span class="sourceLineNo">292</span>      for (ByteString namespace : namespacesList) {<a name="line.292"></a>
-<span class="sourceLineNo">293</span>        namespaces.add(namespace.toStringUtf8());<a name="line.293"></a>
-<span class="sourceLineNo">294</span>      }<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      peerConfig.setNamespaces(namespaces);<a name="line.295"></a>
-<span class="sourceLineNo">296</span>    }<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    if (peer.hasBandwidth()) {<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      peerConfig.setBandwidth(peer.getBandwidth());<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    }<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    return peerConfig;<a name="line.300"></a>
-<span class="sourceLineNo">301</span>  }<a name="line.301"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span>    List&lt;ByteString&gt; namespacesList = peer.getNamespacesList();<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    if (namespacesList != null &amp;&amp; namespacesList.size() != 0) {<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      Set&lt;String&gt; namespaces = new HashSet&lt;&gt;();<a name="line.292"></a>
+<span class="sourceLineNo">293</span>      for (ByteString namespace : namespacesList) {<a name="line.293"></a>
+<span class="sourceLineNo">294</span>        namespaces.add(namespace.toStringUtf8());<a name="line.294"></a>
+<span class="sourceLineNo">295</span>      }<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      peerConfig.setNamespaces(namespaces);<a name="line.296"></a>
+<span class="sourceLineNo">297</span>    }<a name="line.297"></a>
+<span class="sourceLineNo">298</span><a name="line.298"></a>
+<span class="sourceLineNo">299</span>    if (peer.hasBandwidth()) {<a name="line.299"></a>
+<span class="sourceLineNo">300</span>      peerConfig.setBandwidth(peer.getBandwidth());<a name="line.300"></a>
+<span class="sourceLineNo">301</span>    }<a name="line.301"></a>
 <span class="sourceLineNo">302</span><a name="line.302"></a>
-<span class="sourceLineNo">303</span>  public static ReplicationProtos.ReplicationPeer convert(ReplicationPeerConfig peerConfig) {<a name="line.303"></a>
-<span class="sourceLineNo">304</span>    ReplicationProtos.ReplicationPeer.Builder builder =<a name="line.304"></a>
-<span class="sourceLineNo">305</span>        ReplicationProtos.ReplicationPeer.newBuilder();<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    if (peerConfig.getClusterKey() != null) {<a name="line.306"></a>
-<span class="sourceLineNo">307</span>      builder.setClusterkey(peerConfig.getClusterKey());<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    }<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    if (peerConfig.getReplicationEndpointImpl() != null) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span>      builder.setReplicationEndpointImpl(peerConfig.getReplicationEndpointImpl());<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    }<a name="line.311"></a>
-<span class="sourceLineNo">312</span><a name="line.312"></a>
-<span class="sourceLineNo">313</span>    for (Map.Entry&lt;byte[], byte[]&gt; entry : peerConfig.getPeerData().entrySet()) {<a name="line.313"></a>
-<span class="sourceLineNo">314</span>      builder.addData(HBaseProtos.BytesBytesPair.newBuilder()<a name="line.314"></a>
-<span class="sourceLineNo">315</span>          .setFirst(UnsafeByteOperations.unsafeWrap(entry.getKey()))<a name="line.315"></a>
-<span class="sourceLineNo">316</span>          .setSecond(UnsafeByteOperations.unsafeWrap(entry.getValue()))<a name="line.316"></a>
-<span class="sourceLineNo">317</span>          .build());<a name="line.317"></a>
+<span class="sourceLineNo">303</span>    if (peer.hasReplicateAll()) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span>      peerConfig.setReplicateAllUserTables(peer.getReplicateAll());<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>    return peerConfig;<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>  public static ReplicationProtos.ReplicationPeer convert(ReplicationPeerConfig peerConfig) {<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    ReplicationProtos.ReplicationPeer.Builder builder =<a name="line.311"></a>
+<span class="sourceLineNo">312</span>        ReplicationProtos.ReplicationPeer.newBuilder();<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    if (peerConfig.getClusterKey() != null) {<a name="line.313"></a>
+<span class="sourceLineNo">314</span>      builder.setClusterkey(peerConfig.getClusterKey());<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    }<a name="line.315"></a>
+<span class="sourceLineNo">316</span>    if (peerConfig.getReplicationEndpointImpl() != null) {<a name="line.316"></a>
+<span class="sourceLineNo">317</span>      builder.setReplicationEndpointImpl(peerConfig.getReplicationEndpointImpl());<a name="line.317"></a>
 <span class="sourceLineNo">318</span>    }<a name="line.318"></a>
 <span class="sourceLineNo">319</span><a name="line.319"></a>
-<span class="sourceLineNo">320</span>    for (Map.Entry&lt;String, String&gt; entry : peerConfig.getConfiguration().entrySet()) {<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      builder.addConfiguration(HBaseProtos.NameStringPair.newBuilder()<a name="line.321"></a>
-<span class="sourceLineNo">322</span>          .setName(entry.getKey())<a name="line.322"></a>
-<span class="sourceLineNo">323</span>          .setValue(entry.getValue())<a name="line.323"></a>
+<span class="sourceLineNo">320</span>    for (Map.Entry&lt;byte[], byte[]&gt; entry : peerConfig.getPeerData().entrySet()) {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      builder.addData(HBaseProtos.BytesBytesPair.newBuilder()<a name="line.321"></a>
+<span class="sourceLineNo">322</span>          .setFirst(UnsafeByteOperations.unsafeWrap(entry.getKey()))<a name="line.322"></a>
+<span class="sourceLineNo">323</span>          .setSecond(UnsafeByteOperations.unsafeWrap(entry.getValue()))<a name="line.323"></a>
 <span class="sourceLineNo">324</span>          .build());<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>    ReplicationProtos.TableCF[] tableCFs = convert(peerConfig.getTableCFsMap());<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    if (tableCFs != null) {<a name="line.328"></a>
-<span class="sourceLineNo">329</span>      for (int i = 0; i &lt; tableCFs.length; i++) {<a name="line.329"></a>
-<span class="sourceLineNo">330</span>        builder.addTableCfs(tableCFs[i]);<a name="line.330"></a>
-<span class="sourceLineNo">331</span>      }<a name="line.331"></a>
+<span class="sourceLineNo">327</span>    for (Map.Entry&lt;String, String&gt; entry : peerConfig.getConfiguration().entrySet()) {<a name="line.327"></a>
+<span class="sourceLineNo">328</span>      builder.addConfiguration(HBaseProtos.NameStringPair.newBuilder()<a name="line.328"></a>
+<span class="sourceLineNo">329</span>          .setName(entry.getKey())<a name="line.329"></a>
+<span class="sourceLineNo">330</span>          .setValue(entry.getValue())<a name="line.330"></a>
+<span class="sourceLineNo">331</span>          .build());<a name="line.331"></a>
 <span class="sourceLineNo">332</span>    }<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    Set&lt;String&gt; namespaces = peerConfig.getNamespaces();<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    if (namespaces != null) {<a name="line.334"></a>
-<span class="sourceLineNo">335</span>      for (String namespace : namespaces) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span>        builder.addNamespaces(ByteString.copyFromUtf8(namespace));<a name="line.336"></a>
-<span class="sourceLineNo">337</span>      }<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    }<a name="line.338"></a>
-<span class="sourceLineNo">339</span><a name="line.339"></a>
-<span class="sourceLineNo">340</span>    builder.setBandwidth(peerConfig.getBandwidth());<a name="line.340"></a>
-<span class="sourceLineNo">341</span>    return builder.build();<a name="line.341"></a>
-<span class="sourceLineNo">342</span>  }<a name="line.342"></a>
-<span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span>  /**<a name="line.344"></a>
-<span class="sourceLineNo">345</span>   * @param peerConfig<a name="line.345"></a>
-<span class="sourceLineNo">346</span>   * @return Serialized protobuf of &lt;code&gt;peerConfig&lt;/code&gt; with pb magic prefix prepended suitable<a name="line.346"></a>
-<span class="sourceLineNo">347</span>   *         for use as content of a this.peersZNode; i.e. the content of PEER_ID znode under<a name="line.347"></a>
-<span class="sourceLineNo">348</span>   *         /hbase/replication/peers/PEER_ID<a name="line.348"></a>
-<span class="sourceLineNo">349</span>   */<a name="line.349"></a>
-<span class="sourceLineNo">350</span>  public static byte[] toByteArray(final ReplicationPeerConfig peerConfig) {<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    byte[] bytes = convert(peerConfig).toByteArray();<a name="line.351"></a>
-<span class="sourceLineNo">352</span>    return ProtobufUtil.prependPBMagic(bytes);<a name="line.352"></a>
-<span class="sourceLineNo">353</span>  }<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span>  public static ReplicationPeerDescription toReplicationPeerDescription(<a name="line.355"></a>
-<span class="sourceLineNo">356</span>      ReplicationProtos.ReplicationPeerDescription desc) {<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    boolean enabled = ReplicationProtos.ReplicationState.State.ENABLED == desc.getState()<a name="line.357"></a>
-<span class="sourceLineNo">358</span>        .getState();<a name="line.358"></a>
-<span class="sourceLineNo">359</span>    ReplicationPeerConfig config = convert(desc.getConfig());<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    return new ReplicationPeerDescription(desc.getId(), enabled, config);<a name="line.360"></a>
+<span class="sourceLineNo">333</span><a name="line.333"></a>
+<span class="sourceLineNo">334</span>    ReplicationProtos.TableCF[] tableCFs = convert(peerConfig.getTableCFsMap());<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    if (tableCFs != null) {<a name="line.335"></a>
+<span class="sourceLineNo">336</span>      for (int i = 0; i &lt; tableCFs.length; i++) {<a name="line.336"></a>
+<span class="sourceLineNo">337</span>        builder.addTableCfs(tableCFs[i]);<a name="line.337"></a>
+<span class="sourceLineNo">338</span>      }<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    }<a name="line.339"></a>
+<span class="sourceLineNo">340</span>    Set&lt;String&gt; namespaces = peerConfig.getNamespaces();<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    if (namespaces != null) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span>      for (String namespace : namespaces) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span>        builder.addNamespaces(ByteString.copyFromUtf8(namespace));<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>    builder.setBandwidth(peerConfig.getBandwidth());<a name="line.347"></a>
+<span class="sourceLineNo">348</span>    builder.setReplicateAll(peerConfig.replicateAllUserTables());<a name="line.348"></a>
+<span class="sourceLineNo">349</span>    return builder.build();<a name="line.349"></a>
+<span class="sourceLineNo">350</span>  }<a name="line.350"></a>
+<span class="sourceLineNo">351</span><a name="line.351"></a>
+<span class="sourceLineNo">352</span>  /**<a name="line.352"></a>
+<span class="sourceLineNo">353</span>   * @param peerConfig<a name="line.353"></a>
+<span class="sourceLineNo">354</span>   * @return Serialized protobuf of &lt;code&gt;peerConfig&lt;/code&gt; with pb magic prefix prepended suitable<a name="line.354"></a>
+<span class="sourceLineNo">355</span>   *         for use as content of a this.peersZNode; i.e. the content of PEER_ID znode under<a name="line.355"></a>
+<span class="sourceLineNo">356</span>   *         /hbase/replication/peers/PEER_ID<a name="line.356"></a>
+<span class="sourceLineNo">357</span>   */<a name="line.357"></a>
+<span class="sourceLineNo">358</span>  public static byte[] toByteArray(final ReplicationPeerConfig peerConfig) {<a name="line.358"></a>
+<span class="sourceLineNo">359</span>    byte[] bytes = convert(peerConfig).toByteArray();<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    return ProtobufUtil.prependPBMagic(bytes);<a name="line.360"></a>
 <span class="sourceLineNo">361</span>  }<a name="line.361"></a>
 <span class="sourceLineNo">362</span><a name="line.362"></a>
-<span class="sourceLineNo">363</span>  public static ReplicationProtos.ReplicationPeerDescription toProtoReplicationPeerDescription(<a name="line.363"></a>
-<span class="sourceLineNo">364</span>      ReplicationPeerDescription desc) {<a name="line.364"></a>
-<span class="sourceLineNo">365</span>    ReplicationProtos.ReplicationPeerDescription.Builder builder =<a name="line.365"></a>
-<span class="sourceLineNo">366</span>        ReplicationProtos.ReplicationPeerDescription.newBuilder();<a name="line.366"></a>
-<span class="sourceLineNo">367</span>    builder.setId(desc.getPeerId());<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    ReplicationProtos.ReplicationState.Builder stateBuilder = ReplicationProtos.ReplicationState<a name="line.368"></a>
-<span class="sourceLineNo">369</span>        .newBuilder();<a name="line.369"></a>
-<span class="sourceLineNo">370</span>    stateBuilder.setState(desc.isEnabled() ? ReplicationProtos.ReplicationState.State.ENABLED<a name="line.370"></a>
-<span class="sourceLineNo">371</span>        : ReplicationProtos.ReplicationState.State.DISABLED);<a name="line.371"></a>
-<span class="sourceLineNo">372</span>    builder.setState(stateBuilder.build());<a name="line.372"></a>
-<span class="sourceLineNo">373</span>    builder.setConfig(convert(desc.getPeerConfig()));<a name="line.373"></a>
-<span class="sourceLineNo">374</span>    return builder.build();<a name="line.374"></a>
-<span class="sourceLineNo">375</span>  }<a name="line.375"></a>
-<span class="sourceLineNo">376</span><a name="line.376"></a>
-<span class="sourceLineNo">377</span>  public static void appendTableCFsToReplicationPeerConfig(<a name="line.377"></a>
-<span class="sourceLineNo">378</span>      Map&lt;TableName, ? extends Collection&lt;String&gt;&gt; tableCfs, ReplicationPeerConfig peerConfig) {<a name="line.378"></a>
-<span class="sourceLineNo">379</span>    Map&lt;TableName, List&lt;String&gt;&gt; preTableCfs = peerConfig.getTableCFsMap();<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    if (preTableCfs == null) {<a name="line.380"></a>
-<span class="sourceLineNo">381</span>      peerConfig.setTableCFsMap(tableCfs);<a name="line.381"></a>
-<span class="sourceLineNo">382</span>    } else {<a name="line.382"></a>
-<span class="sourceLineNo">383</span>      for (Map.Entry&lt;TableName, ? extends Collection&lt;String&gt;&gt; entry : tableCfs.entrySet()) {<a name="line.383"></a>
-<span class="sourceLineNo">384</span>        TableName table = entry.getKey();<a name="line.384"></a>
-<span class="sourceLineNo">385</span>        Collection&lt;String&gt; appendCfs = entry.getValue();<a name="line.385"></a>
-<span class="sourceLineNo">386</span>        if (preTableCfs.containsKey(table)) {<a name="line.386"></a>
-<span class="sourceLineNo">387</span>          List&lt;String&gt; cfs = preTableCfs.get(table);<a name="line.387"></a>
-<span class="sourceLineNo">388</span>          if (cfs == null || appendCfs == null || appendCfs.isEmpty()) {<a name="line.388"></a>
-<span class="sourceLineNo">389</span>            preTableCfs.put(table, null);<a name="line.389"></a>
-<span class="sourceLineNo">390</span>          } else {<a name="line.390"></a>
-<span class="sourceLineNo">391</span>            Set&lt;String&gt; cfSet = new HashSet&lt;String&gt;(cfs);<a name="line.391"></a>
-<span class="sourceLineNo">392</span>            cfSet.addAll(appendCfs);<a name="line.392"></a>
-<span class="sourceLineNo">393</span>            preTableCfs.put(table, Lists.newArrayList(cfSet));<a name="line.393"></a>
-<span class="sourceLineNo">394</span>          }<a name="line.394"></a>
-<span class="sourceLineNo">395</span>        } else {<a name="line.395"></a>
-<span class="sourceLineNo">396</span>          if (appendCfs == null || appendCfs.isEmpty()) {<a name="line.396"></a>
+<span class="sourceLineNo">363</span>  public static ReplicationPeerDescription toReplicationPeerDescription(<a name="line.363"></a>
+<span class="sourceLineNo">364</span>      ReplicationProtos.ReplicationPeerDescription desc) {<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    boolean enabled = ReplicationProtos.ReplicationState.State.ENABLED == desc.getState()<a name="line.365"></a>
+<span class="sourceLineNo">366</span>        .getState();<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    ReplicationPeerConfig config = convert(desc.getConfig());<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    return new ReplicationPeerDescription(desc.getId(), enabled, config);<a name="line.368"></a>
+<span class="sourceLineNo">369</span>  }<a name="line.369"></a>
+<span class="sourceLineNo">370</span><a name="line.370"></a>
+<span class="sourceLineNo">371</span>  public static ReplicationProtos.ReplicationPeerDescription toProtoReplicationPeerDescription(<a name="line.371"></a>
+<span class="sourceLineNo">372</span>      ReplicationPeerDescription desc) {<a name="line.372"></a>
+<span class="sourceLineNo">373</span>    ReplicationProtos.ReplicationPeerDescription.Builder builder =<a name="line.373"></a>
+<span class="sourceLineNo">374</span>        ReplicationProtos.ReplicationPeerDescription.newBuilder();<a name="line.374"></a>
+<span class="sourceLineNo">375</span>    builder.setId(desc.getPeerId());<a name="line.375"></a>
+<span class="sourceLineNo">376</span>    ReplicationProtos.ReplicationState.Builder stateBuilder = ReplicationProtos.ReplicationState<a name="line.376"></a>
+<span class="sourceLineNo">377</span>        .newBuilder();<a name="line.377"></a>
+<span class="sourceLineNo">378</span>    stateBuilder.setState(desc.isEnabled() ? ReplicationProtos.ReplicationState.State.ENABLED<a name="line.378"></a>
+<span class="sourceLineNo">379</span>        : ReplicationProtos.ReplicationState.State.DISABLED);<a name="line.379"></a>
+<span class="sourceLineNo">380</span>    builder.setState(stateBuilder.build());<a name="line.380"></a>
+<span class="sourceLineNo">381</span>    builder.setConfig(convert(desc.getPeerConfig()));<a name="line.381"></a>
+<span class="sourceLineNo">382</span>    return builder.build();<a name="line.382"></a>
+<span class="sourceLineNo">383</span>  }<a name="line.383"></a>
+<span class="sourceLineNo">384</span><a name="line.384"></a>
+<span class="sourceLineNo">385</span>  public static void appendTableCFsToReplicationPeerConfig(<a name="line.385"></a>
+<span class="sourceLineNo">386</span>      Map&lt;TableName, ? extends Collection&lt;String&gt;&gt; tableCfs, ReplicationPeerConfig peerConfig) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    Map&lt;TableName, List&lt;String&gt;&gt; preTableCfs = peerConfig.getTableCFsMap();<a name="line.387"></a>
+<span class="sourceLineNo">388</span>    if (preTableCfs == null) {<a name="line.388"></a>
+<span class="sourceLineNo">389</span>      peerConfig.setTableCFsMap(tableCfs);<a name="line.389"></a>
+<span class="sourceLineNo">390</span>    } else {<a name="line.390"></a>
+<span class="sourceLineNo">391</span>      for (Map.Entry&lt;TableName, ? extends Collection&lt;String&gt;&gt; entry : tableCfs.entrySet()) {<a name="line.391"></a>
+<span class="sourceLineNo">392</span>        TableName table = entry.getKey();<a name="line.392"></a>
+<span class="sourceLineNo">393</span>        Collection&lt;String&gt; appendCfs = entry.getValue();<a name="line.393"></a>
+<span class="sourceLineNo">394</span>        if (preTableCfs.containsKey(table)) {<a name="line.394"></a>
+<span class="sourceLineNo">395</span>          List&lt;String&gt; cfs = preTableCfs.get(table);<a name="line.395"></a>
+<span class="sourceLineNo">396</span>          if (cfs == null || appendCfs == null || appendCfs.isEmpty()) {<a name="line.396"></a>
 <span class="sourceLineNo">397</span>            preTableCfs.put(table, null);<a name="line.397"></a>
 <span class="sourceLineNo">398</span>          } else {<a name="line.398"></a>
-<span class="sourceLineNo">399</span>            preTableCfs.put(table, Lists.newArrayList(appendCfs));<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>  }<a name="line.404"></a>
-<span class="sourceLineNo">405</span><a name="line.405"></a>
-<span class="sourceLineNo">406</span>  public static void removeTableCFsFromReplicationPeerConfig(<a name="line.406"></a>
-<span class="sourceLineNo">407</span>      Map&lt;TableName, ? extends Collection&lt;String&gt;&gt; tableCfs, ReplicationPeerConfig peerConfig,<a name="line.407"></a>
-<span class="sourceLineNo">408</span>      String id) throws ReplicationException {<a name="line.408"></a>
-<span class="sourceLineNo">409</span>    Map&lt;TableName, List&lt;String&gt;&gt; preTableCfs = peerConfig.getTableCFsMap();<a name="line.409"></a>
-<span class="sourceLineNo">410</span>    if (preTableCfs == null) {<a name="line.410"></a>
-<span class="sourceLineNo">411</span>      throw new ReplicationException("Table-Cfs for peer: " + id + " is null");<a name="line.411"></a>
-<span class="sourceLineNo">412</span>    }<a name="line.412"></a>
-<span class="sourceLineNo">413</span>    for (Map.Entry&lt;TableName, ? extends Collection&lt;String&gt;&gt; entry : tableCfs.entrySet()) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span>      TableName table = entry.getKey();<a name="line.414"></a>
-<span class="sourceLineNo">415</span>      Collection&lt;String&gt; removeCfs = entry.getValue();<a name="line.415"></a>
-<span class="sourceLineNo">416</span>      if (preTableCfs.containsKey(table)) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span>        List&lt;String&gt; cfs = preTableCfs.get(table);<a name="line.417"></a>
-<span class="sourceLineNo">418</span>        if (cfs == null &amp;&amp; (removeCfs == null || removeCfs.isEmpty())) {<a name="line.418"></a>
-<span class="sourceLineNo">419</span>          preTableCfs.remove(table);<a name="line.419"></a>
-<span class="sourceLineNo">420</span>        } else if (cfs != null &amp;&amp; (removeCfs != null &amp;&amp; !removeCfs.isEmpty())) {<a name="line.420"></a>
-<span class="sourceLineNo">421</span>          Set&lt;String&gt; cfSet = new HashSet&lt;String&gt;(cfs);<a name="line.421"></a>
-<span class="sourceLineNo">422</span>          cfSet.removeAll(removeCfs);<a name="line.422"></a>
-<span class="sourceLineNo">423</span>          if (cfSet.isEmpty()) {<a name="line.423"></a>
-<span class="sourceLineNo">424</span>            preTableCfs.remove(table);<a name="line.424"></a>
-<span class="sourceLineNo">425</span>          } else {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>            preTableCfs.put(table, Lists.newArrayList(cfSet));<a name="line.426"></a>
-<span class="sourceLineNo">427</span>          }<a name="line.427"></a>
-<span class="sourceLineNo">428</span>        } else if (cfs == null &amp;&amp; (removeCfs != null &amp;&amp; !removeCfs.isEmpty())) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span>          throw new ReplicationException("Cannot remove cf of table: " + table<a name="line.429"></a>
-<span class="sourceLineNo">430</span>              + " which doesn't specify cfs from table-cfs config in peer: " + id);<a name="line.430"></a>
-<span class="sourceLineNo">431</span>        } else if (cfs != null &amp;&amp; (removeCfs == null || removeCfs.isEmpty())) {<a name="line.431"></a>
-<span class="sourceLineNo">432</span>          throw new ReplicationException("Cannot remove table: " + table<a name="line.432"></a>
-<span class="sourceLineNo">433</span>              + " which has specified cfs from table-cfs config in peer: " + id);<a name="line.433"></a>
-<span class="sourceLineNo">434</span>        }<a name="line.434"></a>
-<span class="sourceLineNo">435</span>      } else {<a name="line.435"></a>
-<span class="sourceLineNo">436</span>        throw new ReplicationException("No table: "<a name="line.436"></a>
-<span class="sourceLineNo">437</span>            + table + " in table-cfs config of peer: " + id);<a name="line.437"></a>
-<span class="sourceLineNo">438</span>      }<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>   * Returns the configuration needed to talk to the remote slave cluster.<a name="line.443"></a>
-<span class="sourceLineNo">444</span>   * @param conf the base configuration<a name="line.444"></a>
-<span class="sourceLineNo">445</span>   * @param peer the description of replication peer<a name="line.445"></a>
-<span class="sourceLineNo">446</span>   * @return the configuration for the peer cluster, null if it was unable to get the configuration<a name="line.446"></a>
-<span class="sourceLineNo">447</span>   * @throws IOException when create peer cluster configuration failed<a name="line.447"></a>
-<span class="sourceLineNo">448</span>   */<a name="line.448"></a>
-<span class="sourceLineNo">449</span>  public static Configuration getPeerClusterConfiguration(Configuration conf,<a name="line.449"></a>
-<span class="sourceLineNo">450</span>      ReplicationPeerDescription peer) throws IOException {<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    ReplicationPeerConfig peerConfig = peer.getPeerConfig();<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    Configuration otherConf;<a name="line.452"></a>
-<span class="sourceLineNo">453</span>    try {<a name="line.453"></a>
-<span class="sourceLineNo">454</span>      otherConf = HBaseConfiguration.createClusterConf(conf, peerConfig.getClusterKey());<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    } catch (IOException e) {<a name="line.455"></a>
-<span class="sourceLineNo">456</span>      throw new IOException("Can't get peer configuration for peerId=" + peer.getPeerId(), e);<a name="line.456"></a>
-<span class="sourceLineNo">457</span>    }<a name="line.457"></a>
-<span class="sourceLineNo">458</span><a name="line.458"></a>
-<span class="sourceLineNo">459</span>    if (!peerConfig.getConfiguration().isEmpty()) {<a name="line.459"></a>
-<span class="sourceLineNo">460</span>      CompoundConfiguration compound = new CompoundConfiguration();<a name="line.460"></a>
-<span class="sourceLineNo">461</span>      compound.add(otherConf);<a name="line.461"></a>
-<span class="sourceLineNo">462</span>      compound.addStringMap(peerConfig.getConfiguration());<a name="line.462"></a>
-<span class="sourceLineNo">463</span>      return compound;<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>    return otherConf;<a name="line.466"></a>
-<span class="sourceLineNo">467</span>  }<a name="line.467"></a>
-<span class="sourceLineNo">468</span>}<a name="line.468"></a>
+<span class="sourceLineNo">399</span>            Set&lt;String&gt; cfSet = new HashSet&lt;String&gt;(cfs);<a name="line.399"></a>
+<span class="sourceLineNo">400</span>            cfSet.addAll(appendCfs);<a name="line.400"></a>
+<span class="sourceLineNo">401</span>            preTableCfs.put(table, Lists.newArrayList(cfSet));<a name="line.401"></a>
+<span class="sourceLineNo">402</span>          }<a name="line.402"></a>
+<span class="sourceLineNo">403</span>        } else {<a name="line.403"></a>
+<span class="sourceLineNo">404</span>          if (appendCfs == null || appendCfs.isEmpty()) {<a name="line.404"></a>
+<span class="sourceLineNo">405</span>            preTableCfs.put(table, null);<a name="line.405"></a>
+<span class="sourceLineNo">406</span>          } else {<a name="line.406"></a>
+<span class="sourceLineNo">407</span>            preTableCfs.put(table, Lists.newArrayList(appendCfs));<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>      }<a name="line.410"></a>
+<span class="sourceLineNo">411</span>    }<a name="line.411"></a>
+<span class="sourceLineNo">412</span>  }<a name="line.412"></a>
+<span class="sourceLineNo">413</span><a name="line.413"></a>
+<span class="sourceLineNo">414</span>  public static void removeTableCFsFromReplicationPeerConfig(<a name="line.414"></a>
+<span class="sourceLineNo">415</span>      Map&lt;TableName, ? extends Collection&lt;String&gt;&gt; tableCfs, ReplicationPeerConfig peerConfig,<a name="line.415"></a>
+<span class="sourceLineNo">416</span>      String id) throws ReplicationException {<a name="line.416"></a>
+<span class="sourceLineNo">417</span>    Map&lt;TableName, List&lt;String&gt;&gt; preTableCfs = peerConfig.getTableCFsMap();<a name="line.417"></a>
+<span class="sourceLineNo">418</span>    if (preTableCfs == null) {<a name="line.418"></a>
+<span class="sourceLineNo">419</span>      throw new ReplicationException("Table-Cfs for peer: " + id + " is null");<a name="line.419"></a>
+<span class="sourceLineNo">420</span>    }<a name="line.420"></a>
+<span class="sourceLineNo">421</span>    for (Map.Entry&lt;TableName, ? extends Collection&lt;String&gt;&gt; entry : tableCfs.entrySet()) {<a name="line.421"></a>
+<span class="sourceLineNo">422</span>      TableName table = entry.getKey();<a name="line.422"></a>
+<span class="sourceLineNo">423</span>      Collection&lt;String&gt; removeCfs = entry.getValue();<a name="line.423"></a>
+<span class="sourceLineNo">424</span>      if (preTableCfs.containsKey(table)) {<a name="line.424"></a>
+<span class="sourceLineNo">425</span>        List&lt;String&gt; cfs = preTableCfs.get(table);<a name="line.425"></a>
+<span class="sourceLineNo">426</span>        if (cfs == null &amp;&amp; (removeCfs == null || removeCfs.isEmpty())) {<a name="line.426"></a>
+<span class="sourceLineNo">427</span>          preTableCfs.remove(table);<a name="line.427"></a>
+<span class="sourceLineNo">428</span>        } else if (cfs != null &amp;&amp; (removeCfs != null &amp;&amp; !removeCfs.isEmpty())) {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>          Set&lt;String&gt; cfSet = new HashSet&lt;String&gt;(cfs);<a name="line.429"></a>
+<span class="sourceLineNo">430</span>          cfSet.removeAll(removeCfs);<a name="line.430"></a>
+<span class="sourceLineNo">431</span>          if (cfSet.isEmpty()) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span>            preTableCfs.remove(table);<a name="line.432"></a>
+<span class="sourceLineNo">433</span>          } else {<a name="line.433"></a>
+<span class="sourceLineNo">434</span>            preTableCfs.put(table, Lists.newArrayList(cfSet));<a name="line.434"></a>
+<span class="sourceLineNo">435</span>          }<a name="line.435"></a>
+<span class="sourceLineNo">436</span>        } else if (cfs == null &amp;&amp; (removeCfs != null &amp;&amp; !removeCfs.isEmpty())) {<a name="line.436"></a>
+<span class="sourceLineNo">437</span>          throw new ReplicationException("Cannot remove cf of table: " + table<a name="line.437"></a>
+<span class="sourceLineNo">438</span>              + " which doesn't specify cfs from table-cfs config in peer: " + id);<a name="line.438"></a>
+<span class="sourceLineNo">439</span>        } else if (cfs != null &amp;&amp; (removeCfs == null || removeCfs.isEmpty())) {<a name="line.439"></a>
+<span class="sourceLineNo">440</span>          throw new ReplicationException("Cannot remove table: " + table<a name="line.440"></a>
+<span class="sourceLineNo">441</span>              + " which has specified cfs from table-cfs config in peer: " + id);<a name="line.441"></a>
+<span class="sourceLineNo">442</span>        }<a name="line.442"></a>
+<span class="sourceLineNo">443</span>      } else {<a name="line.443"></a>
+<span class="sourceLineNo">444</span>        throw new ReplicationException("No table: "<a name="line.444"></a>
+<span class="sourceLineNo">445</span>            + table + " in table-cfs config of peer: " + id);<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><a name="line.449"></a>
+<span class="sourceLineNo">450</span>  /**<a name="line.450"></a>
+<span class="sourceLineNo">451</span>   * Returns the configuration needed to talk to the remote slave cluster.<a name="line.451"></a>
+<span class="sourceLineNo">452</span>   * @param conf the base configuration<a name="line.452"></a>
+<span class="sourceLineNo">453</span>   * @param peer the description of replication peer<a name="line.453"></a>
+<span class="sourceLineNo">454</span>   * @return the configuration for the peer cluster, null if it was unable to get the configuration<a name="line.454"></a>
+<span class="sourceLineNo">455</span>   * @throws IOException when create peer cluster configuration failed<a name="line.455"></a>
+<span class="sourceLineNo">456</span>   */<a name="line.456"></a>
+<span class="sourceLineNo">457</span>  public static Configuration getPeerClusterConfiguration(Configuration conf,<a name="line.457"></a>
+<span class="sourceLineNo">458</span>      ReplicationPeerDescription peer) throws IOException {<a name="line.458"></a>
+<span class="sourceLineNo">459</span>    ReplicationPeerConfig peerConfig = peer.getPeerConfig();<a name="line.459"></a>
+<span class="sourceLineNo">460</span>    Configuration otherConf;<a name="line.460"></a>
+<span class="sourceLineNo">461</span>    try {<a name="line.461"></a>
+<span class="sourceLineNo">462</span>      otherConf = HBaseConfiguration.createClusterConf(conf, peerConfig.getClusterKey());<a name="line.462"></a>
+<span class="sourceLineNo">463</span>    } catch (IOException e) {<a name="line.463"></a>
+<span class="sourceLineNo">464</span>      throw new IOException("Can't get peer configuration for peerId=" + peer.getPeerId(), e);<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>    if (!peerConfig.getConfiguration().isEmpty()) {<a name="line.467"></a>
+<span class="sourceLineNo">468</span>      CompoundConfiguration compound = new CompoundConfiguration();<a name="line.468"></a>
+<span class="sourceLineNo">469</span>      compound.add(otherConf);<a name="line.469"></a>
+<span class="sourceLineNo">470</span>      compound.addStringMap(peerConfig.getConfiguration());<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      return compound;<a name="line.471"></a>
+<span class="sourceLineNo">472</span>    }<a name="line.472"></a>
+<span class="sourceLineNo">473</span><a name="line.473"></a>
+<span class="sourceLineNo">474</span>    return otherConf;<a name="line.474"></a>
+<span class="sourceLineNo">475</span>  }<a name="line.475"></a>
+<span class="sourceLineNo">476</span>}<a name="line.476"></a>
 
 
 


Mime
View raw message