From 15e6f2bd74976a5d2c89bf43e3ffaf0de4705567 Mon Sep 17 00:00:00 2001
From: meiyi <meiyi@xiaomi.com>
Date: Fri, 11 Mar 2022 16:44:46 +0800
Subject: [PATCH] HBASE-26827 RegionServer JVM crash when compact mob table

---
 .../hbase/mob/DefaultMobStoreCompactor.java   | 10 +++----
 .../hbase/mob/FaultyMobStoreCompactor.java    | 10 +++----
 .../TestCompactionWithByteBuff.java           | 28 ++++++++++++++-----
 3 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreCompactor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreCompactor.java
index f568af0b19a..3d161832dd6 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreCompactor.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreCompactor.java
@@ -550,11 +550,11 @@ public class DefaultMobStoreCompactor extends DefaultCompactor {
             progress.cancel();
             return false;
           }
-          if (kvs != null && bytesWrittenProgressForShippedCall > shippedCallSizeLimit) {
-            ((ShipperListener) writer).beforeShipped();
-            kvs.shipped();
-            bytesWrittenProgressForShippedCall = 0;
-          }
+        }
+        if (kvs != null && bytesWrittenProgressForShippedCall > shippedCallSizeLimit) {
+          ((ShipperListener) writer).beforeShipped();
+          kvs.shipped();
+          bytesWrittenProgressForShippedCall = 0;
         }
         // Log the progress of long running compactions every minute if
         // logging at DEBUG level
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/FaultyMobStoreCompactor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/FaultyMobStoreCompactor.java
index 96675fb69e5..9d321283c56 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/FaultyMobStoreCompactor.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/FaultyMobStoreCompactor.java
@@ -323,11 +323,11 @@ public class FaultyMobStoreCompactor extends DefaultMobStoreCompactor {
             progress.cancel();
             return false;
           }
-          if (kvs != null && bytesWrittenProgressForShippedCall > shippedCallSizeLimit) {
-            ((ShipperListener) writer).beforeShipped();
-            kvs.shipped();
-            bytesWrittenProgressForShippedCall = 0;
-          }
+        }
+        if (kvs != null && bytesWrittenProgressForShippedCall > shippedCallSizeLimit) {
+          ((ShipperListener) writer).beforeShipped();
+          kvs.shipped();
+          bytesWrittenProgressForShippedCall = 0;
         }
         // Log the progress of long running compactions every minute if
         // logging at DEBUG level
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionWithByteBuff.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionWithByteBuff.java
index 3c91425330e..3d0f3b92d9c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionWithByteBuff.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionWithByteBuff.java
@@ -32,6 +32,7 @@ import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.client.TableDescriptor;
 import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
 import org.apache.hadoop.hbase.io.ByteBuffAllocator;
+import org.apache.hadoop.hbase.io.DeallocateRewriteByteBuffAllocator;
 import org.apache.hadoop.hbase.testclassification.LargeTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.JVMClusterUtil;
@@ -64,6 +65,8 @@ public class TestCompactionWithByteBuff {
   @BeforeClass
   public static void setupBeforeClass() throws Exception {
     conf.setBoolean(ByteBuffAllocator.ALLOCATOR_POOL_ENABLED_KEY, true);
+    conf.set(ByteBuffAllocator.BYTEBUFF_ALLOCATOR_CLASS,
+      DeallocateRewriteByteBuffAllocator.class.getName());
     conf.setInt(ByteBuffAllocator.BUFFER_SIZE_KEY, 1024 * 5);
     conf.setInt(CompactSplit.SMALL_COMPACTION_THREADS, REGION_COUNT * 2);
     conf.setInt(CompactSplit.LARGE_COMPACTION_THREADS, REGION_COUNT * 2);
@@ -78,11 +81,9 @@ public class TestCompactionWithByteBuff {
     TEST_UTIL.shutdownMiniCluster();
   }
 
-  @Test
-  public void testCompaction() throws Exception {
-    TableName table = TableName.valueOf("t1");
+  private void testCompaction(TableName table, boolean isMob) throws Exception {
     admin.compactionSwitch(false, new ArrayList<>(0));
-    try (Table t = createTable(TEST_UTIL, table)) {
+    try (Table t = createTable(TEST_UTIL, table, isMob)) {
       for (int i = 0; i < 2; i++) {
         put(t);
         admin.flush(table);
@@ -108,9 +109,22 @@ public class TestCompactionWithByteBuff {
     }
   }
 
-  private Table createTable(HBaseTestingUtil util, TableName tableName) throws IOException {
-    TableDescriptor td = TableDescriptorBuilder.newBuilder(tableName).setColumnFamily(
-      ColumnFamilyDescriptorBuilder.newBuilder(COLUMN).setBlocksize(1024 * 4).build()).build();
+  @Test
+  public void testCompaction() throws Exception {
+    testCompaction(TableName.valueOf(name.getMethodName()), false);
+  }
+
+  @Test
+  public void testCompactionForMobTable() throws Exception {
+    testCompaction(TableName.valueOf(name.getMethodName()), true);
+  }
+
+  private Table createTable(HBaseTestingUtil util, TableName tableName, boolean isMob)
+    throws IOException {
+    TableDescriptor td = TableDescriptorBuilder.newBuilder(tableName)
+      .setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(COLUMN).setBlocksize(1024 * 4)
+        .setMobEnabled(isMob).setMobThreshold(10240).build())
+      .build();
     byte[][] splits = new byte[REGION_COUNT - 1][];
     for (int i = 1; i < REGION_COUNT; i++) {
       splits[i - 1] = Bytes.toBytes(buildRow((int) (ROW_COUNT / REGION_COUNT * i)));