You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by co...@apache.org on 2010/06/21 21:20:42 UTC
svn commit: r956674 - in /hadoop/mapreduce/branches/branch-0.21: ./ conf/
ivy/ src/c++/ src/contrib/ src/contrib/block_forensics/
src/contrib/capacity-scheduler/ src/contrib/data_join/
src/contrib/dynamic-scheduler/ src/contrib/eclipse-plugin/ src/cont...
Author: cos
Date: Mon Jun 21 19:20:40 2010
New Revision: 956674
URL: http://svn.apache.org/viewvc?rev=956674&view=rev
Log:
MAPREDUCE-1774. svn merge -r 956335:956668 from trunk.
Added:
hadoop/mapreduce/branches/branch-0.21/ivy/hadoop-mapred-instrumented-template.xml
- copied unchanged from r956668, hadoop/mapreduce/trunk/ivy/hadoop-mapred-instrumented-template.xml
hadoop/mapreduce/branches/branch-0.21/ivy/hadoop-mapred-instrumented-test-template.xml
- copied unchanged from r956668, hadoop/mapreduce/trunk/ivy/hadoop-mapred-instrumented-test-template.xml
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/testjar/JobKillCommitter.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/mapred/testjar/JobKillCommitter.java
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/testjar/UserNamePermission.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/mapred/testjar/UserNamePermission.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/
- copied from r956668, hadoop/mapreduce/trunk/src/test/system/
hadoop/mapreduce/branches/branch-0.21/src/test/system/aop/
- copied from r956668, hadoop/mapreduce/trunk/src/test/system/aop/
hadoop/mapreduce/branches/branch-0.21/src/test/system/aop/org/
- copied from r956668, hadoop/mapreduce/trunk/src/test/system/aop/org/
hadoop/mapreduce/branches/branch-0.21/src/test/system/aop/org/apache/
- copied from r956668, hadoop/mapreduce/trunk/src/test/system/aop/org/apache/
hadoop/mapreduce/branches/branch-0.21/src/test/system/aop/org/apache/hadoop/
- copied from r956668, hadoop/mapreduce/trunk/src/test/system/aop/org/apache/hadoop/
hadoop/mapreduce/branches/branch-0.21/src/test/system/aop/org/apache/hadoop/mapred/
- copied from r956668, hadoop/mapreduce/trunk/src/test/system/aop/org/apache/hadoop/mapred/
hadoop/mapreduce/branches/branch-0.21/src/test/system/aop/org/apache/hadoop/mapred/JTProtocolAspect.aj
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/aop/org/apache/hadoop/mapred/JTProtocolAspect.aj
hadoop/mapreduce/branches/branch-0.21/src/test/system/aop/org/apache/hadoop/mapred/JobClientAspect.aj
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/aop/org/apache/hadoop/mapred/JobClientAspect.aj
hadoop/mapreduce/branches/branch-0.21/src/test/system/aop/org/apache/hadoop/mapred/JobInProgressAspect.aj
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/aop/org/apache/hadoop/mapred/JobInProgressAspect.aj
hadoop/mapreduce/branches/branch-0.21/src/test/system/aop/org/apache/hadoop/mapred/JobTrackerAspect.aj
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/aop/org/apache/hadoop/mapred/JobTrackerAspect.aj
hadoop/mapreduce/branches/branch-0.21/src/test/system/aop/org/apache/hadoop/mapred/MapReducePolicyProviderAspect.aj
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/aop/org/apache/hadoop/mapred/MapReducePolicyProviderAspect.aj
hadoop/mapreduce/branches/branch-0.21/src/test/system/aop/org/apache/hadoop/mapred/TaskAspect.aj
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/aop/org/apache/hadoop/mapred/TaskAspect.aj
hadoop/mapreduce/branches/branch-0.21/src/test/system/aop/org/apache/hadoop/mapred/TaskTrackerAspect.aj
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/aop/org/apache/hadoop/mapred/TaskTrackerAspect.aj
hadoop/mapreduce/branches/branch-0.21/src/test/system/aop/org/apache/hadoop/mapreduce/
- copied from r956668, hadoop/mapreduce/trunk/src/test/system/aop/org/apache/hadoop/mapreduce/
hadoop/mapreduce/branches/branch-0.21/src/test/system/aop/org/apache/hadoop/mapreduce/ClusterAspect.aj
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/aop/org/apache/hadoop/mapreduce/ClusterAspect.aj
hadoop/mapreduce/branches/branch-0.21/src/test/system/conf/
- copied from r956668, hadoop/mapreduce/trunk/src/test/system/conf/
hadoop/mapreduce/branches/branch-0.21/src/test/system/conf/system-test-mapred.xml
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/conf/system-test-mapred.xml
hadoop/mapreduce/branches/branch-0.21/src/test/system/java/
- copied from r956668, hadoop/mapreduce/trunk/src/test/system/java/
hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/
- copied from r956668, hadoop/mapreduce/trunk/src/test/system/java/org/
hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/apache/
- copied from r956668, hadoop/mapreduce/trunk/src/test/system/java/org/apache/
hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/apache/hadoop/
- copied from r956668, hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/
hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/apache/hadoop/mapred/
- copied from r956668, hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapred/
hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/apache/hadoop/mapred/JobInfoImpl.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapred/JobInfoImpl.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/apache/hadoop/mapred/TTInfoImpl.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapred/TTInfoImpl.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/apache/hadoop/mapred/TTTaskInfoImpl.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapred/TTTaskInfoImpl.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/apache/hadoop/mapred/TaskInfoImpl.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapred/TaskInfoImpl.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/apache/hadoop/mapreduce/
- copied from r956668, hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/
hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/apache/hadoop/mapreduce/test/
- copied from r956668, hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/
hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/apache/hadoop/mapreduce/test/system/
- copied from r956668, hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/system/
hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/apache/hadoop/mapreduce/test/system/FinishTaskControlAction.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/system/FinishTaskControlAction.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTClient.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTClient.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTProtocol.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JTProtocol.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JobInfo.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/system/JobInfo.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/apache/hadoop/mapreduce/test/system/MRCluster.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/system/MRCluster.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/apache/hadoop/mapreduce/test/system/MRDaemonClient.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/system/MRDaemonClient.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTClient.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTClient.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTInfo.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTInfo.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTProtocol.java
- copied, changed from r956668, hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTProtocol.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTTaskInfo.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTTaskInfo.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TaskInfo.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TaskInfo.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/test/
- copied from r956668, hadoop/mapreduce/trunk/src/test/system/test/
hadoop/mapreduce/branches/branch-0.21/src/test/system/test/org/
- copied from r956668, hadoop/mapreduce/trunk/src/test/system/test/org/
hadoop/mapreduce/branches/branch-0.21/src/test/system/test/org/apache/
- copied from r956668, hadoop/mapreduce/trunk/src/test/system/test/org/apache/
hadoop/mapreduce/branches/branch-0.21/src/test/system/test/org/apache/hadoop/
- copied from r956668, hadoop/mapreduce/trunk/src/test/system/test/org/apache/hadoop/
hadoop/mapreduce/branches/branch-0.21/src/test/system/test/org/apache/hadoop/mapred/
- copied from r956668, hadoop/mapreduce/trunk/src/test/system/test/org/apache/hadoop/mapred/
hadoop/mapreduce/branches/branch-0.21/src/test/system/test/org/apache/hadoop/mapred/TestCluster.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/test/org/apache/hadoop/mapred/TestCluster.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/test/org/apache/hadoop/mapred/TestControlledJob.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/test/org/apache/hadoop/mapred/TestControlledJob.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/test/org/apache/hadoop/mapred/TestDistributedCacheModifiedFile.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/test/org/apache/hadoop/mapred/TestDistributedCacheModifiedFile.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/test/org/apache/hadoop/mapred/TestDistributedCachePrivateFile.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/test/org/apache/hadoop/mapred/TestDistributedCachePrivateFile.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/test/org/apache/hadoop/mapred/TestDistributedCacheUnModifiedFile.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/test/org/apache/hadoop/mapred/TestDistributedCacheUnModifiedFile.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/test/org/apache/hadoop/mapred/TestFileOwner.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/test/org/apache/hadoop/mapred/TestFileOwner.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/test/org/apache/hadoop/mapred/TestJobKill.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/test/org/apache/hadoop/mapred/TestJobKill.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/test/org/apache/hadoop/mapred/TestPushConfig.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/test/org/apache/hadoop/mapred/TestPushConfig.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/test/org/apache/hadoop/mapred/TestSortValidate.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/test/org/apache/hadoop/mapred/TestSortValidate.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/test/org/apache/hadoop/mapred/TestTaskKilling.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/test/org/apache/hadoop/mapred/TestTaskKilling.java
hadoop/mapreduce/branches/branch-0.21/src/test/system/test/org/apache/hadoop/mapred/TestTaskOwner.java
- copied unchanged from r956668, hadoop/mapreduce/trunk/src/test/system/test/org/apache/hadoop/mapred/TestTaskOwner.java
Modified:
hadoop/mapreduce/branches/branch-0.21/ (props changed)
hadoop/mapreduce/branches/branch-0.21/.gitignore (props changed)
hadoop/mapreduce/branches/branch-0.21/CHANGES.txt (contents, props changed)
hadoop/mapreduce/branches/branch-0.21/build.xml
hadoop/mapreduce/branches/branch-0.21/conf/ (props changed)
hadoop/mapreduce/branches/branch-0.21/conf/capacity-scheduler.xml.template (props changed)
hadoop/mapreduce/branches/branch-0.21/ivy.xml
hadoop/mapreduce/branches/branch-0.21/ivy/libraries.properties
hadoop/mapreduce/branches/branch-0.21/src/c++/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/build-contrib.xml (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/build.xml (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/capacity-scheduler/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/data_join/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/dynamic-scheduler/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/eclipse-plugin/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/fairscheduler/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/index/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/mrunit/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/streaming/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/contrib/vaidya/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/examples/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/java/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/test/aop/build/aop.xml
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/fs/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/hdfs/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/io/FileBench.java (props changed)
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java (props changed)
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/ipc/ (props changed)
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/UtilsForTests.java
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java (props changed)
hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java (props changed)
hadoop/mapreduce/branches/branch-0.21/src/webapps/job/ (props changed)
Propchange: hadoop/mapreduce/branches/branch-0.21/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,2 +1,2 @@
/hadoop/core/branches/branch-0.19/mapred:713112
-/hadoop/mapreduce/trunk:940364,942764,946526
+/hadoop/mapreduce/trunk:940364,942764,946526,956336-956668
Propchange: hadoop/mapreduce/branches/branch-0.21/.gitignore
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/.gitignore:713112
/hadoop/core/trunk/.gitignore:784664-785643
-/hadoop/mapreduce/trunk/.gitignore:940364,946526
+/hadoop/mapreduce/trunk/.gitignore:940364,946526,956336-956668
Modified: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/CHANGES.txt?rev=956674&r1=956673&r2=956674&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.21/CHANGES.txt Mon Jun 21 19:20:40 2010
@@ -55,6 +55,9 @@ Release 0.21.0 - Unreleased
NEW FEATURES
+ MAPREDUCE-1774. Large-scale Automated Framework (Sharad Agarwal, Sreekanth
+ Ramakrishnan, Konstantin Boudnik, at all via cos)
+
MAPREDUCE-706. Support for FIFO pools in the fair scheduler.
(Matei Zaharia)
Propchange: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/CHANGES.txt:713112
/hadoop/mapreduce/branches/HDFS-641/CHANGES.txt:817878-835964
-/hadoop/mapreduce/trunk/CHANGES.txt:940364,942764,946526,952460
+/hadoop/mapreduce/trunk/CHANGES.txt:940364,942764,946526,952460,956336-956668
Modified: hadoop/mapreduce/branches/branch-0.21/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/build.xml?rev=956674&r1=956673&r2=956674&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/build.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/build.xml Mon Jun 21 19:20:40 2010
@@ -30,6 +30,7 @@
<property name="Name" value="Hadoop-Mapred"/>
<property name="name" value="hadoop-mapred"/>
+ <!-- Need to change aop.xml project.version prop. synchronously -->
<property name="version" value="0.21.0-SNAPSHOT"/>
<property name="final.name" value="${name}-${version}"/>
<property name="test.final.name" value="${name}-test-${version}"/>
@@ -208,7 +209,7 @@
<property name="hadoop-mapred-test.jar" location="${build.dir}/${test.final.name}.jar" />
<property name="hadoop-mapred-examples.jar" location="${build.dir}/${examples.final.name}.jar" />
<property name="hadoop-mapred-tools.jar" location="${build.dir}/${tools.final.name}.jar" />
-
+ <property name="hadoop-mapred-fi.jar" location="${build.dir}/${final.name}-fi.jar" />
<property name="hadoop-mapred-sources.jar" location="${build.dir}/${final.name}-sources.jar" />
<property name="hadoop-mapred-test-sources.jar" location="${build.dir}/${test.final.name}-sources.jar" />
<property name="hadoop-mapred-examples-sources.jar" location="${build.dir}/${examples.final.name}-sources.jar" />
@@ -239,7 +240,7 @@
<path id="test.classpath">
<pathelement location="${test.build.extraconf}"/>
- <pathelement location="${test.core.build.classes}" />
+ <pathelement location="${test.mapred.build.classes}" />
<pathelement location="${test.src.dir}"/>
<pathelement location="${build.dir}"/>
<pathelement location="${build.examples}"/>
@@ -509,19 +510,10 @@
<mkdir dir="${test.mapred.build.testjar}"/>
<mkdir dir="${test.mapred.build.testshell}"/>
- <javac
- encoding="${build.encoding}"
- srcdir="${test.src.dir}/mapred;${test.src.dir}/unit"
- includes="org/apache/hadoop/**/*.java"
- destdir="${test.mapred.build.classes}"
- debug="${javac.debug}"
- optimize="${javac.optimize}"
- target="${javac.version}"
- source="${javac.version}"
- deprecation="${javac.deprecation}">
- <compilerarg line="${javac.args} ${javac.args.warnings}" />
- <classpath refid="test.classpath"/>
- </javac>
+ <macro-compile-test
+ source.dir="${test.src.dir}/mapred;${test.src.dir}/unit"
+ dest.dir="${test.mapred.build.classes}"
+ classpath="test.classpath"/>
<javac
encoding="${build.encoding}"
@@ -575,6 +567,28 @@
<copy file="${test.src.dir}/mapred/org/apache/hadoop/cli/data60bytes" todir="${test.cache.data}"/>
</target>
+ <macrodef name="macro-compile-test">
+ <attribute name="source.dir"/>
+ <attribute name="dest.dir"/>
+ <attribute name="classpath"/>
+ <sequential>
+ <mkdir dir="@{dest.dir}"/>
+ <javac
+ encoding="${build.encoding}"
+ srcdir="@{source.dir}"
+ includes="org/apache/hadoop/**/*.java"
+ destdir="@{dest.dir}"
+ debug="${javac.debug}"
+ optimize="${javac.optimize}"
+ target="${javac.version}"
+ source="${javac.version}"
+ deprecation="${javac.deprecation}">
+ <compilerarg line="${javac.args} ${javac.args.warnings}"/>
+ <classpath refid="@{classpath}"/>
+ </javac>
+ </sequential>
+ </macrodef>
+
<!-- ================================================================== -->
<!-- Make hadoop-mapred-test.jar -->
<!-- ================================================================== -->
@@ -584,6 +598,16 @@
<copy todir="${test.build.classes}">
<fileset dir="${test.mapred.build.classes}"/>
</copy>
+ <subant buildpath="build.xml" target="-do-jar-test"/>
+ <jar jarfile="${hadoop-mapred-test-sources.jar}">
+ <fileset dir="${test.src.dir}/mapred" includes="org/apache/hadoop/**/*.java" />
+ <fileset dir="${test.src.dir}/unit" includes="org/apache/hadoop/**/*.java" />
+ <fileset dir="${test.src.dir}/mapred/testjar" includes="*.java" />
+ <fileset dir="${test.src.dir}/mapred/testshell" includes="*.java" />
+ </jar>
+ </target>
+
+ <target name="-do-jar-test">
<jar jarfile="${build.dir}/${test.final.name}.jar"
basedir="${test.build.classes}">
<manifest>
@@ -596,27 +620,24 @@
</section>
</manifest>
</jar>
-
- <jar jarfile="${hadoop-mapred-test-sources.jar}">
- <fileset dir="${test.src.dir}/mapred" includes="org/apache/hadoop/**/*.java" />
- <fileset dir="${test.src.dir}/unit" includes="org/apache/hadoop/**/*.java" />
- <fileset dir="${test.src.dir}/mapred/testjar" includes="*.java" />
- <fileset dir="${test.src.dir}/mapred/testshell" includes="*.java" />
- </jar>
</target>
<macrodef name="macro-test-runner">
<attribute name="test.file" />
<attribute name="suite.type" />
+ <attribute name="classpath" />
+ <attribute name="test.dir" />
+ <attribute name="fileset.dir" />
+ <attribute name="hadoop.conf.dir.deployed" default="" />
<sequential>
- <delete dir="${test.build.data}"/>
- <mkdir dir="${test.build.data}"/>
- <delete dir="${test.log.dir}"/>
- <mkdir dir="${test.log.dir}"/>
+ <delete dir="@{test.dir}/data"/>
+ <mkdir dir="@{test.dir}/data"/>
+ <delete dir="@{test.dir}/logs"/>
+ <mkdir dir="@{test.dir}/logs"/>
<copy file="${test.src.dir}/hadoop-policy.xml"
- todir="${test.build.extraconf}" />
+ todir="@{test.dir}/extraconf" />
<copy file="${test.src.dir}/fi-site.xml"
- todir="${test.build.extraconf}" />
+ todir="@{test.dir}/extraconf" />
<junit showoutput="${test.output}"
printsummary="${test.junit.printsummary}"
haltonfailure="${test.junit.haltonfailure}"
@@ -625,15 +646,15 @@
maxmemory="${test.junit.maxmemory}"
dir="${basedir}" timeout="${test.timeout}"
errorProperty="tests.failed" failureProperty="tests.failed">
- <sysproperty key="test.build.data" value="${test.build.data}"/>
+ <sysproperty key="test.build.data" value="@{test.dir}/data"/>
<sysproperty key="test.tools.input.dir" value = "${test.tools.input.dir}"/>
<sysproperty key="test.cache.data" value="${test.cache.data}"/>
<sysproperty key="test.debug.data" value="${test.debug.data}"/>
- <sysproperty key="hadoop.log.dir" value="${test.log.dir}"/>
- <sysproperty key="test.src.dir" value="${test.src.dir}"/>
- <sysproperty key="taskcontroller-path" value="${taskcontroller-path}"/>
+ <sysproperty key="hadoop.log.dir" value="@{test.dir}/logs"/>
+ <sysproperty key="test.src.dir" value="@{fileset.dir}"/>
+ <sysproperty key="taskcontroller-path" value="${taskcontroller-path}"/>
<sysproperty key="taskcontroller-ugi" value="${taskcontroller-ugi}"/>
- <sysproperty key="test.build.extraconf" value="${test.build.extraconf}" />
+ <sysproperty key="test.build.extraconf" value="@{test.dir}/extraconf" />
<sysproperty key="hadoop.policy.file" value="hadoop-policy.xml"/>
<sysproperty key="java.library.path"
value="${build.native}/lib:${lib.dir}/native/${build.platform}"/>
@@ -650,36 +671,39 @@
<syspropertyset id="FaultProbabilityProperties">
<propertyref regex="fi.*"/>
</syspropertyset>
-
- <classpath refid="test.classpath"/>
+ <sysproperty key="test.system.hdrc.deployed.hadoopconfdir"
+ value="@{hadoop.conf.dir.deployed}" />
+ <classpath refid="@{classpath}"/>
<formatter type="${test.junit.output.format}" />
- <batchtest todir="${test.build.dir}" unless="testcase">
- <fileset dir="${test.src.dir}/@{suite.type}" excludes="**/${test.exclude}.java">
+ <batchtest todir="@{test.dir}" unless="testcase">
+ <fileset dir="@{fileset.dir}/@{suite.type}"
+ excludes="**/${test.exclude}.java aop/** system/**">
<patternset>
<includesfile name="@{test.file}"/>
</patternset>
</fileset>
</batchtest>
- <batchtest todir="${test.build.dir}" if="testcase">
- <fileset dir="${test.src.dir}/mapred" includes="**/${testcase}.java"/>
- <fileset dir="${test.src.dir}/unit" includes="**/${testcase}.java"/>
+ <batchtest todir="@{test.dir}" if="testcase">
+ <fileset dir="@{fileset.dir}/mapred" includes="**/${testcase}.java"/>
+ <fileset dir="@{fileset.dir}/unit" includes="**/${testcase}.java"/>
+ <fileset dir="@{fileset.dir}/system/test" includes="**/${testcase}.java"/>
</batchtest>
<!--batch test to test all the testcases in aop folder with fault
injection-->
- <batchtest todir="${test.build.dir}" if="tests.notestcase.fi">
- <fileset dir="${test.src.dir}/aop"
+ <batchtest todir="@{test.dir}" if="tests.notestcase.fi">
+ <fileset dir="@{fileset.dir}/aop"
includes="**/${test.include}.java"
excludes="**/${test.exclude}.java" />
</batchtest>
<!-- batch test for testing a single test case in aop folder with
fault injection-->
- <batchtest todir="${test.build.dir}" if="tests.testcase.fi">
- <fileset dir="${test.src.dir}/aop" includes="**/${testcase}.java"/>
+ <batchtest todir="@{test.dir}" if="tests.testcase.fi">
+ <fileset dir="@{fileset.dir}/aop" includes="**/${testcase}.java"/>
</batchtest>
<!--The following batch is for very special occasions only when
a non-FI tests are needed to be executed against FI-environment -->
- <batchtest todir="${test.build.dir}" if="tests.testcaseonly.fi">
- <fileset dir="${test.src.dir}/mapred"
+ <batchtest todir="@{test.dir}" if="tests.testcaseonly.fi">
+ <fileset dir="@{fileset.dir}/mapred"
includes="**/${testcase}.java"/>
</batchtest>
</junit>
@@ -688,15 +712,24 @@
</macrodef>
<target name="run-test-mapred" depends="compile-mapred-test" description="Run mapred functional and system tests">
- <macro-test-runner test.file="${test.mapred.all.tests.file}" suite.type="mapred"/>
+ <macro-test-runner test.file="${test.mapred.all.tests.file}" suite.type="mapred"
+ classpath="${test.classpath.id}"
+ test.dir="${test.build.dir}"
+ fileset.dir="${test.src.dir}"/>
</target>
<target name="run-commit-test" depends="compile-mapred-test" description="Run approximate 10-minute set of unit tests prior to commiting">
- <macro-test-runner test.file="${test.mapred.commit.tests.file}" suite.type="mapred"/>
+ <macro-test-runner test.file="${test.mapred.commit.tests.file}" suite.type="mapred"
+ classpath="${test.classpath.id}"
+ test.dir="${test.build.dir}"
+ fileset.dir="${test.src.dir}"/>
</target>
<target name="run-test-unit" depends="compile-mapred-test" description="Run unit tests">
- <macro-test-runner test.file="${test.mapred.all.tests.file}" suite.type="unit"/>
+ <macro-test-runner test.file="${test.mapred.all.tests.file}" suite.type="unit"
+ classpath="${test.classpath.id}"
+ test.dir="${test.build.dir}"
+ fileset.dir="${test.src.dir}"/>
</target>
@@ -1200,6 +1233,45 @@
</target>
+ <target name="binary-system" depends="bin-package, jar-system, jar-test-system"
+ description="make system test package for deployment">
+ <!--TODO!!!!! fix this shit...-->
+ <copy todir="${system-test-build-dir}/${final.name}">
+ <fileset dir="${dist.dir}">
+ </fileset>
+ </copy>
+ <copy todir="${system-test-build-dir}/${final.name}/conf">
+ <fileset dir="${test.src.dir}/system/conf/"/>
+ </copy>
+ <copy todir="${system-test-build-dir}">
+ <fileset dir="${build.dir}">
+ <include name="${test.final.name}.jar"/>
+ <include name="${examples.final.name}.jar"/>
+ </fileset>
+ </copy>
+ <copy tofile="${system-test-build-dir}/${final.name}/lib/hadoop-common-${version}.jar"
+ file="${build-fi.dir}/ivy/lib/${ant.project.name}/system/hadoop-common-${herriot.suffix}-${version}.jar"
+ overwrite="true"/>
+ <copy tofile="${system-test-build-dir}/${final.name}/lib/hadoop-hdfs-${version}.jar"
+ file="${build-fi.dir}/ivy/lib/${ant.project.name}/system/hadoop-hdfs-${herriot.suffix}-${version}.jar"
+ overwrite="true"/>
+ <copy tofile="${system-test-build-dir}/${final.name}/${final.name}.jar"
+ file="${system-test-build-dir}/${instrumented.final.name}.jar" overwrite="true"/>
+ <copy tofile="${system-test-build-dir}/${final.name}/${final.name}-sources.jar"
+ file="${system-test-build-dir}/${instrumented.final.name}-sources.jar" overwrite="true"/>
+ <macro_tar
+ param.destfile="${system-test-build-dir}/${final.name}-bin.${herriot.suffix}.tar.gz">
+ <param.listofitems>
+ <tarfileset dir="${system-test-build-dir}" mode="664">
+ <exclude name="${final.name}/bin/*" />
+ <exclude name="${final.name}/src/**" />
+ <exclude name="${final.name}/docs/**" />
+ <include name="${final.name}/**" />
+ </tarfileset>
+ </param.listofitems>
+ </macro_tar>
+ </target>
+
<target name="binary" depends="bin-package" description="Make tarball without source and documentation">
<macro_tar param.destfile="${build.dir}/${final.name}-bin.tar.gz">
<param.listofitems>
@@ -1253,7 +1325,8 @@
</artifact:install>
</target>
- <target name="mvn-install" depends="mvn-taskdef,examples,tools,jar-test,set-version">
+ <target name="mvn-install" depends="mvn-taskdef,examples,tools,jar-test,set-version,
+ -mvn-system-install">
<artifact:pom file="${hadoop-mapred.pom}" id="hadoop.mapred"/>
<artifact:pom file="${hadoop-mapred-test.pom}" id="hadoop.mapred.test"/>
<artifact:pom file="${hadoop-mapred-examples.pom}" id="hadoop.mapred.examples"/>
@@ -1276,7 +1349,8 @@
</artifact:install>
</target>
- <target name="mvn-deploy" depends="mvn-taskdef, examples, tools, jar-test, set-version">
+ <target name="mvn-deploy" depends="mvn-taskdef, examples, tools, jar-test, set-version,
+ -mvn-system-deploy">
<artifact:pom file="${hadoop-mapred.pom}" id="hadoop.mapred"/>
<artifact:pom file="${hadoop-mapred-test.pom}" id="hadoop.mapred.test"/>
<artifact:pom file="${hadoop-mapred-examples.pom}" id="hadoop.mapred.examples"/>
@@ -1308,12 +1382,20 @@
<target name="set-version">
<delete file="${basedir}/ivy/hadoop-mapred.xml"/>
<delete file="${basedir}/ivy/hadoop-mapred-test.xml"/>
+ <delete file="${basedir}/ivy/hadoop-mapred-${herriot.suffix}.xml"/>
+ <delete file="${basedir}/ivy/hadoop-mapred-${herriot.suffix}-test.xml"/>
<delete file="${basedir}/ivy/hadoop-mapred-examples.xml"/>
<delete file="${basedir}/ivy/hadoop-mapred-tools.xml"/>
+ <delete file="${hadoop-mapred-instrumented.pom}"/>
<copy file="${basedir}/ivy/hadoop-mapred-template.xml" tofile="${basedir}/ivy/hadoop-mapred.xml"/>
<copy file="${basedir}/ivy/hadoop-mapred-test-template.xml" tofile="${basedir}/ivy/hadoop-mapred-test.xml"/>
+ <copy file="${basedir}/ivy/hadoop-mapred-${herriot.suffix}-template.xml"
+ tofile="${basedir}/ivy/hadoop-mapred-${herriot.suffix}.xml"/>
+ <copy file="${basedir}/ivy/hadoop-mapred-${herriot.suffix}-test-template.xml"
+ tofile="${basedir}/ivy/hadoop-mapred-${herriot.suffix}-test.xml"/>
<copy file="${basedir}/ivy/hadoop-mapred-examples-template.xml" tofile="${basedir}/ivy/hadoop-mapred-examples.xml"/>
<copy file="${basedir}/ivy/hadoop-mapred-tools-template.xml" tofile="${basedir}/ivy/hadoop-mapred-tools.xml"/>
+ <copy file="${basedir}/ivy/hadoop-mapred-${herriot.suffix}-template.xml" tofile="${hadoop-mapred-instrumented.pom}"/>
<replaceregexp byline="true">
<regexp pattern="@version"/>
<substitution expression="${version}"/>
@@ -1342,6 +1424,14 @@
<include name="hadoop-mapred-tools.xml"/>
</fileset>
</replaceregexp>
+ <replaceregexp byline="true">
+ <regexp pattern="@version"/>
+ <substitution expression="${version}"/>
+ <fileset dir="${basedir}/ivy">
+ <include name="hadoop-mapred-${herriot.suffix}.xml"/>
+ <include name="hadoop-mapred-${herriot.suffix}-test.xml"/>
+ </fileset>
+ </replaceregexp>
</target>
<!-- ================================================================== -->
@@ -1385,11 +1475,13 @@
<!-- ================================================================== -->
<!-- Clean. Delete the build files, and their directories -->
<!-- ================================================================== -->
- <target name="clean" depends="clean-contrib" description="Clean. Delete the build files, and their directories">
+ <target name="clean" depends="clean-contrib, clean-fi" description="Clean. Delete the build files, and their directories">
<delete dir="${build.dir}"/>
<delete dir="${docs.src}/build"/>
<delete file="${hadoop-mapred.pom}"/>
<delete file="${hadoop-mapred-test.pom}"/>
+ <delete file="${hadoop-mapred-instrumented.pom}"/>
+ <delete file="${hadoop-mapred-instrumented-test.pom}"/>
<delete file="${hadoop-mapred-examples.pom}"/>
<delete file="${hadoop-mapred-tools.pom}"/>
</target>
@@ -1733,6 +1825,11 @@
log="${ivyresolvelog}"/>
</target>
+ <target name="ivy-resolve-system" depends="ivy-init">
+ <ivy:resolve settingsRef="${ant.project.name}.ivy.settings" conf="system"
+ log="${ivyresolvelog}"/>
+ </target>
+
<target name="ivy-retrieve" depends="ivy-resolve"
description="Retrieve Ivy-managed artifacts">
<ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
@@ -1788,6 +1885,14 @@
<ivy:cachepath pathid="releaseaudit-classpath" conf="releaseaudit"/>
</target>
+ <target name="ivy-retrieve-system" depends="ivy-resolve-system"
+ description="Retrieve Ivy-managed artifacts for the system tests">
+ <ivy:retrieve settingsRef="${ant.project.name}.ivy.settings"
+ pattern="${build.ivy.lib.dir}/${ivy.artifact.retrieve.pattern}"
+ log="${ivyresolvelog}"/>
+ <ivy:cachepath pathid="ivy-system.classpath" conf="system"/>
+ </target>
+
<target name="ivy-report" depends="ivy-resolve-releaseaudit"
description="Generate">
<ivy:report todir="${build.ivy.report.dir}" settingsRef="${ant.project.name}.ivy.settings"/>
@@ -1883,6 +1988,7 @@
description="Make hadoop-fi.jar">
<macro-jar-fault-inject
target.name="jar"
+ build.dir="${build-fi.dir}"
jar.final.name="final.name"
jar.final.value="${final.name}-fi" />
</target>
Propchange: hadoop/mapreduce/branches/branch-0.21/conf/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/conf:713112
/hadoop/core/trunk/conf:784664-785643
-/hadoop/mapreduce/trunk/conf:940364,946526
+/hadoop/mapreduce/trunk/conf:940364,946526,956336-956668
Propchange: hadoop/mapreduce/branches/branch-0.21/conf/capacity-scheduler.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/conf/capacity-scheduler.xml.template:713112
/hadoop/core/trunk/conf/capacity-scheduler.xml.template:776175-785643
-/hadoop/mapreduce/trunk/conf/capacity-scheduler.xml.template:940364,946526
+/hadoop/mapreduce/trunk/conf/capacity-scheduler.xml.template:940364,946526,956336-956668
Modified: hadoop/mapreduce/branches/branch-0.21/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/ivy.xml?rev=956674&r1=956673&r2=956674&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/ivy.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/ivy.xml Mon Jun 21 19:20:40 2010
@@ -39,6 +39,7 @@
<conf name="common" visibility="private" extends="compile,runtime" description="common artifacts"/>
<conf name="javadoc" visibility="private" description="artiracts required while performing doc generation" extends="common"/>
<conf name="test" extends="common" visibility="private" description="the classpath needed to run tests"/>
+ <conf name="system" extends="test" visibility="private" description="the classpath needed to run system tests"/>
<conf name="test-hdfswithmr" extends="test" visibility="private" description="the classpath needed to run tests"/>
@@ -60,6 +61,10 @@
rev="${hadoop-common.version}" conf="common->default"/>
<dependency org="org.apache.hadoop" name="hadoop-hdfs"
rev="${hadoop-hdfs.version}" conf="common->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-common-instrumented"
+ rev="${hadoop-common.version}" conf="system->default"/>
+ <dependency org="org.apache.hadoop" name="hadoop-hdfs-instrumented"
+ rev="${hadoop-common.version}" conf="system->default"/>
<dependency org="commons-logging" name="commons-logging"
rev="${commons-logging.version}" conf="common->master"/>
<dependency org="log4j" name="log4j" rev="${log4j.version}"
Modified: hadoop/mapreduce/branches/branch-0.21/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/ivy/libraries.properties?rev=956674&r1=956673&r2=956674&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/ivy/libraries.properties (original)
+++ hadoop/mapreduce/branches/branch-0.21/ivy/libraries.properties Mon Jun 21 19:20:40 2010
@@ -18,6 +18,7 @@ apacheant.version=1.7.1
ant-task.version=2.0.10
#Aspectj depedency for Fault injection
+#This property has to be updated synchronously with aop.xml
aspectj.version=1.6.5
avro.version=1.3.0
Propchange: hadoop/mapreduce/branches/branch-0.21/src/c++/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/c++:713112
/hadoop/core/trunk/src/c++:776175-784663
-/hadoop/mapreduce/trunk/src/c++:940364,946526
+/hadoop/mapreduce/trunk/src/c++:940364,946526,956336-956668
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib:713112
/hadoop/core/trunk/src/contrib:784664-785643
-/hadoop/mapreduce/trunk/src/contrib:940364,946526
+/hadoop/mapreduce/trunk/src/contrib:940364,946526,956336-956668
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/block_forensics/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,2 +1,2 @@
/hadoop/core/branches/branch-0.19/hdfs/src/contrib/block_forensics:713112
-/hadoop/mapreduce/trunk/src/contrib/block_forensics:940364,946526
+/hadoop/mapreduce/trunk/src/contrib/block_forensics:940364,946526,956336-956668
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/build-contrib.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/build-contrib.xml:713112
/hadoop/core/trunk/src/contrib/build-contrib.xml:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/build-contrib.xml:940364,946526
+/hadoop/mapreduce/trunk/src/contrib/build-contrib.xml:940364,946526,956336-956668
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/build.xml:713112
/hadoop/core/trunk/src/contrib/build.xml:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/build.xml:940364,946526
+/hadoop/mapreduce/trunk/src/contrib/build.xml:940364,946526,956336-956668
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/capacity-scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/capacity-scheduler:713112
/hadoop/core/trunk/src/contrib/capacity-scheduler:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/capacity-scheduler:940364,946526
+/hadoop/mapreduce/trunk/src/contrib/capacity-scheduler:940364,946526,956336-956668
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/data_join/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/data_join:713112
/hadoop/core/trunk/src/contrib/data_join:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/data_join:940364,946526
+/hadoop/mapreduce/trunk/src/contrib/data_join:940364,946526,956336-956668
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/dynamic-scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/src/contrib/dynamic-scheduler:713112
/hadoop/core/trunk/src/contrib/dynamic-scheduler:784975-786373
-/hadoop/mapreduce/trunk/src/contrib/dynamic-scheduler:940364,946526
+/hadoop/mapreduce/trunk/src/contrib/dynamic-scheduler:940364,946526,956336-956668
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/eclipse-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/core/src/contrib/eclipse-plugin:713112
/hadoop/core/trunk/src/contrib/eclipse-plugin:776175-784663
-/hadoop/mapreduce/trunk/src/contrib/eclipse-plugin:940364,946526
+/hadoop/mapreduce/trunk/src/contrib/eclipse-plugin:940364,946526,956336-956668
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/fairscheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/fairscheduler:713112
/hadoop/core/trunk/src/contrib/fairscheduler:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/fairscheduler:940364,946526
+/hadoop/mapreduce/trunk/src/contrib/fairscheduler:940364,946526,956336-956668
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/index/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/index:713112
/hadoop/core/trunk/src/contrib/index:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/index:940364,946526
+/hadoop/mapreduce/trunk/src/contrib/index:940364,946526,956336-956668
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/mrunit/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/mrunit:713112
/hadoop/core/trunk/src/contrib/mrunit:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/mrunit:940364,946526
+/hadoop/mapreduce/trunk/src/contrib/mrunit:940364,946526,956336-956668
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/streaming/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/streaming:713112
/hadoop/core/trunk/src/contrib/streaming:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/streaming:940364,946526
+/hadoop/mapreduce/trunk/src/contrib/streaming:940364,946526,956336-956668
Propchange: hadoop/mapreduce/branches/branch-0.21/src/contrib/vaidya/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/vaidya:713112
/hadoop/core/trunk/src/contrib/vaidya:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/vaidya:940364,946526
+/hadoop/mapreduce/trunk/src/contrib/vaidya:940364,946526,956336-956668
Propchange: hadoop/mapreduce/branches/branch-0.21/src/examples/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/examples:713112
/hadoop/core/trunk/src/examples:776175-784663
-/hadoop/mapreduce/trunk/src/examples:940364,946526
+/hadoop/mapreduce/trunk/src/examples:940364,946526,956336-956668
Propchange: hadoop/mapreduce/branches/branch-0.21/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/java:713112
/hadoop/core/trunk/src/mapred:776175-785643
-/hadoop/mapreduce/trunk/src/java:940364,946526
+/hadoop/mapreduce/trunk/src/java:940364,946526,956336-956668
Modified: hadoop/mapreduce/branches/branch-0.21/src/test/aop/build/aop.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/test/aop/build/aop.xml?rev=956674&r1=956673&r2=956674&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/test/aop/build/aop.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/test/aop/build/aop.xml Mon Jun 21 19:20:40 2010
@@ -14,13 +14,42 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="aspects">
+<project name="aspects"
+ xmlns:artifact="urn:maven-artifact-ant">
+ <!-- The followng are duplications and have to be customized elsewhere too -->
+ <!-- TODO this version has to be updated synchronously with Ivy -->
+ <property name="aspectversion" value="1.6.5"/>
+ <!-- TODO this has to be changed synchronously with build.xml version prop.-->
+ <!-- this workarounds of test-patch setting its own 'version' -->
+ <property name="project.version" value="0.21.0-SNAPSHOT"/>
+
+ <!-- Properties common for all fault injections -->
<property name="build-fi.dir" value="${basedir}/build-fi"/>
<property name="hadoop-fi.jar" location="${build.dir}/${final.name}-fi.jar" />
<property name="compile-inject.output" value="${build-fi.dir}/compile-fi.log"/>
- <property name="aspectversion" value="1.6.5"/>
<property file="${basedir}/build.properties"/>
+ <!-- Properties related to system fault injection and tests -->
+ <property name="herriot.suffix" value="instrumented"/>
+ <property name="system-test-build-dir" value="${build-fi.dir}/system"/>
+ <!-- This varialbe is set by respective injection targets -->
+ <property name="hadoop.instrumented.jars" value=""/>
+ <!-- Properties specifically for system fault-injections and system tests -->
+ <property name="herriot.suffix" value="instrumented"/>
+ <property name="instrumented.final.name"
+ value="${name}-${herriot.suffix}-${version}"/>
+ <property name="hadoop-mapred-instrumented.pom"
+ location="${ivy.dir}/hadoop-mapred-${herriot.suffix}.xml" />
+ <property name="hadoop-mapred-instrumented-test.pom"
+ location="${ivy.dir}/hadoop-mapred-${herriot.suffix}-test.xml" />
+ <property name="hadoop-mapred-instrumented.jar"
+ location="${system-test-build-dir}/${name}-${herriot.suffix}-${version}.jar" />
+ <property name="hadoop-mapred-instrumented-sources.jar"
+ location="${system-test-build-dir}/${name}-${herriot.suffix}-${version}-sources.jar" />
+ <property name="hadoop-mapred-instrumented-test.jar"
+ location="${system-test-build-dir}/${name}-${herriot.suffix}-test-${version}.jar" />
+ <property name="hadoop-mapred-instrumented-test-sources.jar"
+ location="${system-test-build-dir}/${name}-${herriot.suffix}-test-${version}-sources.jar" />
<!--All Fault Injection (FI) related targets are located in this session -->
<target name="clean-fi">
@@ -39,21 +68,27 @@
<taskdef
resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties">
<classpath>
- <pathelement
+ <pathelement
location="${common.ivy.lib.dir}/aspectjtools-${aspectversion}.jar"/>
</classpath>
</taskdef>
<echo message="Start weaving aspects in place"/>
+ <path id="aspect.path">
+ <pathelement location="${hadoop.instrumented.jars}"/>
+ </path>
<iajc
encoding="${build.encoding}"
- srcdir="${java.src.dir};${build.src};${test.src.dir}/aop"
+ srcdir="${java.src.dir};${build.src};${src.dir.path}"
includes="org/apache/hadoop/**/*.java, org/apache/hadoop/**/*.aj"
excludes="org/apache/hadoop/record/**/*"
- destDir="${build.classes}"
+ destDir="${dest.dir}"
debug="${javac.debug}"
target="${javac.version}"
source="${javac.version}"
- deprecation="${javac.deprecation}">
+ deprecation="${javac.deprecation}"
+ fork="true"
+ maxmem="256m">
+ <aspectpath refid="aspect.path"/>
<classpath refid="test.classpath"/>
</iajc>
<loadfile property="injection.failure" srcfile="${compile-inject.output}">
@@ -69,15 +104,133 @@
<echo message="Weaving of aspects is finished"/>
</target>
+ <!-- Classpath for running system tests -->
+ <path id="test.system.classpath">
+ <pathelement location="${hadoop.conf.dir.deployed}" />
+ <pathelement location="${system-test-build-dir}/test/extraconf" />
+ <pathelement location="${system-test-build-dir}/test/classes" />
+ <pathelement location="${build-fi.dir}/test/mapred/classes"/>
+ <pathelement location="${system-test-build-dir}/classes" />
+ <pathelement location="${test.src.dir}" />
+ <pathelement location="${build-fi.dir}" />
+ <pathelement location="${build-fi.dir}/tools" />
+ <pathelement path="${clover.jar}" />
+ <fileset dir="${system-test-build-dir}">
+ <include name="**/*.jar" />
+ <exclude name="**/excluded/" />
+ </fileset>
+ <path refid="classpath" />
+ </path>
+ <!-- compile system tests... -->
+ <path id="test.system.compile.classpath">
+ <pathelement location="${system-test-build-dir}/test/extraconf" />
+ <pathelement location="${system-test-build-dir}/test/classes" />
+ <pathelement location="${system-test-build-dir}/classes" />
+ <pathelement location="${build-fi.dir}/test/mapred/classes" />
+ <pathelement location="${build-fi.dir}/test/mapred/testjar" />
+ <pathelement location="${build-fi.dir}/tools" />
+ <pathelement location="${build-fi.dir}/examples" />
+ <path refid="ivy-system.classpath"/>
+ </path>
+
+ <!-- ================ -->
+ <!-- run system tests -->
+ <!-- ================ -->
+ <target name="test-system" depends="ivy-retrieve-common, ivy-retrieve-system"
+ description="Run system tests">
+ <subant buildpath="build.xml" target="jar-test-system"/>
+ <macro-test-runner test.file="${test.mapred.all.tests.file}"
+ suite.type="system/test"
+ classpath="test.system.classpath"
+ test.dir="${system-test-build-dir}/test"
+ fileset.dir="${test.src.dir}"
+ hadoop.conf.dir.deployed="${hadoop.conf.dir.deployed}">
+ </macro-test-runner>
+ </target>
+
<target name="injectfaults"
description="Instrument classes with faults and other AOP advices">
<!--mkdir to prevent <subant> failure in case the folder has been removed-->
<mkdir dir="${build-fi.dir}"/>
<delete file="${compile-inject.output}"/>
- <subant buildpath="${basedir}" target="compile-fault-inject"
- output="${compile-inject.output}">
+ <weave-injectfault-aspects dest.dir="${build-fi.dir}/classes"
+ src.dir="${test.src.dir}/aop"
+ aspects.jars="${build-fi.dir}/ivy/lib/${ant.project.name}/test/hadoop-common-${project.version}.jar">
+ </weave-injectfault-aspects>
+ </target>
+
+ <!-- =============================================================== -->
+ <!-- Create hadoop-{version}-dev-core.jar required to be deployed on -->
+ <!-- cluster for system tests -->
+ <!-- =============================================================== -->
+ <target name="jar-system"
+ depends="inject-system-faults"
+ description="Make hadoop-mapred-instrumented.jar with system injections.">
+ <macro-jar-fault-inject target.name="jar"
+ build.dir="${system-test-build-dir}"
+ jar.final.name="final.name"
+ jar.final.value="${instrumented.final.name}">
+ </macro-jar-fault-inject>
+ <jar jarfile="${system-test-build-dir}/${instrumented.final.name}-sources.jar"
+ update="yes">
+ <fileset dir="${test.src.dir}/system/java" includes="org/apache/hadoop/**/*.java" />
+ <fileset dir="${test.src.dir}/system/aop" includes="org/apache/hadoop/**/*.aj" />
+ </jar>
+ </target>
+
+ <target name="jar-test-system" depends="inject-system-faults, compile-test-system"
+ description="Make hadoop-mapred-instrumented-test.jar with system injections.">
+ <subant buildpath="build.xml" target="-do-jar-test">
+ <property name="build.dir" value="${system-test-build-dir}"/>
+ <property name="test.final.name" value="${name}-${herriot.suffix}-test-${version}"/>
+ <property name="test.build.classes"
+ value="${system-test-build-dir}/test/classes"/>
+ </subant>
+ <jar jarfile="${hadoop-mapred-instrumented-test-sources.jar}">
+ <fileset dir="${test.src.dir}/system/test" includes="org/apache/hadoop/**/*.java" />
+ </jar>
+ </target>
+
+ <target name="compile-test-system" description="Compiles system tests">
+ <subant buildpath="build.xml" target="-compile-test-system.wrapper">
+ <property name="build.dir" value="${system-test-build-dir}"/>
+ </subant>
+ </target>
+
+ <target name="-compile-test-system.wrapper" depends="inject-system-faults, ivy-retrieve-common, ivy-retrieve-system">
+ <macro-compile-test
+ source.dir="${test.src.dir}/system/test"
+ dest.dir="${system-test-build-dir}/test/classes"
+ classpath="test.system.compile.classpath"/>
+ </target>
+
+ <macrodef name="weave-injectfault-aspects">
+ <attribute name="dest.dir" />
+ <attribute name="src.dir" />
+ <attribute name="aspects.jars"/>
+ <sequential>
+ <subant buildpath="build.xml" target="compile-fault-inject"
+ output="${compile-inject.output}">
+ <property name="build.dir" value="${build-fi.dir}" />
+ <property name="src.dir.path" value="@{src.dir}" />
+ <property name="dest.dir" value="@{dest.dir}" />
+ <property name="hadoop.instrumented.jars" value="@{aspects.jars}"/>
+ </subant>
+ </sequential>
+ </macrodef>
+
+ <target name="inject-system-faults"
+ description="Inject system faults">
+ <property name="build-fi.dir" value="${system-test-build-dir}" />
+ <mkdir dir="${build-fi.dir}"/>
+ <delete file="${compile-inject.output}"/>
+ <subant buildpath="build.xml" target="ivy-retrieve-system">
<property name="build.dir" value="${build-fi.dir}"/>
</subant>
+ <weave-injectfault-aspects dest.dir="${system-test-build-dir}/classes"
+ src.dir="${test.src.dir}/system/java;${test.src.dir}/system/aop"
+ aspects.jars="${build-fi.dir}/ivy/lib/${ant.project.name}/system/hadoop-common-${herriot.suffix}-${project.version}.jar">
+ </weave-injectfault-aspects>
</target>
<macrodef name="macro-run-tests-fault-inject">
@@ -99,11 +252,12 @@
<!-- ================================================================== -->
<macrodef name="macro-jar-fault-inject">
<attribute name="target.name" />
+ <attribute name="build.dir" />
<attribute name="jar.final.name" />
<attribute name="jar.final.value" />
<sequential>
<subant buildpath="build.xml" target="@{target.name}">
- <property name="build.dir" value="${build-fi.dir}"/>
+ <property name="build.dir" value="@{build.dir}"/>
<property name="@{jar.final.name}" value="@{jar.final.value}"/>
<property name="jar.extra.properties.list"
value="${test.src.dir}/fi-site.xml" />
@@ -129,4 +283,78 @@
</macrodef>
<!--End of Fault Injection (FI) related session-->
+
+ <!-- Start of cluster controller binary target -->
+ <property name="runAs.src"
+ value ="${test.src.dir}/system/c++/runAs"/>
+ <property name="runAs.build.dir"
+ value="${system-test-build-dir}/c++-build"/>
+ <property name="runAs.configure.script"
+ value="${runAs.build.dir}/configure"/>
+ <target name="init-runAs-build">
+ <condition property="runAs.parameters.passed">
+ <not>
+ <equals arg1="${run-as.hadoop.home.dir}"
+ arg2="$${run-as.hadoop.home.dir}"/>
+ </not>
+ </condition>
+ <fail unless="runAs.parameters.passed"
+ message="Required parameters run-as.hadoop.home.dir not passed to the build"/>
+ <mkdir dir="${runAs.build.dir}"/>
+ <copy todir="${runAs.build.dir}" overwrite="true">
+ <fileset dir="${runAs.src}" includes="**/*"/>
+ </copy>
+ <chmod perm="+x" file="${runAs.configure.script}">
+ </chmod>
+ </target>
+
+ <target name="configure-runAs"
+ depends="init-runAs-build">
+ <exec executable="${runAs.configure.script}"
+ dir="${runAs.build.dir}" failonerror="true">
+ <arg value="--with-home=${run-as.hadoop.home.dir}"/>
+ </exec>
+ </target>
+ <target name="run-as" depends="configure-runAs">
+ <exec executable="${make.cmd}" dir="${runAs.build.dir}"
+ searchpath="yes" failonerror="yes">
+ <arg value="all" />
+ </exec>
+ </target>
+ <!-- End of cluster controller binary target -->
+ <!-- Install Herriot artifacts to the local Maven -->
+ <target name="-mvn-system-install" depends="mvn-taskdef, jar-system, jar-test-system">
+ <artifact:pom file="${hadoop-mapred-instrumented.pom}"
+ id="hadoop.mapred.${herriot.suffix}"/>
+ <artifact:pom file="${hadoop-mapred-instrumented-test.pom}"
+ id="hadoop.mapred.${herriot.suffix}.test"/>
+ <artifact:install file="${hadoop-mapred-instrumented.jar}">
+ <pom refid="hadoop.mapred.${herriot.suffix}"/>
+ <attach file="${hadoop-mapred-instrumented-sources.jar}" classifier="sources" />
+ </artifact:install>
+ <artifact:install file="${hadoop-mapred-instrumented-test.jar}">
+ <pom refid="hadoop.mapred.${herriot.suffix}.test"/>
+ <attach file="${hadoop-mapred-instrumented-test-sources.jar}" classifier="sources" />
+ </artifact:install>
+ </target>
+ <target name="-mvn-system-deploy" depends="mvn-taskdef, jar-system, jar-test-system">
+ <property name="repourl" value="https://repository.apache.org/content/repositories/snapshots" />
+ <artifact:pom file="${hadoop-mapred-instrumented.pom}"
+ id="hadoop.mapred.${herriot.suffix}"/>
+ <artifact:pom file="${hadoop-mapred-instrumented-test.pom}"
+ id="hadoop.mapred.${herriot.suffix}.test"/>
+
+ <artifact:install-provider artifactId="wagon-http" version="1.0-beta-2"/>
+ <artifact:deploy file="${hadoop-mapred-instrumented.jar}">
+ <remoteRepository id="apache.snapshots.https" url="${repourl}"/>
+ <pom refid="hadoop.mapred.${herriot.suffix}"/>
+ <attach file="${hadoop-mapred-instrumented-sources.jar}" classifier="sources" />
+ </artifact:deploy>
+ <artifact:deploy file="${hadoop-mapred-instrumented-test.jar}">
+ <remoteRepository id="apache.snapshots.https" url="${repourl}"/>
+ <pom refid="hadoop.mapred.${herriot.suffix}.test"/>
+ <attach file="${hadoop-mapred-instrumented-test-sources.jar}" classifier="sources" />
+ </artifact:deploy>
+ </target>
+ <!-- End of Maven -->
</project>
Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred:713112
/hadoop/core/trunk/src/test/mapred:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred:940364,946526
+/hadoop/mapreduce/trunk/src/test/mapred:940364,946526,956336-956668
Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/fs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/fs:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/fs:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs:817878-835934,940364,946526
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs:817878-835934,940364,946526,956336-956668
Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/hdfs:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/hdfs:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/hdfs:817878-835934,940364,946526
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/hdfs:817878-835934,940364,946526,956336-956668
Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/io/FileBench.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/io/FileBench.java:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/io/FileBench.java:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/FileBench.java:817878-835934,940364,946526
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/FileBench.java:817878-835934,940364,946526,956336-956668
Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:817878-835934,940364,946526
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:817878-835934,940364,946526,956336-956668
Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/ipc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,4 +1,4 @@
/hadoop/core/branches/branch-0.19/hdfs/src/test/hdfs-with-mr/org/apache/hadoop/ipc:713112
/hadoop/core/trunk/src/test/hdfs-with-mr/org/apache/hadoop/ipc:776175-784663
/hadoop/hdfs/branches/HDFS-265/src/test/hdfs-with-mr/org/apache/hadoop/ipc:796829-820463
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/ipc:940364,946526
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/ipc:940364,946526,956336-956668
Modified: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/UtilsForTests.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/UtilsForTests.java?rev=956674&r1=956673&r2=956674&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/UtilsForTests.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/mapred/UtilsForTests.java Mon Jun 21 19:20:40 2010
@@ -36,6 +36,7 @@ import org.apache.commons.logging.LogFac
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.hdfs.DFSTestUtil;
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.hdfs.server.namenode.NameNode;
@@ -744,4 +745,38 @@ public class UtilsForTests {
JobTracker jt = new JobTracker();
return jt;
}
+
+ /**
+ * This creates a file in the dfs
+ * @param dfs FileSystem Local File System where file needs to be picked
+ * @param URIPATH Path dfs path where file needs to be copied
+ * @param permission FsPermission File permission
+ * @return returns the DataOutputStream
+ */
+ public static DataOutputStream
+ createTmpFileDFS(FileSystem dfs, Path URIPATH,
+ FsPermission permission, String input) throws Exception {
+ //Creating the path with the file
+ DataOutputStream file =
+ FileSystem.create(dfs, URIPATH, permission);
+ file.writeBytes(input);
+ file.close();
+ return file;
+ }
+
+ /**
+ * This formats the long tasktracker name to just the FQDN
+ * @param taskTrackerLong String The long format of the tasktracker string
+ * @return String The FQDN of the tasktracker
+ * @throws Exception
+ */
+ public static String getFQDNofTT (String taskTrackerLong) throws Exception {
+ //Getting the exact FQDN of the tasktracker from the tasktracker string.
+ String[] firstSplit = taskTrackerLong.split("_");
+ String tmpOutput = firstSplit[1];
+ String[] secondSplit = tmpOutput.split(":");
+ String tmpTaskTracker = secondSplit[0];
+ return tmpTaskTracker;
+ }
+
}
Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:817878-835934,940364,946526
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:817878-835934,940364,946526,956336-956668
Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:817878-835934,940364,946526
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:817878-835934,940364,946526,956336-956668
Copied: hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTProtocol.java (from r956668, hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTProtocol.java)
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTProtocol.java?p2=hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTProtocol.java&p1=hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTProtocol.java&r1=956668&r2=956674&rev=956674&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTProtocol.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/test/system/java/org/apache/hadoop/mapreduce/test/system/TTProtocol.java Mon Jun 21 19:20:40 2010
@@ -23,7 +23,6 @@ import org.apache.hadoop.mapred.TaskTrac
import org.apache.hadoop.mapred.TaskTrackerStatus;
import org.apache.hadoop.mapreduce.TaskID;
import org.apache.hadoop.mapreduce.security.token.JobTokenSelector;
-import org.apache.hadoop.security.KerberosInfo;
import org.apache.hadoop.security.token.TokenInfo;
import org.apache.hadoop.test.system.DaemonProtocol;
@@ -35,8 +34,17 @@ import java.io.IOException;
* The protocol has to be annotated so KerberosInfo can be filled in during
* creation of a ipc.Client connection
*/
+
+/* KerberosInfo class hasn't been backported from trunk yet, thus
+ * I'm commenting this out until a decision is made
+ * The protocol has to be annotated so KerberosInfo can be filled in during
+ * creation of a ipc.Client connection
+
+import org.apache.hadoop.security.KerberosInfo;
@KerberosInfo(
serverPrincipal = TaskTracker.TT_USER_NAME)
+ */
+
@TokenInfo(JobTokenSelector.class)
public interface TTProtocol extends DaemonProtocol {
Propchange: hadoop/mapreduce/branches/branch-0.21/src/webapps/job/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 21 19:20:40 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/webapps/job:713112
/hadoop/core/trunk/src/webapps/job:776175-785643
-/hadoop/mapreduce/trunk/src/webapps/job:940364,946526
+/hadoop/mapreduce/trunk/src/webapps/job:940364,946526,956336-956668