HBASE-25482 Improve SimpleRegionNormalizer#getAverageRegionSizeMb (#2858

) Signed-off-by: Nick Dimiduk <ndimiduk@apache.org>
apache · Apr 12, 2021 · 0f9b944 · 0f9b944
1 parent e4d2d9d
commit 0f9b944
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/...erver/src/main/java/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java b/...erver/src/main/java/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.java
@@ -304,16 +304,13 @@ private double getAverageRegionSizeMb(final List<RegionInfo> tableRegions) {
       throw new IllegalStateException(
         "Cannot calculate average size of a table without any regions.");
     }
-    final int regionCount = tableRegions.size();
-    final long totalSizeMb = tableRegions.stream()
-      .mapToLong(this::getRegionSizeMB)
-      .sum();
     TableName table = tableRegions.get(0).getTable();
     int targetRegionCount = -1;
     long targetRegionSize = -1;
+    double avgRegionSize;
     try {
       TableDescriptor tableDescriptor = masterServices.getTableDescriptors().get(table);
-      if (tableDescriptor != null && LOG.isDebugEnabled()) {
+      if (tableDescriptor != null) {
         targetRegionCount = tableDescriptor.getNormalizerTargetRegionCount();
         targetRegionSize = tableDescriptor.getNormalizerTargetRegionSize();
         LOG.debug("Table {} configured with target region count {}, target region size {}", table,
@@ -323,18 +320,22 @@ private double getAverageRegionSizeMb(final List<RegionInfo> tableRegions) {
       LOG.warn("TableDescriptor for {} unavailable, table-level target region count and size"
         + " configurations cannot be considered.", table, e);
     }
-
-    double avgRegionSize;
     if (targetRegionSize > 0) {
       avgRegionSize = targetRegionSize;
-    } else if (targetRegionCount > 0) {
-      avgRegionSize = totalSizeMb / (double) targetRegionCount;
     } else {
-      avgRegionSize = totalSizeMb / (double) regionCount;
+      final int regionCount = tableRegions.size();
+      final long totalSizeMb = tableRegions.stream()
+        .mapToLong(this::getRegionSizeMB)
+        .sum();
+      if (targetRegionCount > 0) {
+        avgRegionSize = totalSizeMb / (double) targetRegionCount;
+      } else {
+        avgRegionSize = totalSizeMb / (double) regionCount;
+      }
+      LOG.debug("Table {}, total aggregated regions size: {} and average region size {}", table,
+        totalSizeMb, avgRegionSize);
     }
 
-    LOG.debug("Table {}, total aggregated regions size: {} and average region size {}", table,
-      totalSizeMb, avgRegionSize);
     return avgRegionSize;
   }