From 1649013b993d51749fbe3437257e3e31568e095c Mon Sep 17 00:00:00 2001 From: Anoop Sam John Date: Mon, 24 May 2021 23:41:45 +0530 Subject: [PATCH] HBASE-25898 RS getting aborted due to NPE in Replication WALEntryStream (#3292) Signed-off-by: Viraj Jasani Signed-off-by: Rushabh Shah --- .../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 671d3a94211..c0ae857843d 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