[HBASE-27789] Backport "HBASE-24914 Remove duplicate code appearing c…

…ontinuously in method ReplicationPeerManager.updatePeerConfig" to branch-2 (#5180) Signed-off-by: Wellington Chevreuil <[email protected]>
apache · Apr 14, 2023 · 690ca8c · 690ca8c
1 parent 3dda428
commit 690ca8c
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/...rver/src/main/java/org/apache/hadoop/hbase/master/replication/ReplicationPeerManager.java b/...rver/src/main/java/org/apache/hadoop/hbase/master/replication/ReplicationPeerManager.java
@@ -216,8 +216,6 @@ public void updatePeerConfig(String peerId, ReplicationPeerConfig peerConfig)
     // 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));