From 0dd42f791639b543c204ca51b5c76b4966082ea7 Mon Sep 17 00:00:00 2001 From: stack Date: Mon, 29 Jun 2020 14:19:44 -0700 Subject: [PATCH] HBASE-24648 Remove the legacy 'forceSplit' related code at region server side (#1990) Addendum to fix TestHeapSize --- .../java/org/apache/hadoop/hbase/regionserver/HRegion.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java index 3982a532fb5..487deea7723 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -8345,10 +8345,10 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi public static final long FIXED_OVERHEAD = ClassSize.align( ClassSize.OBJECT + - 56 * ClassSize.REFERENCE + + 55 * ClassSize.REFERENCE + 3 * Bytes.SIZEOF_INT + 14 * Bytes.SIZEOF_LONG + - 3 * Bytes.SIZEOF_BOOLEAN); + 2 * Bytes.SIZEOF_BOOLEAN); // woefully out of date - currently missing: // 1 x HashMap - coprocessorServiceHandlers