Author: cos
Date: Fri Jul 2 01:40:53 2010
New Revision: 959828
URL: http://svn.apache.org/viewvc?rev=959828&view=rev
Log:
HDFS-1199. svn merge -c 959827 from trunk
Added:
hadoop/hdfs/branches/branch-0.21/src/test/smoke-tests
- copied unchanged from r959827, hadoop/hdfs/trunk/src/test/smoke-tests
Modified:
hadoop/hdfs/branches/branch-0.21/ (props changed)
hadoop/hdfs/branches/branch-0.21/CHANGES.txt
hadoop/hdfs/branches/branch-0.21/build.xml (contents, props changed)
hadoop/hdfs/branches/branch-0.21/src/c++/libhdfs/ (props changed)
hadoop/hdfs/branches/branch-0.21/src/contrib/hdfsproxy/ (props changed)
hadoop/hdfs/branches/branch-0.21/src/java/ (props changed)
hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java
(props changed)
hadoop/hdfs/branches/branch-0.21/src/test/hdfs/ (props changed)
hadoop/hdfs/branches/branch-0.21/src/webapps/datanode/ (props changed)
hadoop/hdfs/branches/branch-0.21/src/webapps/hdfs/ (props changed)
hadoop/hdfs/branches/branch-0.21/src/webapps/secondary/ (props changed)
Propchange: hadoop/hdfs/branches/branch-0.21/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 2 01:40:53 2010
@@ -1,4 +1,4 @@
/hadoop/core/branches/branch-0.19/hdfs:713112
/hadoop/hdfs/branches/HDFS-265:796829-820463
/hadoop/hdfs/branches/branch-0.21:820487
-/hadoop/hdfs/trunk:947194,950323,952861,959324
+/hadoop/hdfs/trunk:947194,950323,952861,959324,959827
Modified: hadoop/hdfs/branches/branch-0.21/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/CHANGES.txt?rev=959828&r1=959827&r2=959828&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/hdfs/branches/branch-0.21/CHANGES.txt Fri Jul 2 01:40:53 2010
@@ -153,6 +153,8 @@ Release 0.21.0 - Unreleased
IMPROVEMENTS
+ HDFS-1199. Extract a subset of tests for smoke (DOA) validation. (cos)
+
HDFS-381. Remove blocks from DataNode maps when corresponding file
is deleted. (Suresh Srinivas via rangadi)
Modified: hadoop/hdfs/branches/branch-0.21/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/build.xml?rev=959828&r1=959827&r2=959828&view=diff
==============================================================================
--- hadoop/hdfs/branches/branch-0.21/build.xml (original)
+++ hadoop/hdfs/branches/branch-0.21/build.xml Fri Jul 2 01:40:53 2010
@@ -97,6 +97,7 @@
<property name="test.hdfs.build.classes" value="${test.build.dir}/classes"/>
<property name="test.hdfs.commit.tests.file"
value="${test.src.dir}/commit-tests" />
+ <property name="test.hdfs.smoke.tests.file"
value="${test.src.dir}/smoke-tests" />
<property name="test.hdfs.all.tests.file" value="${test.src.dir}/all-tests"
/>
<property name="test.hdfs.rpc.engine" value=""/>
@@ -532,6 +533,15 @@
</condition>
<!-- ================================================================== -->
+ <!-- Define exclude lists for different kinds of testing -->
+ <!-- ================================================================== -->
+ <patternset id="empty.exclude.list.id" />
+ <patternset id="commit.smoke.exclude.list.id">
+ <excludesfile name="${test.hdfs.commit.tests.file}"/>
+ <excludesfile name="${test.hdfs.smoke.tests.file}"/>
+ </patternset>
+
+ <!-- ================================================================== -->
<!-- Run unit tests -->
<!-- ================================================================== -->
<macrodef name="macro-test-runner">
@@ -541,6 +551,7 @@
<attribute name="test.dir" />
<attribute name="fileset.dir" />
<attribute name="hadoop.conf.dir.deployed" default="" />
+ <attribute name="exclude.list.id" default="empty.exclude.list.id" />
<sequential>
<delete dir="@{test.dir}/data"/>
<mkdir dir="@{test.dir}/data"/>
@@ -581,6 +592,7 @@
<patternset>
<includesfile name="@{test.file}"/>
</patternset>
+ <patternset refid="@{exclude.list.id}"/>
</fileset>
</batchtest>
<batchtest todir="@{test.dir}" if="tests.notestcase.fi">
@@ -605,13 +617,19 @@
</sequential>
</macrodef>
- <target name="run-test-hdfs" depends="compile-hdfs-test" description="Run
full set of hdfs unit tests">
+ <target name="run-test-hdfs" depends="run-commit-test, run-smoke-test,
+ run-test-hdfs-excluding-commit-and-smoke"
+ description="Run full set of hdfs unit tests">
+ </target>
+
+ <target name="run-test-hdfs-excluding-commit-and-smoke"
depends="compile-hdfs-test">
<macro-test-runner
test.file="${test.hdfs.all.tests.file}"
suite.type="hdfs"
classpath="${test.classpath.id}"
test.dir="${test.build.dir}"
- fileset.dir="${test.src.dir}"/>
+ fileset.dir="${test.src.dir}"
+ exclude.list.id="commit.smoke.exclude.list.id"/>
</target>
<target name="run-commit-test" depends="compile-hdfs-test" description="Run
approximate 10-minute set of unit tests prior to commiting">
@@ -623,6 +641,16 @@
fileset.dir="${test.src.dir}"/>
</target>
+ <target name="run-smoke-test" depends="compile-hdfs-test"
+ description="Run approximate 30-minute set of functional tests prior to
guarantee HDFS viability">
+ <macro-test-runner
+ test.file="${test.hdfs.smoke.tests.file}"
+ suite.type="hdfs"
+ classpath="${test.classpath.id}"
+ test.dir="${test.build.dir}"
+ fileset.dir="${test.src.dir}"/>
+ </target>
+
<target name="run-test-unit" depends="compile-hdfs-test" description="Run
unit tests">
<macro-test-runner
test.file="${test.hdfs.all.tests.file}"
Propchange: hadoop/hdfs/branches/branch-0.21/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 2 01:40:53 2010
@@ -2,4 +2,4 @@
/hadoop/core/trunk/build.xml:779102
/hadoop/hdfs/branches/HDFS-265/build.xml:796829-820463
/hadoop/hdfs/branches/branch-0.21/build.xml:820487
-/hadoop/hdfs/trunk/build.xml:947194,950323,952861,959324
+/hadoop/hdfs/trunk/build.xml:947194,950323,952861,959324,959827
Propchange: hadoop/hdfs/branches/branch-0.21/src/c++/libhdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 2 01:40:53 2010
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/c++/libhdfs:713112
/hadoop/core/trunk/src/c++/libhdfs:776175-784663
-/hadoop/hdfs/trunk/src/c++/libhdfs:947194,950323,952861,959324
+/hadoop/hdfs/trunk/src/c++/libhdfs:947194,950323,952861,959324,959827
Propchange: hadoop/hdfs/branches/branch-0.21/src/contrib/hdfsproxy/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 2 01:40:53 2010
@@ -2,4 +2,4 @@
/hadoop/core/trunk/src/contrib/hdfsproxy:776175-784663
/hadoop/hdfs/branches/HDFS-265/src/contrib/hdfsproxy:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/contrib/hdfsproxy:820487
-/hadoop/hdfs/trunk/src/contrib/hdfsproxy:947194,950323,952861,959324
+/hadoop/hdfs/trunk/src/contrib/hdfsproxy:947194,950323,952861,959324,959827
Propchange: hadoop/hdfs/branches/branch-0.21/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 2 01:40:53 2010
@@ -2,4 +2,4 @@
/hadoop/core/trunk/src/hdfs:776175-785643,785929-786278
/hadoop/hdfs/branches/HDFS-265/src/java:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/java:820487
-/hadoop/hdfs/trunk/src/java:947194,950323,952861,959324
+/hadoop/hdfs/trunk/src/java:947194,950323,952861,959324,959827
Propchange:
hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 2 01:40:53 2010
@@ -4,4 +4,4 @@
/hadoop/core/trunk/src/hdfs/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:776175-785643,785929-786278
/hadoop/hdfs/branches/HDFS-265/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:820487
-/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:947194,950323,952861,959324
+/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:947194,950323,952861,959324,959827
Propchange: hadoop/hdfs/branches/branch-0.21/src/test/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 2 01:40:53 2010
@@ -2,4 +2,4 @@
/hadoop/core/trunk/src/test/hdfs:776175-785643
/hadoop/hdfs/branches/HDFS-265/src/test/hdfs:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/test/hdfs:820487
-/hadoop/hdfs/trunk/src/test/hdfs:947194,950323,952861,959324
+/hadoop/hdfs/trunk/src/test/hdfs:947194,950323,952861,959324,959827
Propchange: hadoop/hdfs/branches/branch-0.21/src/webapps/datanode/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 2 01:40:53 2010
@@ -2,4 +2,4 @@
/hadoop/core/trunk/src/webapps/datanode:776175-784663
/hadoop/hdfs/branches/HDFS-265/src/webapps/datanode:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/webapps/datanode:820487
-/hadoop/hdfs/trunk/src/webapps/datanode:947194,950323,952861,959324
+/hadoop/hdfs/trunk/src/webapps/datanode:947194,950323,952861,959324,959827
Propchange: hadoop/hdfs/branches/branch-0.21/src/webapps/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 2 01:40:53 2010
@@ -2,4 +2,4 @@
/hadoop/core/trunk/src/webapps/hdfs:776175-784663
/hadoop/hdfs/branches/HDFS-265/src/webapps/hdfs:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/webapps/hdfs:820487
-/hadoop/hdfs/trunk/src/webapps/hdfs:947194,950323,952861,959324
+/hadoop/hdfs/trunk/src/webapps/hdfs:947194,950323,952861,959324,959827
Propchange: hadoop/hdfs/branches/branch-0.21/src/webapps/secondary/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 2 01:40:53 2010
@@ -2,4 +2,4 @@
/hadoop/core/trunk/src/webapps/secondary:776175-784663
/hadoop/hdfs/branches/HDFS-265/src/webapps/secondary:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/webapps/secondary:820487
-/hadoop/hdfs/trunk/src/webapps/secondary:947194,950323,952861,959324
+/hadoop/hdfs/trunk/src/webapps/secondary:947194,950323,952861,959324,959827
