From 6fd23b2a11f1f2a2d4ada455e95bbabbec51ea2e Mon Sep 17 00:00:00 2001 From: XinSun 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 --- .../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 b853217e688..36628285630 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 @@ -34,7 +34,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", true, ReplicationPeerConfig.newBuilder(). 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 5bd7157a5c3..ee578086ad4 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 @@ -63,7 +63,6 @@ import org.apache.hadoop.hbase.replication.ReplicationQueueInfo; import org.apache.hadoop.hbase.replication.ReplicationQueueStorage; import org.apache.hadoop.hbase.replication.ReplicationTracker; 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.WAL; import org.apache.hadoop.hbase.wal.WALFactory; @@ -1023,7 +1022,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()));