You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by to...@apache.org on 2012/08/10 00:30:31 UTC
svn commit: r1371518 - in /hadoop/common/branches/HDFS-3077: ./ dev-support/
hadoop-assemblies/src/main/resources/assemblies/ hadoop-dist/
hadoop-project/ hadoop-tools/hadoop-pipes/src/
hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/stre...
Author: todd
Date: Thu Aug 9 22:29:36 2012
New Revision: 1371518
URL: http://svn.apache.org/viewvc?rev=1371518&view=rev
Log:
Merge trunk into branch.
Branch will not build after this commit: need to implement new JournalManager
interfaces in QuorumJournalManager in a follow-up.
Added:
hadoop/common/branches/HDFS-3077/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
- copied unchanged from r1371513, hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml
Modified:
hadoop/common/branches/HDFS-3077/ (props changed)
hadoop/common/branches/HDFS-3077/dev-support/smart-apply-patch.sh
hadoop/common/branches/HDFS-3077/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
hadoop/common/branches/HDFS-3077/hadoop-dist/pom.xml
hadoop/common/branches/HDFS-3077/hadoop-project/pom.xml
hadoop/common/branches/HDFS-3077/hadoop-tools/hadoop-pipes/src/CMakeLists.txt
hadoop/common/branches/HDFS-3077/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
hadoop/common/branches/HDFS-3077/pom.xml
Propchange: hadoop/common/branches/HDFS-3077/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1367365-1371513
Modified: hadoop/common/branches/HDFS-3077/dev-support/smart-apply-patch.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/dev-support/smart-apply-patch.sh?rev=1371518&r1=1371517&r2=1371518&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/dev-support/smart-apply-patch.sh (original)
+++ hadoop/common/branches/HDFS-3077/dev-support/smart-apply-patch.sh Thu Aug 9 22:29:36 2012
@@ -79,15 +79,15 @@ if $PATCH -p0 -E --dry-run < $PATCH_FILE
if [[ -d hadoop-common-project ]]; then
echo Looks like this is being run at project root
- # if all of the lines start with hadoop-common/, hadoop-hdfs/, or hadoop-mapreduce/, this is
+ # if all of the lines start with hadoop-common/, hadoop-hdfs/, hadoop-yarn/ or hadoop-mapreduce/, this is
# relative to the hadoop root instead of the subproject root, so we need
# to chop off another layer
- elif [[ "$PREFIX_DIRS_AND_FILES" =~ ^(hadoop-common-project|hadoop-hdfs-project|hadoop-mapreduce-project)$ ]]; then
+ elif [[ "$PREFIX_DIRS_AND_FILES" =~ ^(hadoop-common-project|hadoop-hdfs-project|hadoop-yarn-project|hadoop-mapreduce-project)$ ]]; then
echo Looks like this is relative to project root. Increasing PLEVEL
PLEVEL=$[$PLEVEL + 1]
- elif ! echo "$PREFIX_DIRS_AND_FILES" | grep -vxq 'hadoop-common-project\|hadoop-hdfs-project\|hadoop-mapreduce-project' ; then
+ elif ! echo "$PREFIX_DIRS_AND_FILES" | grep -vxq 'hadoop-common-project\|hadoop-hdfs-project\|hadoop-yarn-project\|hadoop-mapreduce-project' ; then
echo Looks like this is a cross-subproject patch. Try applying from the project root
cleanup 1
fi
Modified: hadoop/common/branches/HDFS-3077/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml?rev=1371518&r1=1371517&r2=1371518&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml Thu Aug 9 22:29:36 2012
@@ -24,19 +24,6 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/target/native/target/usr/local/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <directory>hadoop-yarn/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <includes>
- <include>yarn</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
<directory>bin</directory>
<outputDirectory>bin</outputDirectory>
<includes>
@@ -53,25 +40,6 @@
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
- <directory>hadoop-yarn/bin</directory>
- <outputDirectory>libexec</outputDirectory>
- <includes>
- <include>yarn-config.sh</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <directory>hadoop-yarn/bin</directory>
- <outputDirectory>sbin</outputDirectory>
- <includes>
- <include>yarn-daemon.sh</include>
- <include>yarn-daemons.sh</include>
- <include>start-yarn.sh</include>
- <include>stop-yarn.sh</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
<directory>bin</directory>
<outputDirectory>sbin</outputDirectory>
<includes>
@@ -80,7 +48,7 @@
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
- <directory>hadoop-yarn/conf</directory>
+ <directory>conf</directory>
<outputDirectory>etc/hadoop</outputDirectory>
<includes>
<include>**/*</include>
@@ -153,10 +121,18 @@
<excludes>
<exclude>org.apache.hadoop:hadoop-common</exclude>
<exclude>org.apache.hadoop:hadoop-hdfs</exclude>
- <!-- use slf4j from common to avoid multiple binding warnings -->
- <exclude>org.slf4j:slf4j-api</exclude>
- <exclude>org.slf4j:slf4j-log4j12</exclude>
+ <!-- use slf4j from common to avoid multiple binding warnings -->
+ <exclude>org.slf4j:slf4j-api</exclude>
+ <exclude>org.slf4j:slf4j-log4j12</exclude>
+ <exclude>org.hsqldb:hsqldb</exclude>
</excludes>
</dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>/share/hadoop/${hadoop.component}/lib-examples</outputDirectory>
+ <includes>
+ <include>org.hsqldb:hsqldb</include>
+ </includes>
+ </dependencySet>
</dependencySets>
</assembly>
Modified: hadoop/common/branches/HDFS-3077/hadoop-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-dist/pom.xml?rev=1371518&r1=1371517&r2=1371518&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-dist/pom.xml (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-dist/pom.xml Thu Aug 9 22:29:36 2012
@@ -120,6 +120,7 @@
run cp -r $ROOT/hadoop-common-project/hadoop-common/target/hadoop-common-${project.version}/* .
run cp -r $ROOT/hadoop-hdfs-project/hadoop-hdfs/target/hadoop-hdfs-${project.version}/* .
run cp -r $ROOT/hadoop-hdfs-project/hadoop-hdfs-httpfs/target/hadoop-hdfs-httpfs-${project.version}/* .
+ run cp -r $ROOT/hadoop-yarn-project/target/hadoop-yarn-project-${project.version}/* .
run cp -r $ROOT/hadoop-mapreduce-project/target/hadoop-mapreduce-${project.version}/* .
run cp -r $ROOT/hadoop-tools/hadoop-tools-dist/target/hadoop-tools-dist-${project.version}/* .
echo
Modified: hadoop/common/branches/HDFS-3077/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-project/pom.xml?rev=1371518&r1=1371517&r2=1371518&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-project/pom.xml Thu Aug 9 22:29:36 2012
@@ -197,6 +197,12 @@
<type>test-jar</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-applications-distributedshell</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-jobclient</artifactId>
@@ -649,6 +655,11 @@
<!-- Use the version needed by maven-clover-plugin -->
<version>3.0.2</version>
</dependency>
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>2.0.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: hadoop/common/branches/HDFS-3077/hadoop-tools/hadoop-pipes/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-tools/hadoop-pipes/src/CMakeLists.txt?rev=1371518&r1=1371517&r2=1371518&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-tools/hadoop-pipes/src/CMakeLists.txt (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-tools/hadoop-pipes/src/CMakeLists.txt Thu Aug 9 22:29:36 2012
@@ -26,17 +26,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_REENTRANT -D_FILE_OFFSET_BITS=64")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_REENTRANT -D_FILE_OFFSET_BITS=64")
-if (JVM_ARCH_DATA_MODEL EQUAL 32)
- # force 32-bit code generation on amd64/x86_64, ppc64, sparc64
- if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_SYSTEM_PROCESSOR MATCHES ".*64")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
- set(CMAKE_LD_FLAGS "${CMAKE_LD_FLAGS} -m32")
- endif ()
- if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64")
- set(CMAKE_SYSTEM_PROCESSOR "i686")
- endif ()
-endif (JVM_ARCH_DATA_MODEL EQUAL 32)
+include(../../../hadoop-common-project/hadoop-common/src/JNIFlags.cmake NO_POLICY_SCOPE)
function(output_directory TGT DIR)
SET_TARGET_PROPERTIES(${TGT} PROPERTIES
@@ -80,7 +70,6 @@ add_library(hadooppipes STATIC
main/native/pipes/impl/HadoopPipes.cc
)
target_link_libraries(hadooppipes
- ${JAVA_JVM_LIBRARY}
${OPENSSL_LIBRARIES}
pthread
)
Modified: hadoop/common/branches/HDFS-3077/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java?rev=1371518&r1=1371517&r2=1371518&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java Thu Aug 9 22:29:36 2012
@@ -958,7 +958,6 @@ public class StreamJob implements Tool {
if (!b)
fail(LINK_URI);
}
- DistributedCache.createSymlink(jobConf_);
// set the jobconf for the caching parameters
if (cacheArchives != null)
DistributedCache.setCacheArchives(archiveURIs, jobConf_);
Modified: hadoop/common/branches/HDFS-3077/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/pom.xml?rev=1371518&r1=1371517&r2=1371518&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/pom.xml (original)
+++ hadoop/common/branches/HDFS-3077/pom.xml Thu Aug 9 22:29:36 2012
@@ -78,6 +78,7 @@ xsi:schemaLocation="http://maven.apache.
<module>hadoop-assemblies</module>
<module>hadoop-common-project</module>
<module>hadoop-hdfs-project</module>
+ <module>hadoop-yarn-project</module>
<module>hadoop-mapreduce-project</module>
<module>hadoop-tools</module>
<module>hadoop-dist</module>