Author: atm
Date: Fri Feb 17 18:19:31 2012
New Revision: 1245690
URL: http://svn.apache.org/viewvc?rev=1245690&view=rev
Log:
Merge trunk into HA branch.
Modified:
hadoop/common/branches/HDFS-1623/ (props changed)
hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java
Propchange: hadoop/common/branches/HDFS-1623/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 17 18:19:31 2012
@@ -1 +1 @@
-/hadoop/common/trunk:1152502-1245115
+/hadoop/common/trunk:1152502-1245677
Modified: hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml?rev=1245690&r1=1245689&r2=1245690&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml Fri Feb 17 18:19:31
2012
@@ -749,6 +749,11 @@
</pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -932,6 +937,9 @@
<goals>
<goal>jar</goal>
</goals>
+ <configuration>
+ <destDir>${project.build.directory}</destDir>
+ </configuration>
</execution>
</executions>
</plugin>
Modified:
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java?rev=1245690&r1=1245689&r2=1245690&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/LoggedTaskAttempt.java
Fri Feb 17 18:19:31 2012
@@ -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() {
