From 355bccbd0b0a190244a96c5bf4f4f31ca80524b9 Mon Sep 17 00:00:00 2001
From: XinSun <ddupgs@gmail.com>
Date: Tue, 9 Feb 2021 04:29:05 +0800
Subject: [PATCH] HBASE-25560 Remove unused parameter named peerId in the
 constructor method of CatalogReplicationSourcePeer (#2939)

Signed-off-by: Viraj Jasani <vjasani@apache.org>
---
 .../replication/regionserver/CatalogReplicationSourcePeer.java | 2 +-
 .../replication/regionserver/ReplicationSourceManager.java     | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/CatalogReplicationSourcePeer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/CatalogReplicationSourcePeer.java
index cb00ac2990d..3bcd414929b 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/CatalogReplicationSourcePeer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/CatalogReplicationSourcePeer.java
@@ -35,7 +35,7 @@ class CatalogReplicationSourcePeer extends ReplicationPeerImpl {
   /**
    * @param clusterKey Usually the UUID from zk passed in by caller as a String.
    */
-  CatalogReplicationSourcePeer(Configuration configuration, String clusterKey, String peerId) {
+  CatalogReplicationSourcePeer(Configuration configuration, String clusterKey) {
     super(configuration, ServerRegionReplicaUtil.REGION_REPLICA_REPLICATION_PEER + "_catalog",
       ReplicationPeerConfig.newBuilder().
         setClusterKey(clusterKey).
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java
index 303a091ac98..a8a35b1ac99 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java
@@ -67,7 +67,6 @@ import org.apache.hadoop.hbase.replication.ReplicationTracker;
 import org.apache.hadoop.hbase.replication.ReplicationUtils;
 import org.apache.hadoop.hbase.replication.SyncReplicationState;
 import org.apache.hadoop.hbase.util.Pair;
-import org.apache.hadoop.hbase.util.ServerRegionReplicaUtil;
 import org.apache.hadoop.hbase.wal.AbstractFSWALProvider;
 import org.apache.hadoop.hbase.wal.SyncReplicationWALProvider;
 import org.apache.hadoop.hbase.wal.WAL;
@@ -1217,7 +1216,7 @@ public class ReplicationSourceManager implements ReplicationListener {
     // source process. See "4.1 Skip maintaining zookeeper replication queue (offsets/WALs)" in the
     // design doc attached to HBASE-18070 'Enable memstore replication for meta replica' for detail.
     CatalogReplicationSourcePeer peer = new CatalogReplicationSourcePeer(this.conf,
-      this.clusterId.toString(), "meta_" + ServerRegionReplicaUtil.REGION_REPLICA_REPLICATION_PEER);
+      this.clusterId.toString());
     final ReplicationSourceInterface crs = new CatalogReplicationSource();
     crs.init(conf, fs, this, new NoopReplicationQueueStorage(), peer, server, peer.getId(),
       clusterId, walProvider.getWALFileLengthProvider(), new MetricsSource(peer.getId()));