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 ha...@apache.org on 2008/06/27 01:19:33 UTC

svn commit: r672055 - in /hadoop/core/branches/branch-0.18: CHANGES.txt src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java

Author: hairong
Date: Thu Jun 26 16:19:33 2008
New Revision: 672055

URL: http://svn.apache.org/viewvc?rev=672055&view=rev
Log:
Merge -r 672052:672053 from trunk to move the change introduced by HADOOP-3645 to branch 0.18.

Modified:
    hadoop/core/branches/branch-0.18/CHANGES.txt
    hadoop/core/branches/branch-0.18/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java

Modified: hadoop/core/branches/branch-0.18/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=672055&r1=672054&r2=672055&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/CHANGES.txt Thu Jun 26 16:19:33 2008
@@ -704,6 +704,9 @@
 
     HADOOP-3571. Fix bug in block removal used in lease recovery. (shv)
 
+    HADOOP-3645. MetricsTimeVaryingRate returns wrong value for
+    metric_avg_time. (Lohit Vijayarenu via hairong)
+
 Release 0.17.0 - 2008-05-18
 
   INCOMPATIBLE CHANGES

Modified: hadoop/core/branches/branch-0.18/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java?rev=672055&r1=672054&r2=672055&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java (original)
+++ hadoop/core/branches/branch-0.18/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java Thu Jun 26 16:19:33 2008
@@ -134,7 +134,7 @@
     intervalHeartBeat();
     try {
       mr.incrMetric(name + "_num_ops", getPreviousIntervalNumOps());
-      mr.incrMetric(name + "_avg_time", getPreviousIntervalNumOps());
+      mr.incrMetric(name + "_avg_time", getPreviousIntervalAverageTime());
     } catch (Exception e) {
       LOG.info("pushMetric failed for " + name + "\n" +
           StringUtils.stringifyException(e));