This is an automated email from the ASF dual-hosted git repository.
stack pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new 65d28da HBASE-24914 Remove duplicate code appearing continuously in
method ReplicationPeerManager.updatePeerConfig (#2287)
65d28da is described below
commit 65d28da7c22382e040363c607840d5ab6e6b45da
Author: XinSun <[email protected]>
AuthorDate: Fri Aug 21 05:44:56 2020 +0800
HBASE-24914 Remove duplicate code appearing continuously in method
ReplicationPeerManager.updatePeerConfig (#2287)
Signed-off-by: Jan Hentschel <[email protected]>
---
.../apache/hadoop/hbase/master/replication/ReplicationPeerManager.java | 2 --
1 file changed, 2 deletions(-)
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/ReplicationPeerManager.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/ReplicationPeerManager.java
index 52060ae..8a5733f 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/ReplicationPeerManager.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/ReplicationPeerManager.java
@@ -279,8 +279,6 @@ public class ReplicationPeerManager {
// we need to use the new conf to overwrite the old one.
newPeerConfigBuilder.putAllConfiguration(oldPeerConfig.getConfiguration());
newPeerConfigBuilder.putAllConfiguration(peerConfig.getConfiguration());
- newPeerConfigBuilder.putAllConfiguration(oldPeerConfig.getConfiguration());
- newPeerConfigBuilder.putAllConfiguration(peerConfig.getConfiguration());
ReplicationPeerConfig newPeerConfig = newPeerConfigBuilder.build();
peerStorage.updatePeerConfig(peerId, newPeerConfig);
peers.put(peerId, new ReplicationPeerDescription(peerId, desc.isEnabled(),
newPeerConfig,
