You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2020/08/06 04:59:26 UTC
[hbase] 01/02: Revert "Cherry pick HBASE-24713 RS startup with
FSHLog throws NPE after HBASE-21751 (#2133)"
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 825bdfb30413f205306debc14b120f1d33b52cc1
Author: Sean Busbey <bu...@apache.org>
AuthorDate: Wed Aug 5 23:51:11 2020 -0500
Revert "Cherry pick HBASE-24713 RS startup with FSHLog throws NPE after HBASE-21751 (#2133)"
bad commit message
This reverts 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 290d4cd..902d354 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.writer != null && this.ringBufferEventHandler != null) {
+ if (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