Merging changes r1050109:r1052169 from trunk to federation

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/branches/HDFS-1052@1079012 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -243,6 +243,8 @@ Trunk (unreleased changes)
     HDFS-1476. listCorruptFileBlocks should be functional while the
     name node is in safe mode. (Patrick Kling via hairong)
 
+    HDFS-1534. Fix some incorrect logs in FSDirectory. (eli)
+
   OPTIMIZATIONS
 
     HDFS-1458. Improve checkpoint performance by avoiding unnecessary image
@@ -266,9 +268,12 @@ Trunk (unreleased changes)
     HDFS-1684. Balancer cannot start with with multiple namenodes.  (szetszwo)
 
     HDFS-1516. mvn-install is broken after 0.22 branch creation. (cos)
+
     HDFS-1360. TestBlockRecovery should bind ephemeral ports.
     (Todd Lipcon via hairong)
 
+    HDFS-1551. Fix pom templates dependency list (gkesavan)
+
 Release 0.22.0 - Unreleased
 
   NEW FEATURES
@@ -684,7 +689,8 @@ Release 0.22.0 - Unreleased
     HDFS-613. TestBalancer and TestBlockTokenWithDFS fail Balancer assert.
     (Todd Lipcon via cos)
 
-    HDFS-1206. TestFiHFlush fails intermittently. (cos)
+    HDFS-1511. 98 Release Audit warnings on trunk and branch-0.22.
+    (jghoman)
 
 Release 0.21.1 - Unreleased
 
@@ -722,6 +728,11 @@ Release 0.21.1 - Unreleased
     HDFS-1728. SecondaryNameNode.checkpointSize is in bytes but not in MB.
     (szetszwo)
 
+    HDFS-1206. TestFiHFlush fails intermittently. (cos)
+
+    HDFS-1548. Fault-injection tests are executed multiple times if invoked
+    with run-test-hdfs-fault-inject target (cos)
+
 Release 0.21.0 - 2010-08-13
 
   INCOMPATIBLE CHANGES
@@ -1681,6 +1692,8 @@ Release 0.20.3 - 2011-1-5
     HDFS-132. Fix namenode to not report files deleted metrics for deletions
     done while replaying edits during startup. (suresh & shv)
 
+    HDFS-1406. TestCLI fails on Ubuntu with default /etc/hosts. (cos)
+
 Release 0.20.2 - Unreleased
 
   IMPROVEMENTS

build.xml

@@ -486,9 +486,19 @@
   <target name="jar-test-fault-inject" depends="jar-hdfs-test-fault-inject"
           description="Make hadoop-test.jar files"/>
 
-  <target name="run-test-hdfs-fault-inject" depends="injectfaults" 
+  <target name="run-test-hdfs-fault-inject" depends="injectfaults,
+    -run-test-hdfs-fault-inject-all,
+    -run-test-hdfs-fault-inject-withtestcaseonly"
 	  description="Run full set of the unit tests with fault injection">
-    <macro-run-tests-fault-inject target.name="run-test-hdfs"
+  </target>
+  <target name="-run-test-hdfs-fault-inject-all" unless="testcase">
+    <macro-run-tests-fault-inject
+      target.name="run-test-hdfs-excluding-commit-and-smoke"
+      testcasesonly="false"/>
+  </target>
+  <target name="-run-test-hdfs-fault-inject-withtestcaseonly" if="testcase">
+    <macro-run-tests-fault-inject
+      target.name="run-test-hdfs-all-withtestcaseonly"
       testcasesonly="false"/>
   </target>
 
@@ -515,7 +525,8 @@
   <target name="run-fault-inject-with-testcaseonly" depends="injectfaults">
     <fail unless="testcase">Can't run this target without -Dtestcase setting!
     </fail>
-    <macro-run-tests-fault-inject target.name="run-test-hdfs" 
+    <macro-run-tests-fault-inject
+      target.name="run-test-hdfs-all-withtestcaseonly"
       testcasesonly="true"/>
   </target>
   <!-- ================================================================== -->
@@ -1177,6 +1188,35 @@
         <exclude name="CHANGES.txt"/>
         <exclude name="docs/"/>
         <exclude name="lib/jdiff/"/>
+        <exclude name="src/contrib/thriftfs/gen-*/" />
+        <exclude name="**/conf/*" />
+        <exclude name="webapps/**/WEB-INF/web.xml"/>
+        <exclude name="src/docs/releasenotes.html" />
+        <exclude name="src/test/hdfs/org/apache/hadoop/cli/clitest_data/" />
+        <exclude name="**/*/robots.txt" />
+        <exclude name="src/c++/libhdfs/m4/libtool.m4" />
+        <exclude name="src/c++/libhdfs/m4/lt~obsolete.m4" />
+        <exclude name="src/c++/libhdfs/m4/ltoptions.m4" />
+        <exclude name="src/c++/libhdfs/m4/ltsugar.m4" />
+        <exclude name="src/c++/libhdfs/m4/ltversion.m4" />
+        <exclude name="src/test/commit-tests" />
+        <exclude name="src/test/smoke-tests" />
+        <exclude name="src/test/all-tests" />
+        <exclude name="**/*/*.properties" />
+        <exclude name="src/c++/libhdfs/config.guess" />
+        <exclude name="src/c++/libhdfs/config.sub" />
+        <exclude name="src/c++/libhdfs/configure" />
+        <exclude name="src/c++/libhdfs/depcomp" />
+        <exclude name="src/c++/libhdfs/install-sh" />
+        <exclude name="src/c++/libhdfs/ltmain.sh" />
+        <exclude name="src/c++/libhdfs/missing" />
+        <exclude name="src/contrib/hdfsproxy/src/test/resources/" />
+        <exclude name="src/test/checkstyle-noframes-sorted.xsl" />
+        <exclude name="src/test/checkstyle.xml" />
+        <exclude name="src/test/findbugsExcludeFile.xml" />
+        <exclude name="src/docs/**/*.odg" />
+        <exclude name="**/*.tgz" />
+        <exclude name="**/*.tar" />
       </fileset>
     </rat:report>
   </target>

ivy/hadoop-hdfs-instrumented-template.xml

@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common-instrumented</artifactId>
-      <version>0.22.0-SNAPSHOT</version>
+      <version>0.23.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>

ivy/hadoop-hdfs-template.xml

@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
-      <version>0.22.0-SNAPSHOT</version>
+      <version>0.23.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>

src/ant/org/apache/hadoop/ant/antlib.xml

@@ -1,5 +1,22 @@
 <?xml version="1.0"?>
 
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
 <antlib>
   <taskdef name="hdfs"
            classname="org.apache.hadoop.ant.DfsTask" />

src/contrib/fuse-dfs/ivy.xml

@@ -1,4 +1,20 @@
 <?xml version="1.0" ?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
 <ivy-module version="1.0">
   <info organisation="org.apache.hadoop" module="${ant.project.name}">
     <license name="Apache 2.0"/>

src/contrib/hdfsproxy/ivy.xml

@@ -1,4 +1,21 @@
 <?xml version="1.0" ?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
 <ivy-module version="1.0">
   <info organisation="org.apache.hadoop" module="${ant.project.name}">
     <license name="Apache 2.0"/>

src/contrib/thriftfs/if/hadoopfs.thrift

@@ -1,3 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 #!/usr/local/bin/thrift -java
 #

src/contrib/thriftfs/ivy.xml

@@ -1,4 +1,22 @@
 <?xml version="1.0" ?>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
 <ivy-module version="1.0">
   <info organisation="org.apache.hadoop" module="${ant.project.name}">
     <license name="Apache 2.0"/>

src/contrib/thriftfs/scripts/start_thrift_server.sh

@@ -1,5 +1,21 @@
 #!/bin/sh
 
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
 CLASSPATH=
 TOP=../../../..
 

src/contrib/thriftfs/src/java/org/apache/hadoop/thriftfs/HadoopThriftServer.java

@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.hadoop.thriftfs;
 
 import com.facebook.thrift.TException;

src/java/hdfs-default.xml

@@ -1,4 +1,22 @@
 <?xml version="1.0"?>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
 
 <!-- Do not modify this file directly.  Instead, copy entries that you -->

src/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java

@@ -348,7 +348,7 @@ class FSDirectory implements Closeable {
       fileINode.addBlock(blockInfo);
 
       if(NameNode.stateChangeLog.isDebugEnabled()) {
-        NameNode.stateChangeLog.debug("DIR* FSDirectory.addFile: "
+        NameNode.stateChangeLog.debug("DIR* FSDirectory.addBlock: "
             + path + " with " + block
             + " block is added to the in-memory "
             + "file system");
@@ -417,9 +417,9 @@ class FSDirectory implements Closeable {
       // write modified block locations to log
       fsImage.getEditLog().logOpenFile(path, fileNode);
       if(NameNode.stateChangeLog.isDebugEnabled()) {
-        NameNode.stateChangeLog.debug("DIR* FSDirectory.addFile: "
+        NameNode.stateChangeLog.debug("DIR* FSDirectory.removeBlock: "
             +path+" with "+block
-            +" block is added to the file system");
+            +" block is removed from the file system");
       }
 
       // update space consumed

src/test/fi-site.xml

@@ -1,4 +1,22 @@
 <?xml version="1.0"?>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
 
 <!-- Put fault injection specific property overrides in this file. -->

src/test/hadoop-policy.xml

@@ -1,5 +1,21 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
 
 <!-- Put site-specific property overrides in this file. -->
 

src/test/hdfs-site.xml

@@ -1,5 +1,21 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
 
 <!-- Put site-specific property overrides in this file. -->
 

src/test/hdfs/org/apache/hadoop/hdfs/hadoop-dfs-dir.txt

@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 #
 # This is a readme for hadoop-version-dfs-dir.tgz and hadoop-dfs-dir.txt.
 #

src/test/test-patch.properties

@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-OK_RELEASEAUDIT_WARNINGS=98
+OK_RELEASEAUDIT_WARNINGS=0
 OK_FINDBUGS_WARNINGS=0
 OK_JAVADOC_WARNINGS=0