[hbase] branch branch-2.3 updated: HBASE-26429 HeapMemoryManager fails memstore flushes with NPE if enabled (#3819)

[ap...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

apurtell pushed a commit to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.3 by this push:
     new 7a8483b  HBASE-26429 HeapMemoryManager fails memstore flushes with NPE if enabled (#3819)
7a8483b is described below

commit 7a8483bee4ec01babc46bd7a181f6c2216a29dc3
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 f168c2c..a5f91b4 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
@@ -646,9 +646,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);