From d9e75859d4f8484cebbcf81c81fa7fba75f10e53 Mon Sep 17 00:00:00 2001 From: Sean Busbey Date: Wed, 25 Jan 2017 15:30:56 -0600 Subject: [PATCH] HBASE-17522 Handle JVM throwing runtime exceptions when we ask for details on heap usage the same as a correctly returned 'undefined'. --- .../tmpl/regionserver/ServerMetricsTmpl.jamon | 22 +++++-- .../apache/hadoop/hbase/io/hfile/CacheConfig.java | 46 +++++--------- .../hadoop/hbase/io/util/MemorySizeUtil.java | 71 +++++++++++++++++++++- .../hadoop/hbase/regionserver/FlushType.java | 37 +++++++++++ .../apache/hadoop/hbase/regionserver/HRegion.java | 10 ++- .../hadoop/hbase/regionserver/HRegionServer.java | 16 +++-- .../hbase/regionserver/HeapMemoryManager.java | 31 ++++++++-- .../hadoop/hbase/regionserver/MemStoreFlusher.java | 10 --- .../hadoop/hbase/io/hfile/TestCacheConfig.java | 6 +- .../hbase/regionserver/TestDefaultMemStore.java | 2 - 10 files changed, 186 insertions(+), 65 deletions(-) create mode 100644 hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/FlushType.java diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon index 82cb4e7..dc638f8 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/ServerMetricsTmpl.jamon @@ -35,6 +35,10 @@ org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos.RegionLoad; org.apache.hadoop.hbase.util.DirectMemoryUtils; org.apache.hadoop.util.StringUtils.TraditionalBinaryPrefix; java.lang.management.ManagementFactory; +java.lang.management.MemoryUsage; +org.apache.hadoop.hbase.io.util.MemorySizeUtil; +org.apache.commons.logging.Log; +org.apache.commons.logging.LogFactory;