commit 4c6c4ff4301a99226640ce19a77dc21f6f8725a6
author Gkkkk302 <49739485+Gkkkk302@users.noreply.github.com> Sat Jan 11 13:09:19 2020 +0800
committer Viraj Jasani <vjasani@apache.org> Sat Jan 11 09:09:19 2020 +0400
tree d44b6e63cf21e7692b97bc4b69bb82f671bb45a8
parent 2eaec10d6935a5ab75384b1c6d171d7a71f3eef8

HBASE-23045 currentPath may be stitched in a loop in replication source code. (#1006)

Signed-off-by: stack <stack@apache.org>
Signed-off-by: Viraj Jasani <vjasani@apache.org>

hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
index ff79976..b13f838 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
@@ -801,9 +801,9 @@
                 Path p = rs.getPath();
                 FileStatus[] logs = fs.listStatus(p);
                 for (FileStatus log : logs) {
-                  p = new Path(p, log.getPath().getName());
-                  if (p.getName().equals(currentPath.getName())) {
-                    currentPath = p;
+                  String logName = log.getPath().getName();
+                  if (logName.equals(currentPath.getName())) {
+                    currentPath = new Path(p, logName);
                     LOG.info("Log " + currentPath.getName() + " found at " + currentPath);
                     // Open the log at the new location
                     this.openReader(sleepMultiplier);