HBASE-26429 HeapMemoryManager fails memstore flushes with NPE if enab…

…led (#3819) Signed-off-by: Duo Zhang <[email protected]> Signed-off-by: Viraj Jasani <[email protected]>
apache · Nov 9, 2021 · 7a8483b · 7a8483b
1 parent 0889a91
commit 7a8483b
Showing 1 changed file with 3 additions and 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
@@ -646,9 +646,9 @@ private void notifyFlushRequest(Region region, boolean emergencyFlush) {
     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);