[hbase] branch branch-2 updated: HBASE-25898 RS getting aborted due to NPE in Replication WALEntryStream (#3292)

[an...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

anoopsamjohn pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new 1649013  HBASE-25898 RS getting aborted due to NPE in Replication WALEntryStream (#3292)
1649013 is described below

commit 1649013b993d51749fbe3437257e3e31568e095c
Author: Anoop Sam John <an...@gmail.com>
AuthorDate: Mon May 24 23:41:45 2021 +0530

    HBASE-25898 RS getting aborted due to NPE in Replication WALEntryStream (#3292)
    
    Signed-off-by: Viraj Jasani <vj...@apache.org>
    Signed-off-by: Rushabh Shah <sh...@gmail.com>
---
 .../apache/hadoop/hbase/replication/regionserver/WALEntryStream.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/WALEntryStream.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/WALEntryStream.java
index 671d3a9..c0ae857 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/WALEntryStream.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/WALEntryStream.java
@@ -373,8 +373,8 @@ class WALEntryStream implements Closeable {
       handleFileNotFound(path, (FileNotFoundException)ioe);
     } catch (LeaseNotRecoveredException lnre) {
       // HBASE-15019 the WAL was not closed due to some hiccup.
-      LOG.warn("Try to recover the WAL lease " + currentPath, lnre);
-      recoverLease(conf, currentPath);
+      LOG.warn("Try to recover the WAL lease " + path, lnre);
+      recoverLease(conf, path);
       reader = null;
     } catch (NullPointerException npe) {
       // Workaround for race condition in HDFS-4380