Skip to content

Commit 7c49300

Browse files
jinggouvirajjasani
authored andcommitted
HBASE-27892 Report memstore on-heap and off-heap size as jmx metrics (#5308)
Signed-off-by: Viraj Jasani <vjasani@apache.org>
1 parent 340b997 commit 7c49300

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSource.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,10 @@ public interface MetricsRegionServerSource extends BaseSource, JvmPauseMonitorSo
233233
String MAX_COMPACTED_STORE_FILE_REF_COUNT = "maxCompactedStoreFileRefCount";
234234
String MEMSTORE_SIZE = "memStoreSize";
235235
String MEMSTORE_SIZE_DESC = "Size of the memstore";
236+
String MEMSTORE_HEAP_SIZE = "memStoreHeapSize";
237+
String MEMSTORE_HEAP_SIZE_DESC = "On-heap Size of the memstore";
238+
String MEMSTORE_OFFHEAP_SIZE = "memStoreOffHeapSize";
239+
String MEMSTORE_OFFHEAP_SIZE_DESC = "Off-heap Size of the memstore";
236240
String STOREFILE_SIZE = "storeFileSize";
237241
String MAX_STORE_FILE_AGE = "maxStoreFileAge";
238242
String MIN_STORE_FILE_AGE = "minStoreFileAge";

hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceImpl.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,10 @@ private MetricsRecordBuilder addGaugesToMetricsRecordBuilder(MetricsRecordBuilde
479479
.addGauge(Interns.info(MAX_STOREFILE_COUNT, MAX_STOREFILE_COUNT_DESC),
480480
rsWrap.getMaxStoreFiles())
481481
.addGauge(Interns.info(MEMSTORE_SIZE, MEMSTORE_SIZE_DESC), rsWrap.getMemStoreSize())
482+
.addGauge(Interns.info(MEMSTORE_HEAP_SIZE, MEMSTORE_HEAP_SIZE_DESC),
483+
rsWrap.getOnHeapMemStoreSize())
484+
.addGauge(Interns.info(MEMSTORE_OFFHEAP_SIZE, MEMSTORE_OFFHEAP_SIZE_DESC),
485+
rsWrap.getOffHeapMemStoreSize())
482486
.addGauge(Interns.info(STOREFILE_SIZE, STOREFILE_SIZE_DESC), rsWrap.getStoreFileSize())
483487
.addGauge(Interns.info(MAX_STORE_FILE_AGE, MAX_STORE_FILE_AGE_DESC),
484488
rsWrap.getMaxStoreFileAge())

hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionServer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ public void testWrapperSource() {
8383
HELPER.assertGauge("hlogFileSize", 1024000, serverSource);
8484
HELPER.assertGauge("storeFileCount", 300, serverSource);
8585
HELPER.assertGauge("memstoreSize", 1025, serverSource);
86+
HELPER.assertGauge("memstoreHeapSize", 500, serverSource);
87+
HELPER.assertGauge("memstoreOffHeapSize", 600, serverSource);
8688
HELPER.assertGauge("storeFileSize", 1900, serverSource);
8789
HELPER.assertCounter("totalRequestCount", 899, serverSource);
8890
HELPER.assertCounter("totalRowActionRequestCount",

0 commit comments

Comments
 (0)