MAPREDUCE-3757. [Rumen] Fixed Rumen Folder to adjust shuffleFinished and sortFinished times when needed.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1245303 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce-project/CHANGES.txt

@@ -55,6 +55,8 @@ Trunk (unreleased changes)
 
   BUG FIXES
 
+    MAPREDUCE-3757. [Rumen] Fixed Rumen Folder to adjust shuffleFinished and
+                    sortFinished times when needed.
     MAPREDUCE-3194. "mapred mradmin" command is broken in mrv2
                      (Jason Lowe via bobby)
 

hadoop-mapreduce-project/src/docs/src/documentation/content/xdocs/rumen.xml

@@ -293,7 +293,7 @@
         <tr>
           <td><code>-output-duration</code></td>
           <td>This parameter defines the final runtime of the trace. 
-              Default value if <strong>1 hour</strong>.
+              Default value is <strong>1 hour</strong>.
           </td>
           <td>'<code>-output-duration 30m</code>' 
               implies that the resulting trace will have a max runtime of 

hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java

@@ -275,6 +275,12 @@ public class LoggedTaskAttempt implements DeepCompare {
   void adjustTimes(long adjustment) {
     startTime += adjustment;
     finishTime += adjustment;
+
+    // For reduce attempts, adjust the different phases' finish times also 
+    if (sortFinished >= 0) {
+      shuffleFinished += adjustment;
+      sortFinished += adjustment;
+    }
   }
 
   public long getShuffleFinished() {