You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by to...@apache.org on 2012/04/19 01:35:37 UTC
svn commit: r1327724 - in /hadoop/common/branches/HDFS-3042: ./ dev-support/
hadoop-client/ hadoop-dist/ hadoop-minicluster/ hadoop-project-dist/
hadoop-project/ hadoop-tools/hadoop-archives/ hadoop-tools/hadoop-distcp/
hadoop-tools/hadoop-extras/ hado...
Author: todd
Date: Wed Apr 18 23:35:30 2012
New Revision: 1327724
URL: http://svn.apache.org/viewvc?rev=1327724&view=rev
Log:
Merge trunk into auto-HA branch
Modified:
hadoop/common/branches/HDFS-3042/ (props changed)
hadoop/common/branches/HDFS-3042/dev-support/test-patch.sh
hadoop/common/branches/HDFS-3042/hadoop-client/ (props changed)
hadoop/common/branches/HDFS-3042/hadoop-dist/ (props changed)
hadoop/common/branches/HDFS-3042/hadoop-minicluster/ (props changed)
hadoop/common/branches/HDFS-3042/hadoop-project-dist/ (props changed)
hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-archives/ (props changed)
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-distcp/ (props changed)
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-extras/ (props changed)
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-rumen/ (props changed)
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/HistoryEventEmitter.java
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-streaming/ (props changed)
hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-tools-dist/ (props changed)
Propchange: hadoop/common/branches/HDFS-3042/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1324567-1327718
Modified: hadoop/common/branches/HDFS-3042/dev-support/test-patch.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/dev-support/test-patch.sh?rev=1327724&r1=1327723&r2=1327724&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3042/dev-support/test-patch.sh (original)
+++ hadoop/common/branches/HDFS-3042/dev-support/test-patch.sh Wed Apr 18 23:35:30 2012
@@ -627,22 +627,17 @@ runTests () {
echo ""
echo ""
- echo "$MVN clean install -Pnative -D${PROJECT_NAME}PatchProcess"
- $MVN clean install -Pnative -D${PROJECT_NAME}PatchProcess
- if [[ $? != 0 ]] ; then
- ### Find and format names of failed tests
- failed_tests=`find . -name 'TEST*.xml' | xargs $GREP -l -E "<failure|<error" | sed -e "s|.*target/surefire-reports/TEST-| |g" | sed -e "s|\.xml||g"`
-
- if [[ -n "$failed_tests" ]] ; then
- JIRA_COMMENT="$JIRA_COMMENT
+ echo "$MVN clean install -fn -Pnative -D${PROJECT_NAME}PatchProcess"
+ $MVN clean install -fn -Pnative -D${PROJECT_NAME}PatchProcess
+ failed_tests=`find . -name 'TEST*.xml' | xargs $GREP -l -E "<failure|<error" | sed -e "s|.*target/surefire-reports/TEST-| |g" | sed -e "s|\.xml||g"`
+ # With -fn mvn always exits with a 0 exit code. Because of this we need to
+ # find the errors instead of using the exit code. We assume that if the build
+ # failed a -1 is already given for that case
+ if [[ -n "$failed_tests" ]] ; then
+ JIRA_COMMENT="$JIRA_COMMENT
-1 core tests. The patch failed these unit tests:
$failed_tests"
- else
- JIRA_COMMENT="$JIRA_COMMENT
-
- -1 core tests. The patch failed the unit tests build"
- fi
return 1
fi
JIRA_COMMENT="$JIRA_COMMENT
Propchange: hadoop/common/branches/HDFS-3042/hadoop-client/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Apr 18 23:35:30 2012
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
Propchange: hadoop/common/branches/HDFS-3042/hadoop-dist/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Apr 18 23:35:30 2012
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
Propchange: hadoop/common/branches/HDFS-3042/hadoop-minicluster/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Apr 18 23:35:30 2012
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
Propchange: hadoop/common/branches/HDFS-3042/hadoop-project-dist/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Apr 18 23:35:30 2012
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
Modified: hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml?rev=1327724&r1=1327723&r2=1327724&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-3042/hadoop-project/pom.xml Wed Apr 18 23:35:30 2012
@@ -668,7 +668,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.10</version>
+ <version>2.12</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Propchange: hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-archives/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Apr 18 23:35:30 2012
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
Propchange: hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-distcp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Apr 18 23:35:30 2012
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
Propchange: hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-extras/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Apr 18 23:35:30 2012
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
Propchange: hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-rumen/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Apr 18 23:35:30 2012
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
Modified: hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/HistoryEventEmitter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/HistoryEventEmitter.java?rev=1327724&r1=1327723&r2=1327724&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/HistoryEventEmitter.java (original)
+++ hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/HistoryEventEmitter.java Wed Apr 18 23:35:30 2012
@@ -80,6 +80,8 @@ abstract class HistoryEventEmitter {
}
counters = counters.replace("\\.", "\\\\.");
+ counters = counters.replace("\\\\{", "\\{");
+ counters = counters.replace("\\\\}", "\\}");
counters = counters.replace("\\\\(", "\\(");
counters = counters.replace("\\\\)", "\\)");
counters = counters.replace("\\\\[", "\\[");
Modified: hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java?rev=1327724&r1=1327723&r2=1327724&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java (original)
+++ hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/Task20LineHistoryEventEmitter.java Wed Apr 18 23:35:30 2012
@@ -128,7 +128,7 @@ public class Task20LineHistoryEventEmitt
return null;
}
- return new TaskFinishedEvent(taskID, Long.parseLong(finishTime),
+ return new TaskFinishedEvent(taskID, null, Long.parseLong(finishTime),
that.originalTaskType, status, eventCounters);
}
Propchange: hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-streaming/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Apr 18 23:35:30 2012
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings
Propchange: hadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-tools-dist/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Apr 18 23:35:30 2012
@@ -1 +1,4 @@
target
+.classpath
+.project
+.settings