You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zg...@apache.org on 2017/12/26 13:56:14 UTC
hbase git commit: HBASE-19621 (addendum) Revisit the methods in
ReplicationPeerConfigBuilder
Repository: hbase
Updated Branches:
refs/heads/master 7ce1943ef -> 80c7e4ea7
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/master
Commit: 80c7e4ea7994186ab1876bb53bd7239d2559a481
Parents: 7ce1943
Author: Guanghao Zhang <zg...@apache.org>
Authored: Tue Dec 26 20:56:56 2017 +0800
Committer: Guanghao Zhang <zg...@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),