svn commit: r1076963 - /hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java

[omalley]

Author: omalley
Date: Fri Mar  4 03:26:21 2011
New Revision: 1076963

URL: http://svn.apache.org/viewvc?rev=1076963&view=rev
Log:
commit c8942d7260f7331b9aac5846b1472824f69e43f9
Author: Lee Tucker <ltuc...@yahoo-inc.com>
Date:   Thu Jul 30 17:40:49 2009 -0700

    Applying patch 2925597.mr809.patch

Modified:
    
hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java

Modified: 
hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java?rev=1076963&r1=1076962&r2=1076963&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
 (original)
+++ 
hadoop/common/branches/branch-0.20-security-patches/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
 Fri Mar  4 03:26:21 2011
@@ -2324,14 +2324,16 @@ class JobInProgress {
   private synchronized void terminateJob(int jobTerminationState) {
     if ((status.getRunState() == JobStatus.RUNNING) ||
         (status.getRunState() == JobStatus.PREP)) {
-      // Log the job summary
-      JobSummary.logJobSummary(this, jobtracker.getClusterStatus(false));
-      
       if (jobTerminationState == JobStatus.FAILED) {
         this.status = new JobStatus(status.getJobID(),
                                     1.0f, 1.0f, 1.0f, JobStatus.FAILED,
                                     status.getJobPriority());
         this.finishTime = System.currentTimeMillis();
+
+        // Log the job summary
+        JobSummary.logJobSummary(this, jobtracker.getClusterStatus(false));
+        
+        // Log to job-history
         JobHistory.JobInfo.logFailed(this.status.getJobID(), finishTime, 
                                      this.finishedMapTasks, 
                                      this.finishedReduceTasks);
@@ -2340,6 +2342,11 @@ class JobInProgress {
                                     1.0f, 1.0f, 1.0f, JobStatus.KILLED,
                                     status.getJobPriority());
         this.finishTime = System.currentTimeMillis();
+
+        // Log the job summary
+        JobSummary.logJobSummary(this, jobtracker.getClusterStatus(false));
+        
+        // Log to job-history
         JobHistory.JobInfo.logKilled(this.status.getJobID(), finishTime, 
                                      this.finishedMapTasks, 
                                      this.finishedReduceTasks);