Author: cos Date: Fri Jul 5 21:40:46 2013 New Revision: 1500140 URL: http://svn.apache.org/r1500140 Log: HDFS-4860. Add additional attributes to JMX beans. Contributed by Trevor Lorimer
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java?rev=1500140&r1=1500139&r2=1500140&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java Fri Jul 5 21:40:46 2013 @@ -101,8 +101,10 @@ public class JvmMetrics implements Metri Runtime runtime = Runtime.getRuntime(); rb.addGauge(MemNonHeapUsedM, memNonHeap.getUsed() / M) .addGauge(MemNonHeapCommittedM, memNonHeap.getCommitted() / M) + .addGauge(MemNonHeapMaxM, memNonHeap.getMax() / M) .addGauge(MemHeapUsedM, memHeap.getUsed() / M) .addGauge(MemHeapCommittedM, memHeap.getCommitted() / M) + .addGauge(MemHeapMaxM, memHeap.getMax() / M) .addGauge(MemMaxM, runtime.maxMemory() / M); } Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java?rev=1500140&r1=1500139&r2=1500140&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java Fri Jul 5 21:40:46 2013 @@ -32,8 +32,10 @@ public enum JvmMetricsInfo implements Me // metrics MemNonHeapUsedM("Non-heap memory used in MB"), MemNonHeapCommittedM("Non-heap memory committed in MB"), + MemNonHeapMaxM("Non-heap memory max in MB"), MemHeapUsedM("Heap memory used in MB"), MemHeapCommittedM("Heap memory committed in MB"), + MemHeapMaxM("Heap memory max in MB"), MemMaxM("Max memory size in MB"), GcCount("Total GC count"), GcTimeMillis("Total GC time in milliseconds"),