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 05:11:50 UTC
[hbase] branch branch-2.2 updated (41f8253 -> e13da4c)
This is an automated email from the ASF dual-hosted git repository.
busbey pushed a change to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git.
from 41f8253 HBASE-24821 simplify the logic of getRegionInfo in TestFlushFromClient to reduce redundancy code
new 34b2b48 Revert "Writer check while trying to attain safe point (#2134)"
new e13da4c 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] 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.2
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit e13da4cd707cdc84fa36bd98eeb8d8b7efc3be82
Author: gkanade <ga...@gmail.com>
AuthorDate: Mon Aug 3 10:07:06 2020 +0530
HBASE-24713 RS startup with FSHLog throws NPE after HBASE-21751
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>
(cherry picked from commit 3a8b4d67386967b50a42941814801a2874d994eb)
---
.../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
[hbase] 01/02: Revert "Writer check while trying to attain safe
point (#2134)"
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.2
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 34b2b48a6f6c5546f98a6716cfc6f5f001ed2f1d
Author: Sean Busbey <bu...@apache.org>
AuthorDate: Thu Aug 6 00:02:22 2020 -0500
Revert "Writer check while trying to attain safe point (#2134)"
bad commit message
This reverts commit 3a8b4d67386967b50a42941814801a2874d994eb.
---
.../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 1794a25..7b8334b 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.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