From 9a1bad84bf44cc737926c56592a485c606d63529 Mon Sep 17 00:00:00 2001 From: gkanade Date: Mon, 3 Aug 2020 10:04:55 +0530 Subject: [PATCH] HBASE-24713 RS startup with FSHLog throws NPE after HBASE-21751 (#2125) * null check for writer if not initialized yet during syncrunner run * Revert "null check for writer if not initialized yet during syncrunner run" This reverts commit 72932ad0df32859c9492b8f313c4a79a7e85bfd0. * Writer check while trying to attain safe point Signed-off-by: Anoop Sam John Signed-off-by: Viraj Jasani Signed-off-by: Ramkrishna --- .../java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java index 276902e4de1..63f4029b1f6 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java @@ -329,7 +329,7 @@ public class FSHLog extends AbstractFSWAL { SyncFuture syncFuture = null; SafePointZigZagLatch zigzagLatch = null; long sequence = -1L; - if (this.ringBufferEventHandler != null) { + if (this.writer != null && this.ringBufferEventHandler != null) { // Get sequence first to avoid dead lock when ring buffer is full // Considering below sequence // 1. replaceWriter is called and zigzagLatch is initialized