hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1440579 - in /hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common: ./ src/main/docs/ src/main/docs/src/documentation/content/xdocs/ src/main/java/ src/main/java/org/apache/hadoop/fs/ src/main/resources/ src/site/apt/ src/te...
Date Wed, 30 Jan 2013 18:32:03 GMT
Author: atm
Date: Wed Jan 30 18:32:00 2013
New Revision: 1440579

URL: http://svn.apache.org/viewvc?rev=1440579&view=rev
Log:
Merge trunk into HDFS-347 branch.

Added:
    hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/site/apt/NativeLibraries.apt.vm
      - copied unchanged from r1440577, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/NativeLibraries.apt.vm
    hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/site/apt/ServiceLevelAuth.apt.vm
      - copied unchanged from r1440577, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/ServiceLevelAuth.apt.vm
    hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/site/apt/SingleNodeSetup.apt.vm
      - copied unchanged from r1440577, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/SingleNodeSetup.apt.vm
    hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/site/apt/Superusers.apt.vm
      - copied unchanged from r1440577, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/Superusers.apt.vm
Removed:
    hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/main/docs/forrest.properties
    hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/Superusers.xml
    hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/deployment_layout.xml
    hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/native_libraries.xml
    hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/service_level_auth.xml
    hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/main/docs/src/documentation/content/xdocs/single_node_setup.xml
Modified:
    hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/CHANGES.txt   (contents,
props changed)
    hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/pom.xml
    hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/main/docs/   (props
changed)
    hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/main/java/   (props
changed)
    hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
    hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java
    hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
    hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/site/apt/HttpAuthentication.apt.vm
    hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/test/core/   (props
changed)

Modified: hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1440579&r1=1440578&r2=1440579&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/CHANGES.txt Wed Jan
30 18:32:00 2013
@@ -319,12 +319,23 @@ Trunk (Unreleased)
     HADOOP-9202. test-patch.sh fails during mvn eclipse:eclipse if patch adds
     a new module to the build (Chris Nauroth via bobby)
 
+    HADOOP-9245. mvn clean without running mvn install before fails.
+    (Karthik Kambatla via suresh)
+
+    HADOOP-9249. hadoop-maven-plugins version-info goal causes build failure
+    when running with Clover. (Chris Nauroth via suresh)
+
   OPTIMIZATIONS
 
     HADOOP-7761. Improve the performance of raw comparisons. (todd)
 
     HADOOP-8589 ViewFs tests fail when tests and home dirs are nested (sanjay Radia)
 
+    HADOOP-9246 Execution phase for hadoop-maven-plugin should be
+    process-resources (Karthik Kambatla and Chris Nauroth via jlowe)
+
+    HADOOP-9190. packaging docs is broken. (Andy Isaacson via atm)
+
 Release 2.0.3-alpha - Unreleased 
 
   INCOMPATIBLE CHANGES
@@ -572,6 +583,11 @@ Release 2.0.3-alpha - Unreleased 
     HADOOP-9215. when using cmake-2.6, libhadoop.so doesn't get created
     (only libhadoop.so.1.0.0) (Colin Patrick McCabe via todd)
 
+    HADOOP-8857. hadoop.http.authentication.signature.secret.file docs 
+    should not state that secret is randomly generated. (tucu)
+
+    HADOOP-9221. Convert remaining xdocs to APT. (Andy Isaacson via atm)
+
 Release 2.0.2-alpha - 2012-09-07 
 
   INCOMPATIBLE CHANGES
@@ -1287,6 +1303,13 @@ Release 0.23.6 - UNRELEASED
     HADOOP-9217. Print thread dumps when hadoop-common tests fail.
     (Andrey Klochkov via suresh)
 
+    HADOOP-9242. Duplicate surefire plugin config in hadoop-common.
+    (Andrey Klochkov via suresh)
+
+    HADOOP-9247. Parametrize Clover "generateXxx" properties to make them
+    re-definable via -D in mvn calls. (Ivan A. Veselovsky via suresh)
+
+
   OPTIMIZATIONS
 
   BUG FIXES
@@ -1304,6 +1327,8 @@ Release 0.23.6 - UNRELEASED
 
     HADOOP-9097. Maven RAT plugin is not checking all source files (tgraves)
 
+    HADOOP-9255. relnotes.py missing last jira (tgraves)
+
 Release 0.23.5 - 2012-11-28
 
 

Propchange: hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1437620-1440577

Modified: hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/pom.xml?rev=1440579&r1=1440578&r2=1440579&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/pom.xml (original)
+++ hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/pom.xml Wed Jan 30
18:32:00 2013
@@ -274,6 +274,7 @@
         <executions>
           <execution>
             <id>version-info</id>
+            <phase>generate-resources</phase>
             <goals>
               <goal>version-info</goal>
             </goals>
@@ -297,6 +298,12 @@
             <startKdc>${startKdc}</startKdc>
             <kdc.resource.dir>${kdc.resource.dir}</kdc.resource.dir>
           </systemPropertyVariables>
+          <properties>
+            <property>
+              <name>listener</name>
+              <value>org.apache.hadoop.test.TimedOutTestsListener</value>
+            </property>
+          </properties>
         </configuration>
       </plugin>
       <plugin>
@@ -481,18 +488,6 @@
           </excludes>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <properties>
-            <property>
-              <name>listener</name>
-              <value>org.apache.hadoop.test.TimedOutTestsListener</value>
-            </property>
-          </properties>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 

Propchange: hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1437620-1440577

Propchange: hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1437620-1440577

Modified: hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java?rev=1440579&r1=1440578&r2=1440579&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
(original)
+++ hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
Wed Jan 30 18:32:00 2013
@@ -1128,6 +1128,17 @@ public abstract class FileSystem extends
   public abstract FSDataOutputStream append(Path f, int bufferSize,
       Progressable progress) throws IOException;
 
+  /**
+   * Concat existing files together.
+   * @param trg the path to the target destination.
+   * @param psrcs the paths to the sources to use for the concatenation.
+   * @throws IOException
+   */
+  public void concat(final Path trg, final Path [] psrcs) throws IOException {
+    throw new UnsupportedOperationException("Not implemented by the " + 
+        getClass().getSimpleName() + " FileSystem implementation");
+  }
+
  /**
    * Get replication.
    * 

Modified: hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java?rev=1440579&r1=1440578&r2=1440579&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java
(original)
+++ hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java
Wed Jan 30 18:32:00 2013
@@ -160,6 +160,11 @@ public class FilterFileSystem extends Fi
   }
 
   @Override
+  public void concat(Path f, Path[] psrcs) throws IOException {
+    fs.concat(f, psrcs);
+  }
+
+  @Override
   public FSDataOutputStream create(Path f, FsPermission permission,
       boolean overwrite, int bufferSize, short replication, long blockSize,
       Progressable progress) throws IOException {

Modified: hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml?rev=1440579&r1=1440578&r2=1440579&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
(original)
+++ hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
Wed Jan 30 18:32:00 2013
@@ -890,7 +890,6 @@
   <value>${user.home}/hadoop-http-auth-signature-secret</value>
   <description>
     The signature secret for signing the authentication tokens.
-    If not set a random secret is generated at startup time.
     The same secret should be used for JT/NN/DN/TT configurations.
   </description>
 </property>

Modified: hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/site/apt/HttpAuthentication.apt.vm
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/site/apt/HttpAuthentication.apt.vm?rev=1440579&r1=1440578&r2=1440579&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/site/apt/HttpAuthentication.apt.vm
(original)
+++ hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/site/apt/HttpAuthentication.apt.vm
Wed Jan 30 18:32:00 2013
@@ -64,10 +64,9 @@ Authentication for Hadoop HTTP web-conso
    The default value is <<<36000>>>.
 
    <<<hadoop.http.authentication.signature.secret.file>>>: The signature
secret
-   file for signing the authentication tokens. If not set a random secret is
-   generated at startup time. The same secret should be used for all nodes
-   in the cluster, JobTracker, NameNode, DataNode and TastTracker. The
-   default value is <<<${user.home}/hadoop-http-auth-signature-secret>>>.
+   file for signing the authentication tokens. The same secret should be used 
+   for all nodes in the cluster, JobTracker, NameNode, DataNode and TastTracker. 
+   The default value is <<<${user.home}/hadoop-http-auth-signature-secret>>>.
    IMPORTANT: This file should be readable only by the Unix user running the
    daemons.
 

Propchange: hadoop/common/branches/HDFS-347/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1437620-1440577



Mime
View raw message