[hbase] branch branch-2.2 updated: Writer check while trying to attain safe point (#2134)

[ra...@apache.org]

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

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


The following commit(s) were added to refs/heads/branch-2.2 by this push:
     new 3a8b4d6  Writer check while trying to attain safe point (#2134)
3a8b4d6 is described below

commit 3a8b4d67386967b50a42941814801a2874d994eb
Author: gkanade <ga...@gmail.com>
AuthorDate: Mon Aug 3 10:07:06 2020 +0530

    Writer check while trying to attain safe point (#2134)
    
    Signed-off-by: Anoop Sam John <an...@apache.org>
    Signed-off-by: Viraj Jasani <vj...@apache.org>
    Signed-off-by: Ramkrishna <ra...@apache.org>
---
 .../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 7b8334b..1794a25 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
@@ -314,7 +314,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