Author: tgraves
Date: Tue Mar 26 20:10:04 2013
New Revision: 1461296
URL: http://svn.apache.org/r1461296
Log:
MAPREDUCE-3757. [Rumen] Fixed Rumen Folder to adjust shuffleFinished and
sortFinished times when needed. (Ravi Gummadi via tgraves)
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java
hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedHost.java
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java?rev=1461296&r1=1461295&r2=1461296&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java
Tue Mar 26 20:10:04 2013
@@ -275,6 +275,12 @@ public class LoggedTaskAttempt implement
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() {
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedHost.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedHost.java?rev=1461296&r1=1461295&r2=1461296&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedHost.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedHost.java
Tue Mar 26 20:10:04 2013
@@ -80,8 +80,8 @@ public class ParsedHost {
public ParsedHost(LoggedLocation loc) {
List<NodeName> coordinates = loc.getLayers();
- rackName = coordinates.get(0).getRackName();
- nodeName = coordinates.get(1).getHostName();
+ rackName = process(coordinates.get(0).getRackName());
+ nodeName = process(coordinates.get(1).getHostName());
}
LoggedLocation makeLoggedLocation() {
