You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by iv...@apache.org on 2013/12/26 20:27:08 UTC

svn commit: r1553558 - in /hadoop/common/branches/branch-1-win: CHANGES.txt src/core/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java src/test/org/apache/hadoop/metrics2/impl/TestMetricsSourceAdapter.java

Author: ivanmi
Date: Thu Dec 26 19:27:07 2013
New Revision: 1553558

URL: http://svn.apache.org/r1553558
Log:
HADOOP-10090. Merging change r1553557 from branch-1.

Added:
    hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/metrics2/impl/TestMetricsSourceAdapter.java
      - copied unchanged from r1553557, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/metrics2/impl/TestMetricsSourceAdapter.java
Modified:
    hadoop/common/branches/branch-1-win/CHANGES.txt
    hadoop/common/branches/branch-1-win/src/core/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java

Modified: hadoop/common/branches/branch-1-win/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.txt?rev=1553558&r1=1553557&r2=1553558&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1-win/CHANGES.txt Thu Dec 26 19:27:07 2013
@@ -77,6 +77,9 @@ Release 1.3.0 - unreleased
     MAPREDUCE-5512. TaskTracker hung after failed reconnect to the JobTracker.
     (ivanmi)
 
+    HADOOP-10090. Jobtracker metrics not updated properly after execution of
+    a mapreduce job (ivanmi)
+
 Release 1.2.1 - Unreleased 
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-1-win/src/core/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/src/core/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java?rev=1553558&r1=1553557&r2=1553558&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/src/core/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java (original)
+++ hadoop/common/branches/branch-1-win/src/core/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java Thu Dec 26 19:27:07 2013
@@ -343,7 +343,7 @@ public class MetricsSystemImpl implement
   private void snapshotMetrics(MetricsSourceAdapter sa,
                                MetricsBufferBuilder bufferBuilder) {
     long startTime = System.currentTimeMillis();
-    bufferBuilder.add(sa.name(), sa.getMetrics(metricsBuilder, false));
+    bufferBuilder.add(sa.name(), sa.getMetrics(metricsBuilder, true));
     metricsBuilder.clear();
     snapshotStat.add(System.currentTimeMillis() - startTime);
     LOG.debug("Snapshotted source "+ sa.name());