From f24338a2ae6ebf3b0d1a91ebb40e3f2e0e151020 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 | 18 +++-- .../apache/hadoop/hbase/io/hfile/CacheConfig.java | 46 ++++-------- .../hadoop/hbase/io/util/MemorySizeUtil.java | 83 +++++++++++++++++++++- .../hadoop/hbase/regionserver/FlushType.java | 37 ++++++++++ .../apache/hadoop/hbase/regionserver/HRegion.java | 10 ++- .../hadoop/hbase/regionserver/HRegionServer.java | 14 ++-- .../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, 191 insertions(+), 66 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..f901030 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 @@ -34,7 +34,8 @@ org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo; 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;