big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-11885. hadoop-dist dist-layout-stitching.sh does not work with dash. (wang)

Browse Source
This commit is contained in:
Andrew Wang 2015-05-29 14:54:18 -07:00
parent 7817674a3a
commit 7673d4f205
12 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -643,6 +643,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-11242. Record the time of calling in tracing span of HADOOP-11242. Record the time of calling in tracing span of
IPC server. (Masatake Iwasaki via aajisaka) IPC server. (Masatake Iwasaki via aajisaka)
HADOOP-11885. hadoop-dist dist-layout-stitching.sh does not work with dash.
(wang)
BUG FIXES BUG FIXES
HADOOP-11802: DomainSocketWatcher thread terminates sometimes after there HADOOP-11802: DomainSocketWatcher thread terminates sometimes after there

2
hadoop-common-project/hadoop-common/pom.xml
View File

@ -666,7 +666,7 @@
<goals><goal>run</goal></goals> <goals><goal>run</goal></goals>
<configuration> <configuration>
<target> <target>
<exec executable="sh" failonerror="true" dir="${project.build.directory}/native"> <exec executable="${shell-executable}" failonerror="true" dir="${project.build.directory}/native">
<arg value="-c"/> <arg value="-c"/>
<arg value="[ x$SKIPTESTS = xtrue ] || ${project.build.directory}/native/test_bulk_crc32"/> <arg value="[ x$SKIPTESTS = xtrue ] || ${project.build.directory}/native/test_bulk_crc32"/>
<env key="SKIPTESTS" value="${skipTests}"/> <env key="SKIPTESTS" value="${skipTests}"/>

4
hadoop-common-project/hadoop-kms/pom.xml
View File

@ -383,7 +383,7 @@
cd "${project.build.directory}/tomcat.exp" cd "${project.build.directory}/tomcat.exp"
gzip -cd ../../downloads/apache-tomcat-${tomcat.version}.tar.gz | tar xf - gzip -cd ../../downloads/apache-tomcat-${tomcat.version}.tar.gz | tar xf -
</echo> </echo>
<exec executable="sh" dir="${project.build.directory}" <exec executable="${shell-executable}" dir="${project.build.directory}"
failonerror="true"> failonerror="true">
<arg line="./tomcat-untar.sh"/> <arg line="./tomcat-untar.sh"/>
</exec> </exec>
@ -426,7 +426,7 @@
cd "${project.build.directory}" cd "${project.build.directory}"
tar cf - ${project.artifactId}-${project.version} | gzip > ${project.artifactId}-${project.version}.tar.gz tar cf - ${project.artifactId}-${project.version} | gzip > ${project.artifactId}-${project.version}.tar.gz
</echo> </echo>
<exec executable="sh" dir="${project.build.directory}" <exec executable="${shell-executable}" dir="${project.build.directory}"
failonerror="true"> failonerror="true">
<arg line="./dist-maketar.sh"/> <arg line="./dist-maketar.sh"/>
</exec> </exec>

4
hadoop-dist/pom.xml
View File

@ -191,7 +191,7 @@
echo "Hadoop dist layout available at: ${project.build.directory}/hadoop-${project.version}" echo "Hadoop dist layout available at: ${project.build.directory}/hadoop-${project.version}"
echo echo
</echo> </echo>
<exec executable="sh" dir="${project.build.directory}" failonerror="true"> <exec executable="${shell-executable}" dir="${project.build.directory}" failonerror="true">
<arg line="./dist-layout-stitching.sh"/> <arg line="./dist-layout-stitching.sh"/>
</exec> </exec>
</target> </target>
@ -224,7 +224,7 @@
echo "Hadoop dist tar available at: ${project.build.directory}/hadoop-${project.version}.tar.gz" echo "Hadoop dist tar available at: ${project.build.directory}/hadoop-${project.version}.tar.gz"
echo echo
</echo> </echo>
<exec executable="sh" dir="${project.build.directory}" failonerror="true"> <exec executable="${shell-executable}" dir="${project.build.directory}" failonerror="true">
<arg line="./dist-tar-stitching.sh"/> <arg line="./dist-tar-stitching.sh"/>
</exec> </exec>
</target> </target>

4
hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
View File

@ -517,7 +517,7 @@
cd "${project.build.directory}/tomcat.exp" cd "${project.build.directory}/tomcat.exp"
gzip -cd ../../downloads/apache-tomcat-${tomcat.version}.tar.gz | tar xf - gzip -cd ../../downloads/apache-tomcat-${tomcat.version}.tar.gz | tar xf -
</echo> </echo>
<exec executable="sh" dir="${project.build.directory}" failonerror="true"> <exec executable="${shell-executable}" dir="${project.build.directory}" failonerror="true">
<arg line="./tomcat-untar.sh"/> <arg line="./tomcat-untar.sh"/>
</exec> </exec>
@ -557,7 +557,7 @@
cd "${project.build.directory}" cd "${project.build.directory}"
tar cf - ${project.artifactId}-${project.version} | gzip > ${project.artifactId}-${project.version}.tar.gz tar cf - ${project.artifactId}-${project.version} | gzip > ${project.artifactId}-${project.version}.tar.gz
</echo> </echo>
<exec executable="sh" dir="${project.build.directory}" failonerror="true"> <exec executable="${shell-executable}" dir="${project.build.directory}" failonerror="true">
<arg line="./dist-maketar.sh"/> <arg line="./dist-maketar.sh"/>
</exec> </exec>
</target> </target>

2
hadoop-hdfs-project/hadoop-hdfs/pom.xml
View File

@ -674,7 +674,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<phase>test-compile</phase> <phase>test-compile</phase>
<configuration> <configuration>
<target> <target>
<exec executable="sh"> <exec executable="${shell-executable}">
<arg value="-c"/> <arg value="-c"/>
<arg value="for i in {1..${testsThreadCount}}; do mkdir -p ${test.build.data}/$i; mkdir -p ${hadoop.tmp.dir}/$i; done"/> <arg value="for i in {1..${testsThreadCount}}; do mkdir -p ${test.build.data}/$i; mkdir -p ${hadoop.tmp.dir}/$i; done"/>
</exec> </exec>

2
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml
View File

@ -197,7 +197,7 @@
<goals><goal>run</goal></goals> <goals><goal>run</goal></goals>
<configuration> <configuration>
<target> <target>
<exec executable="sh" failonerror="true" dir="${project.build.directory}/native/test"> <exec executable="${shell-executable}" failonerror="true" dir="${project.build.directory}/native/test">
<arg value="-c"/> <arg value="-c"/>
<arg value="[ x$SKIPTESTS = xtrue ] || sh test.sh"/> <arg value="[ x$SKIPTESTS = xtrue ] || sh test.sh"/>
<env key="SKIPTESTS" value="${skipTests}"/> <env key="SKIPTESTS" value="${skipTests}"/>

4
hadoop-mapreduce-project/pom.xml
View File

@ -170,7 +170,7 @@
cd "${project.build.directory}" cd "${project.build.directory}"
tar cf - ${project.artifactId}-${project.version} | gzip > ${project.artifactId}-${project.version}.tar.gz tar cf - ${project.artifactId}-${project.version} | gzip > ${project.artifactId}-${project.version}.tar.gz
</echo> </echo>
<exec executable="sh" dir="${project.build.directory}" failonerror="true"> <exec executable="${shell-executable}" dir="${project.build.directory}" failonerror="true">
<arg line="./dist-maketar.sh"/> <arg line="./dist-maketar.sh"/>
</exec> </exec>
</target> </target>
@ -254,7 +254,7 @@
cp -R $${LIB_DIR}/lib* $${TARGET_DIR} cp -R $${LIB_DIR}/lib* $${TARGET_DIR}
fi fi
</echo> </echo>
<exec executable="sh" dir="${project.build.directory}" failonerror="true"> <exec executable="${shell-executable}" dir="${project.build.directory}" failonerror="true">
<arg line="./dist-copynativelibs.sh"/> <arg line="./dist-copynativelibs.sh"/>
</exec> </exec>
</target> </target>

4
hadoop-project-dist/pom.xml
View File

@ -361,7 +361,7 @@
fi fi
fi fi
</echo> </echo>
<exec executable="sh" dir="${project.build.directory}" failonerror="true"> <exec executable="${shell-executable}" dir="${project.build.directory}" failonerror="true">
<arg line="./dist-copynativelibs.sh"/> <arg line="./dist-copynativelibs.sh"/>
</exec> </exec>
</target> </target>
@ -380,7 +380,7 @@
cd "${project.build.directory}" cd "${project.build.directory}"
tar cf - ${project.artifactId}-${project.version} | gzip > ${project.artifactId}-${project.version}.tar.gz tar cf - ${project.artifactId}-${project.version} | gzip > ${project.artifactId}-${project.version}.tar.gz
</echo> </echo>
<exec executable="sh" dir="${project.build.directory}" failonerror="true"> <exec executable="${shell-executable}" dir="${project.build.directory}" failonerror="true">
<arg line="./dist-maketar.sh"/> <arg line="./dist-maketar.sh"/>
</exec> </exec>
</target> </target>

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
View File

@ -203,7 +203,7 @@
<phase>test</phase> <phase>test</phase>
<configuration> <configuration>
<target> <target>
<exec executable="sh" failonerror="true" dir="${project.build.directory}/native"> <exec executable="${shell-executable}" failonerror="true" dir="${project.build.directory}/native">
<arg value="-c"/> <arg value="-c"/>
<arg value="[ x$SKIPTESTS = xtrue ] || test-container-executor"/> <arg value="[ x$SKIPTESTS = xtrue ] || test-container-executor"/>
<env key="SKIPTESTS" value="${skipTests}"/> <env key="SKIPTESTS" value="${skipTests}"/>

2
hadoop-yarn-project/pom.xml
View File

@ -96,7 +96,7 @@
cd "${project.build.directory}" cd "${project.build.directory}"
tar cf - ${project.artifactId}-${project.version} | gzip > ${project.artifactId}-${project.version}.tar.gz tar cf - ${project.artifactId}-${project.version} | gzip > ${project.artifactId}-${project.version}.tar.gz
</echo> </echo>
<exec executable="sh" dir="${project.build.directory}" failonerror="true"> <exec executable="${shell-executable}" dir="${project.build.directory}" failonerror="true">
<arg line="./dist-maketar.sh"/> <arg line="./dist-maketar.sh"/>
</exec> </exec>
</target> </target>

2
pom.xml
View File

@ -105,6 +105,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version> <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
<maven-checkstyle-plugin.version>2.15</maven-checkstyle-plugin.version> <maven-checkstyle-plugin.version>2.15</maven-checkstyle-plugin.version>
<checkstyle.version>6.6</checkstyle.version> <checkstyle.version>6.6</checkstyle.version>
<shell-executable>bash</shell-executable>
</properties> </properties>
<modules> <modules>