HBASE-22530 The metrics of store files count of region are returned t…

…o clients incorrectly (Eungsop Yoo) Signed-off-by: Xu Cang <[email protected]>
apache · Jun 14, 2019 · 8e15f4e · 8e15f4e
1 parent 9ba7651
commit 8e15f4e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionMetricsBuilder.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/RegionMetricsBuilder.java
@@ -111,7 +111,7 @@ public static ClusterStatusProtos.RegionLoad toRegionLoad(RegionMetrics regionMe
         .setRootIndexSizeKB((int) regionMetrics.getStoreFileRootLevelIndexSize()
           .get(Size.Unit.KILOBYTE))
         .setStores(regionMetrics.getStoreCount())
-        .setStorefiles(regionMetrics.getStoreCount())
+        .setStorefiles(regionMetrics.getStoreFileCount())
         .setStoreRefCount(regionMetrics.getStoreRefCount())
         .setStorefileSizeMB((int) regionMetrics.getStoreFileSize().get(Size.Unit.MEGABYTE))
         .addAllStoreCompleteSequenceId(toStoreSequenceId(regionMetrics.getStoreSequenceId()))

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionMetrics.java
@@ -20,6 +20,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.EnumSet;
@@ -130,6 +132,27 @@ public void testRegionMetrics() throws Exception {
         regionMetrics.stream().map(r -> Bytes.toString(r.getRegionName())).
           collect(Collectors.toList()));
       assertEquals(serverMetrics.getRegionMetrics().size(), regionMetrics.size());
+      checkMetricsValue(regionMetrics, serverMetrics);
+    }
+  }
+
+  private void checkMetricsValue(List<RegionMetrics> regionMetrics, ServerMetrics serverMetrics)
+    throws InvocationTargetException, IllegalAccessException {
+    for (RegionMetrics fromRM : regionMetrics) {
+      RegionMetrics fromSM = serverMetrics.getRegionMetrics().get(fromRM.getRegionName());
+      Class clazz = RegionMetrics.class;
+      for (Method method : clazz.getMethods()) {
+        // check numeric values only
+        if (method.getReturnType().equals(Size.class)
+          || method.getReturnType().equals(int.class)
+          || method.getReturnType().equals(long.class)
+          || method.getReturnType().equals(float.class)) {
+          Object valueRm = method.invoke(fromRM);
+          Object valueSM = method.invoke(fromSM);
+          assertEquals("Return values of method " + method.getName() + " are different",
+              valueRm.toString(), valueSM.toString());
+        }
+      }
     }
   }