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:47:26 UTC
[hbase] branch branch-2 updated (64fe71d -> bfa558a)
This is an automated email from the ASF dual-hosted git repository.
busbey pushed a change to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git.
from 64fe71d HBASE-24821 simplify the logic of getRegionInfo in TestFlushFromClient to reduce redundancy code
new ec39d59 Revert "writer null check if not initialized yet during syncrunner run (#2201)"
new bfa558a HBASE-24713 RS startup with FSHLog throws NPE after HBASE-21751
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
[hbase] 01/02: Revert "writer null check if not initialized yet
during syncrunner run (#2201)"
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
busbey pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit ec39d59161790d70e0b850b90dbd4101c5b6f895
Author: Sean Busbey <bu...@apache.org>
AuthorDate: Wed Aug 5 23:39:18 2020 -0500
Revert "writer null check if not initialized yet during syncrunner run (#2201)"
bad commit message
This reverts commit b0863c5832024033bc13efa3edb7c57b3b753996.
---
.../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 8fb8e83..168cbed 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<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
[hbase] 02/02: HBASE-24713 RS startup with FSHLog throws NPE after
HBASE-21751
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
busbey pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit bfa558a0e3b7548a288f01f1aea0a7a0fe14bd70
Author: gkanade <ga...@gmail.com>
AuthorDate: Wed Aug 5 18:44:12 2020 +0530
HBASE-24713 RS startup with FSHLog throws NPE after HBASE-21751
writer null check if not initialized yet during syncrunner run (#2201)
Signed-off-by: Ramkrishna <ra...@apache.org>
Signed-off-by: Viraj Jasani <vj...@apache.org>
Signed-off-by: AnoopSamJohn<an...@apache.org>
(cherry picked from commit b0863c5832024033bc13efa3edb7c57b3b753996)
---
.../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 168cbed..8fb8e83 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<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