Author: stevel
Date: Tue Dec 1 20:51:07 2009
New Revision: 885922
URL: http://svn.apache.org/viewvc?rev=885922&view=rev
Log:
HDFS-326 resync with trunk
Added:
hadoop/hdfs/branches/HDFS-326/src/test/unit/org/
- copied from r885783, hadoop/hdfs/trunk/src/test/unit/org/
hadoop/hdfs/branches/HDFS-326/src/test/unit/org/apache/
- copied from r885783, hadoop/hdfs/trunk/src/test/unit/org/apache/
hadoop/hdfs/branches/HDFS-326/src/test/unit/org/apache/hadoop/
- copied from r885783, hadoop/hdfs/trunk/src/test/unit/org/apache/hadoop/
hadoop/hdfs/branches/HDFS-326/src/test/unit/org/apache/hadoop/hdfs/
- copied from r885783,
hadoop/hdfs/trunk/src/test/unit/org/apache/hadoop/hdfs/
hadoop/hdfs/branches/HDFS-326/src/test/unit/org/apache/hadoop/hdfs/server/
- copied from r885783,
hadoop/hdfs/trunk/src/test/unit/org/apache/hadoop/hdfs/server/
hadoop/hdfs/branches/HDFS-326/src/test/unit/org/apache/hadoop/hdfs/server/namenode/
- copied from r885783,
hadoop/hdfs/trunk/src/test/unit/org/apache/hadoop/hdfs/server/namenode/
hadoop/hdfs/branches/HDFS-326/src/test/unit/org/apache/hadoop/hdfs/server/namenode/TestNNLeaseRecovery.java
- copied unchanged from r885783,
hadoop/hdfs/trunk/src/test/unit/org/apache/hadoop/hdfs/server/namenode/TestNNLeaseRecovery.java
Removed:
hadoop/hdfs/branches/HDFS-326/src/test/unit/.gitignore
Modified:
hadoop/hdfs/branches/HDFS-326/ (props changed)
hadoop/hdfs/branches/HDFS-326/.eclipse.templates/.classpath
hadoop/hdfs/branches/HDFS-326/CHANGES.txt
hadoop/hdfs/branches/HDFS-326/build.xml (contents, props changed)
hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/ (props changed)
hadoop/hdfs/branches/HDFS-326/src/contrib/hdfsproxy/ (props changed)
hadoop/hdfs/branches/HDFS-326/src/java/ (props changed)
hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
hadoop/hdfs/branches/HDFS-326/src/test/aop/build/aop.xml
hadoop/hdfs/branches/HDFS-326/src/test/hdfs/ (props changed)
hadoop/hdfs/branches/HDFS-326/src/webapps/datanode/ (props changed)
hadoop/hdfs/branches/HDFS-326/src/webapps/hdfs/ (props changed)
hadoop/hdfs/branches/HDFS-326/src/webapps/secondary/ (props changed)
Propchange: hadoop/hdfs/branches/HDFS-326/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 1 20:51:07 2009
@@ -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:804973-884907
+/hadoop/hdfs/trunk:804973-885783
Modified: hadoop/hdfs/branches/HDFS-326/.eclipse.templates/.classpath
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-326/.eclipse.templates/.classpath?rev=885922&r1=885921&r2=885922&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-326/.eclipse.templates/.classpath (original)
+++ hadoop/hdfs/branches/HDFS-326/.eclipse.templates/.classpath Tue Dec 1
20:51:07 2009
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/java"/>
+ <classpathentry kind="src" path="src/test/unit"/>
<classpathentry kind="src" path="src/test/hdfs"/>
<classpathentry kind="src" path="src/ant"/>
<classpathentry kind="src" path="src/contrib/hdfsproxy/src/java"/>
Modified: hadoop/hdfs/branches/HDFS-326/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-326/CHANGES.txt?rev=885922&r1=885921&r2=885922&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-326/CHANGES.txt (original)
+++ hadoop/hdfs/branches/HDFS-326/CHANGES.txt Tue Dec 1 20:51:07 2009
@@ -32,6 +32,8 @@
exclude specific datanodes when locating the next block
(Cosmin Lehene via Stack)
+ HDFS-519. Create new tests for lease recovery (cos)
+
OPTIMIZATIONS
BUG FIXES
@@ -79,6 +81,8 @@
HDFS-785. Add Apache license to several namenode unit tests.
(Ravi Phulari via jghoman)
+ HDFS-791. Build is broken after HDFS-787 patch has been applied (cos)
+
Release 0.21.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/hdfs/branches/HDFS-326/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-326/build.xml?rev=885922&r1=885921&r2=885922&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-326/build.xml (original)
+++ hadoop/hdfs/branches/HDFS-326/build.xml Tue Dec 1 20:51:07 2009
@@ -1019,7 +1019,7 @@
</subant>
</target>
- <target name="test-c++-libhdfs" depends="compile-c++-libhdfs, compile-core"
if="islibhdfs">
+ <target name="test-c++-libhdfs" depends="compile-c++-libhdfs, compile-core"
if="islibhdfs" unless="clover.enabled">
<delete dir="${test.libhdfs.dir}"/>
<mkdir dir="${test.libhdfs.dir}"/>
<mkdir dir="${test.libhdfs.dir}/logs"/>
@@ -1120,6 +1120,7 @@
<clover-setup initString="${clover.db.dir}/hadoop_coverage.db">
<fileset dir="src" includes="java/**/*"/>
</clover-setup>
+ <echo message="HDFS-783: test-libhdfs is disabled for Clover'ed builds" />
</target>
<target name="clover.info" unless="clover.present">
Propchange: hadoop/hdfs/branches/HDFS-326/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 1 20:51:07 2009
@@ -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:804973-884907
+/hadoop/hdfs/trunk/build.xml:804973-885783
Propchange: hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 1 20:51:07 2009
@@ -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:807691-884903
+/hadoop/hdfs/trunk/src/c++/libhdfs:807691-885783
Propchange: hadoop/hdfs/branches/HDFS-326/src/contrib/hdfsproxy/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 1 20:51:07 2009
@@ -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:804973-884907
+/hadoop/hdfs/trunk/src/contrib/hdfsproxy:804973-885783
Propchange: hadoop/hdfs/branches/HDFS-326/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 1 20:51:07 2009
@@ -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:804973-884907
+/hadoop/hdfs/trunk/src/java:804973-885783
Modified:
hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java?rev=885922&r1=885921&r2=885922&view=diff
==============================================================================
---
hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
(original)
+++
hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
Tue Dec 1 20:51:07 2009
@@ -185,7 +185,7 @@
return namesystem;
}
- private static void initMetrics(Configuration conf, NamenodeRole role) {
+ static void initMetrics(Configuration conf, NamenodeRole role) {
myMetrics = new NameNodeMetrics(conf, role);
}
Modified: hadoop/hdfs/branches/HDFS-326/src/test/aop/build/aop.xml
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-326/src/test/aop/build/aop.xml?rev=885922&r1=885921&r2=885922&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-326/src/test/aop/build/aop.xml (original)
+++ hadoop/hdfs/branches/HDFS-326/src/test/aop/build/aop.xml Tue Dec 1
20:51:07 2009
@@ -18,7 +18,7 @@
<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.4"/>
+ <property name="aspectversion" value="1.6.5"/>
<property file="${basedir}/build.properties"/>
<!--All Fault Injection (FI) related targets are located in this session -->
Propchange: hadoop/hdfs/branches/HDFS-326/src/test/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 1 20:51:07 2009
@@ -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:804973-884907
+/hadoop/hdfs/trunk/src/test/hdfs:804973-885783
Propchange: hadoop/hdfs/branches/HDFS-326/src/webapps/datanode/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 1 20:51:07 2009
@@ -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:804973-884907
+/hadoop/hdfs/trunk/src/webapps/datanode:804973-885783
Propchange: hadoop/hdfs/branches/HDFS-326/src/webapps/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 1 20:51:07 2009
@@ -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:804973-884907
+/hadoop/hdfs/trunk/src/webapps/hdfs:804973-885783
Propchange: hadoop/hdfs/branches/HDFS-326/src/webapps/secondary/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 1 20:51:07 2009
@@ -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:804973-884907
+/hadoop/hdfs/trunk/src/webapps/secondary:804973-885783
