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:25 UTC
[hbase] branch branch-2.3 updated (3fc905c -> 76ceb50)
This is an automated email from the ASF dual-hosted git repository.
busbey pushed a change to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/hbase.git.
from 3fc905c HBASE-24821 simplify the logic of getRegionInfo in TestFlushFromClient to reduce redundancy code
new 825bdfb Revert "Cherry pick HBASE-24713 RS startup with FSHLog throws NPE after HBASE-21751 (#2133)"
new 76ceb50 HBASE-24713 RS startup with FSHLog throws NPE after HBASE-21751 (#2133)
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 "Cherry pick HBASE-24713 RS startup with
FSHLog throws NPE after HBASE-21751 (#2133)"
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.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
[hbase] 02/02: HBASE-24713 RS startup with FSHLog throws NPE after
HBASE-21751 (#2133)
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.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