From 319864cbaad7fd77bb61b2d76af9dc6cc04a673e Mon Sep 17 00:00:00 2001
From: BukrosSzabolcs <bukros.szabolcs@gmail.com>
Date: Thu, 16 Apr 2020 16:23:51 +0200
Subject: [PATCH] HBASE-24186: RegionMover ignores replicationId (#1512)

Signed-off-by: Jan Hentschel <jan.hentschel@ultratendency.com>
Signed-off-by: Viraj Jasani <vjasani@apache.org>
---
 .../main/java/org/apache/hadoop/hbase/util/RegionMover.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionMover.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionMover.java
index 9815f593437..f35d130b46a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionMover.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/RegionMover.java
@@ -732,7 +732,8 @@ public class RegionMover extends AbstractHBaseTool implements Closeable {
       return null;
     }
     HRegionLocation loc =
-      conn.getRegionLocator(region.getTable()).getRegionLocation(region.getStartKey(), true);
+      conn.getRegionLocator(region.getTable()).getRegionLocation(region.getStartKey(),
+        region.getReplicaId(),true);
     if (loc != null) {
       return loc.getServerName();
     } else {