Author: ddas
Date: Mon Oct 20 01:58:44 2008
New Revision: 706156

URL: http://svn.apache.org/viewvc?rev=706156&view=rev
Log:
Merge -r 706153:706154 from trunk onto 0.19 branch. Fixes HADOOP-4457.

Modified:
    hadoop/core/branches/branch-0.19/CHANGES.txt
    
hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobInProgress.java

Modified: hadoop/core/branches/branch-0.19/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/CHANGES.txt?rev=706156&r1=706155&r2=706156&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Mon Oct 20 01:58:44 2008
@@ -908,6 +908,9 @@
     HADOOP-4399. Make fuse-dfs multi-thread access safe.
     (Pete Wyckoff via dhruba)
 
+    HADOOP-4457. Fixes an input split logging problem introduced by
+    HADOOP-3245. (Amareshwari Sriramadasu via ddas)
+
 Release 0.18.2 - Unreleased
 
   BUG FIXES

Modified: 
hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobInProgress.java?rev=706156&r1=706155&r2=706156&view=diff
==============================================================================
--- 
hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
 (original)
+++ 
hadoop/core/branches/branch-0.19/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
 Mon Oct 20 01:58:44 2008
@@ -1091,6 +1091,7 @@
                                         boolean isScheduled) {
     // keeping the earlier ordering intact
     String name;
+    String splits = "";
     Enum counter = null;
     if (tip.isSetupTask()) {
       launchedSetup = true;
@@ -1102,6 +1103,7 @@
       ++runningMapTasks;
       name = Values.MAP.name();
       counter = Counter.TOTAL_LAUNCHED_MAPS;
+      splits = tip.getSplitNodes();
       if (tip.getActiveTasks().size() > 1)
         speculativeMapTasks++;
     } else {
@@ -1115,7 +1117,7 @@
     // restart has already their logs in place.
     if (tip.isFirstAttempt(id)) {
       JobHistory.Task.logStarted(tip.getTIPId(), name,
-                                 tip.getExecStartTime(), "");
+                                 tip.getExecStartTime(), splits);
     }
     if (!tip.isSetupTask() && !tip.isCleanupTask()) {
       jobCounters.incrCounter(counter, 1);


Reply via email to