From commits-return-94744-archive-asf-public=cust-asf.ponee.io@hbase.apache.org Mon Aug 3 04:39:25 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mailroute1-lw-us.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with ESMTPS id 4A96C180644 for ; Mon, 3 Aug 2020 06:39:25 +0200 (CEST) Received: from mail.apache.org (localhost [127.0.0.1]) by mailroute1-lw-us.apache.org (ASF Mail Server at mailroute1-lw-us.apache.org) with SMTP id 7FAE9124B11 for ; Mon, 3 Aug 2020 04:39:21 +0000 (UTC) Received: (qmail 71218 invoked by uid 500); 3 Aug 2020 04:39:21 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 71209 invoked by uid 99); 3 Aug 2020 04:39:20 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Aug 2020 04:39:20 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id C10248242E; Mon, 3 Aug 2020 04:39:20 +0000 (UTC) Date: Mon, 03 Aug 2020 04:39:19 +0000 To: "commits@hbase.apache.org" Subject: [hbase] branch branch-2.3 updated: Cherry pick HBASE-24713 RS startup with FSHLog throws NPE after HBASE-21751 (#2133) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <159642955836.24270.14103719638630389704@gitbox.apache.org> From: ramkrishna@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: hbase X-Git-Refname: refs/heads/branch-2.3 X-Git-Reftype: branch X-Git-Oldrev: 52c7303342076967e04f222612afb56aca800d79 X-Git-Newrev: 94a03d7ae2ba2986fd359720704b88808d50f623 X-Git-Rev: 94a03d7ae2ba2986fd359720704b88808d50f623 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. ramkrishna pushed a commit to branch branch-2.3 in repository https://gitbox.apache.org/repos/asf/hbase.git The following commit(s) were added to refs/heads/branch-2.3 by this push: new 94a03d7 Cherry pick HBASE-24713 RS startup with FSHLog throws NPE after HBASE-21751 (#2133) 94a03d7 is described below commit 94a03d7ae2ba2986fd359720704b88808d50f623 Author: gkanade AuthorDate: Mon Aug 3 10:09:03 2020 +0530 Cherry pick HBASE-24713 RS startup with FSHLog throws NPE after HBASE-21751 (#2133) Authored-by: Gaurav Kanade Signed-off-by: Anoop Sam John Signed-off-by: Viraj Jasani Signed-off-by: Ramkrishna --- .../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 { 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