Repository: hbase Updated Branches: refs/heads/branch-2 8362b0dba -> 920005a2d
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/920005a2 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/920005a2 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/920005a2 Branch: refs/heads/branch-2 Commit: 920005a2dc5795426f981a71041e4f93a72a1ff0 Parents: 8362b0d 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:56:40 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/920005a2/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),
