Browse Source

HADOOP-6279. Add Runtime::maxMemory to JVM metrics. Contributed by Todd Lipcon

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@823271 13f79535-47bb-0310-9956-ffa450edef68
Christopher Douglas 15 years ago
parent
commit
b903b25072
2 changed files with 6 additions and 0 deletions
  1. 3 0
      CHANGES.txt
  2. 3 0
      src/java/org/apache/hadoop/metrics/jvm/JvmMetrics.java

+ 3 - 0
CHANGES.txt

@@ -15,6 +15,9 @@ Trunk (unreleased changes)
     HADOOP-6283. Improve the exception messages thrown by
     HADOOP-6283. Improve the exception messages thrown by
     FileUtil$HardLink.getLinkCount(..).  (szetszwo)
     FileUtil$HardLink.getLinkCount(..).  (szetszwo)
 
 
+    HADOOP-6279. Add Runtime::maxMemory to JVM metrics. (Todd Lipcon via
+    cdouglas)
+
   OPTIMIZATIONS
   OPTIMIZATIONS
 
 
   BUG FIXES
   BUG FIXES

+ 3 - 0
src/java/org/apache/hadoop/metrics/jvm/JvmMetrics.java

@@ -104,10 +104,13 @@ public class JvmMetrics implements Updater {
                 memoryMXBean.getNonHeapMemoryUsage();
                 memoryMXBean.getNonHeapMemoryUsage();
         MemoryUsage memHeap =
         MemoryUsage memHeap =
                 memoryMXBean.getHeapMemoryUsage();
                 memoryMXBean.getHeapMemoryUsage();
+        Runtime runtime = Runtime.getRuntime();
+
         metrics.setMetric("memNonHeapUsedM", memNonHeap.getUsed()/M);
         metrics.setMetric("memNonHeapUsedM", memNonHeap.getUsed()/M);
         metrics.setMetric("memNonHeapCommittedM", memNonHeap.getCommitted()/M);
         metrics.setMetric("memNonHeapCommittedM", memNonHeap.getCommitted()/M);
         metrics.setMetric("memHeapUsedM", memHeap.getUsed()/M);
         metrics.setMetric("memHeapUsedM", memHeap.getUsed()/M);
         metrics.setMetric("memHeapCommittedM", memHeap.getCommitted()/M);
         metrics.setMetric("memHeapCommittedM", memHeap.getCommitted()/M);
+        metrics.setMetric("maxMemoryM", runtime.maxMemory()/M);
     }
     }
     
     
     private void doGarbageCollectionUpdates() {
     private void doGarbageCollectionUpdates() {