You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2021/11/09 02:33:09 UTC
[hbase] branch branch-2.4 updated: HBASE-26429 HeapMemoryManager
fails memstore flushes with NPE if enabled (#3819)
This is an automated email from the ASF dual-hosted git repository.
apurtell pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.4 by this push:
new 6057265 HBASE-26429 HeapMemoryManager fails memstore flushes with NPE if enabled (#3819)
6057265 is described below
commit 6057265388240b49273bc8e32633c2073dea060a
Author: Andrew Purtell <ap...@apache.org>
AuthorDate: Mon Nov 8 18:31:21 2021 -0800
HBASE-26429 HeapMemoryManager fails memstore flushes with NPE if enabled (#3819)
Signed-off-by: Duo Zhang <zh...@apache.org>
Signed-off-by: Viraj Jasani <vj...@apache.org>
---
.../java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
index 1f6a350..88a70b7 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
@@ -653,9 +653,9 @@ class MemStoreFlusher implements FlushRequester {
FlushType type = null;
if (emergencyFlush) {
type = isAboveHighWaterMark();
- if (type == null) {
- type = isAboveLowWaterMark();
- }
+ }
+ if (type == null) {
+ type = isAboveLowWaterMark();
}
for (FlushRequestListener listener : flushRequestListeners) {
listener.flushRequested(type, region);