hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zhang...@apache.org
Subject [01/17] hbase git commit: HBASE-19621 (addendum) Revisit the methods in ReplicationPeerConfigBuilder [Forced Update!]
Date Wed, 27 Dec 2017 01:42:03 GMT
Repository: hbase
Updated Branches:
  refs/heads/HBASE-19397 aa3bc1d9b -> 350f5d126 (forced update)


HBASE-19621 (addendum) Revisit the methods in ReplicationPeerConfigBuilder


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/80c7e4ea
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/80c7e4ea
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/80c7e4ea

Branch: refs/heads/HBASE-19397
Commit: 80c7e4ea7994186ab1876bb53bd7239d2559a481
Parents: 7ce1943
Author: Guanghao Zhang <zghao@apache.org>
Authored: Tue Dec 26 20:56:56 2017 +0800
Committer: Guanghao Zhang <zghao@apache.org>
Committed: Tue Dec 26 21:55:49 2017 +0800

----------------------------------------------------------------------
 .../hadoop/hbase/replication/ReplicationPeersZKImpl.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/80c7e4ea/hbase-replication/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.java
----------------------------------------------------------------------
diff --git a/hbase-replication/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.java
b/hbase-replication/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.java
index 2f6d52c..289d2aa 100644
--- a/hbase-replication/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.java
+++ b/hbase-replication/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.java
@@ -363,9 +363,14 @@ public class ReplicationPeersZKImpl extends ReplicationStateZKBase implements
Re
     }
     // Update existingConfig's peer config and peer data with the new values, but don't touch
config
     // or data that weren't explicitly changed
-    ReplicationPeerConfigBuilder builder = ReplicationPeerConfig.newBuilder(newConfig);
-    builder.putAllConfiguration(existingConfig.getConfiguration());
-    builder.putAllPeerData(existingConfig.getPeerData());
+    ReplicationPeerConfigBuilder builder = ReplicationPeerConfig.newBuilder(existingConfig);
+    builder.putAllConfiguration(newConfig.getConfiguration())
+        .putAllPeerData(newConfig.getPeerData())
+        .setReplicateAllUserTables(newConfig.replicateAllUserTables())
+        .setNamespaces(newConfig.getNamespaces()).setTableCFsMap(newConfig.getTableCFsMap())
+        .setExcludeNamespaces(newConfig.getExcludeNamespaces())
+        .setExcludeTableCFsMap(newConfig.getExcludeTableCFsMap())
+        .setBandwidth(newConfig.getBandwidth());
 
     try {
       ZKUtil.setData(this.zookeeper, getPeerNode(id),


Mime
View raw message