[hbase] 02/02: HBASE-24713 RS startup with FSHLog throws NPE after HBASE-21751 (#2133)

[bu...@apache.org]

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

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

commit 76ceb508306fc3e0da86abf71eae6a734eda0ded
Author: gkanade <ga...@gmail.com>
AuthorDate: Mon Aug 3 10:09:03 2020 +0530

    HBASE-24713 RS startup with FSHLog throws NPE after HBASE-21751 (#2133)
    
    Authored-by: Gaurav Kanade <gk...@microsoft.com>
    Signed-off-by: Anoop Sam John <an...@apache.org>
    Signed-off-by: Viraj Jasani <vj...@apache.org>
    Signed-off-by: Ramkrishna <ra...@apache.org>
    (cherry picked from commit 94a03d7ae2ba2986fd359720704b88808d50f623)
---
 .../src/main/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 902d354..290d4cd 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
@@ -318,7 +318,7 @@ public class FSHLog extends AbstractFSWAL<Writer> {
     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