svn commit: r736244 - in /hadoop/core/branches/branch-0.18: CHANGES.txt src/mapred/org/apache/hadoop/mapred/TaskInProgress.java

[ddas]

Author: ddas
Date: Tue Jan 20 22:49:21 2009
New Revision: 736244

URL: http://svn.apache.org/viewvc?rev=736244&view=rev
Log:
Merge -r 736242:736243 from trunk onto 0.18 branch. Fixes HADOOP-4983.

Modified:
    hadoop/core/branches/branch-0.18/CHANGES.txt
    
hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/TaskInProgress.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=736244&r1=736243&r2=736244&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/CHANGES.txt Tue Jan 20 22:49:21 2009
@@ -141,6 +141,9 @@
 
     HADOOP-5077. Fix couple of JavaDoc warnings. (Raghu Angadi)
 
+    HADOOP-4983. Fixes a problem in updating Counters in the status reporting.
+    (Amareshwari Sriramadasu via ddas)
+
 Release 0.18.2 - 2008-11-03
 
   BUG FIXES

Modified: 
hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java?rev=736244&r1=736243&r2=736244&view=diff
==============================================================================
--- 
hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java
 (original)
+++ 
hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/TaskInProgress.java
 Tue Jan 20 22:49:21 2009
@@ -643,7 +643,11 @@
           if (status.getProgress() >= bestProgress) {
             bestProgress = status.getProgress();
             bestState = status.getStateString();
-            bestCounters = status.getCounters();
+            if (status.getIncludeCounters()) {
+              bestCounters = status.getCounters();
+            } else {
+              bestCounters = this.counters;
+            }
           }
         }
       }