Author: bmahe
Date: Tue Nov 8 02:48:53 2011
New Revision: 1199077
URL: http://svn.apache.org/viewvc?rev=1199077&view=rev
Log:
Misc. fixes for Hadoop 0.23
Added:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HDFS-2543.patch
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HDFS-2544.patch
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3372.patch
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3373.patch
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7787.patch
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7801.patch
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7802.patch
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.default
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7787.patch
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7787.patch?rev=1199077&r1=1199076&r2=1199077&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7787.patch
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7787.patch
Tue Nov 8 02:48:53 2011
@@ -1,24 +1,8 @@
-diff --git hadoop-dist/pom.xml hadoop-dist/pom.xml
-index 2a5d7a9..cce1f56 100644
---- hadoop-dist/pom.xml
-+++ hadoop-dist/pom.xml
-@@ -152,9 +152,9 @@
- fi
- }
-
-- run tar czf hadoop-${project.version}.tar.gz
hadoop-${project.version}
-+ run tar czf hadoop-${project.version}-bin.tar.gz
hadoop-${project.version}
- echo
-- 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}-bin.tar.gz"
- echo
- </echo>
- <exec executable="sh" dir="${project.build.directory}"
failonerror="true">
diff --git pom.xml pom.xml
-index 96c627b..16cc708 100644
+index a3bdcd0..de5715f 100644
--- pom.xml
+++ pom.xml
-@@ -201,7 +201,7 @@
+@@ -264,7 +264,7 @@
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<attach>false</attach>
@@ -27,7 +11,7 @@ index 96c627b..16cc708 100644
<outputDirectory>hadoop-dist/target</outputDirectory>
<!-- Not using descriptorRef and hadoop-assembly dependency
-->
<!-- to avoid making hadoop-main to depend on a module
-->
-@@ -225,7 +225,7 @@
+@@ -288,7 +288,7 @@
<configuration>
<target>
<echo/>
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7801.patch
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7801.patch?rev=1199077&r1=1199076&r2=1199077&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7801.patch
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7801.patch
Tue Nov 8 02:48:53 2011
@@ -13,3 +13,109 @@ index 5f248fd..8bf9aec 100644
#check to see if the conf dir is given as an optional argument
if [ $# -gt 1 ]
+diff --git
hadoop-common-project/hadoop-common/src/main/packages/deb/init.d/hadoop-datanode
hadoop-common-project/hadoop-common/src/main/packages/deb/init.d/hadoop-datanode
+index 8179587..658f6d7 100644
+---
hadoop-common-project/hadoop-common/src/main/packages/deb/init.d/hadoop-datanode
++++
hadoop-common-project/hadoop-common/src/main/packages/deb/init.d/hadoop-datanode
+@@ -75,7 +75,7 @@ check_privsep_dir() {
+ }
+
+ export PATH="${PATH:+$PATH:}/usr/sbin:/usr/bin"
+-export HADOOP_PREFIX="/usr"
++export HADOOP_PREFIX=${HADOOP_PREFIX:-/usr}
+
+ case "$1" in
+ start)
+diff --git
hadoop-common-project/hadoop-common/src/main/packages/deb/init.d/hadoop-jobtracker
hadoop-common-project/hadoop-common/src/main/packages/deb/init.d/hadoop-jobtracker
+index c483d76..8958da3 100644
+---
hadoop-common-project/hadoop-common/src/main/packages/deb/init.d/hadoop-jobtracker
++++
hadoop-common-project/hadoop-common/src/main/packages/deb/init.d/hadoop-jobtracker
+@@ -67,7 +67,7 @@ check_privsep_dir() {
+ }
+
+ export PATH="${PATH:+$PATH:}/usr/sbin:/usr/bin"
+-export HADOOP_PREFIX="/usr"
++export HADOOP_PREFIX=${HADOOP_PREFIX:-/usr}
+
+ case "$1" in
+ start)
+diff --git
hadoop-common-project/hadoop-common/src/main/packages/deb/init.d/hadoop-namenode
hadoop-common-project/hadoop-common/src/main/packages/deb/init.d/hadoop-namenode
+index e260876..6e5485c 100644
+---
hadoop-common-project/hadoop-common/src/main/packages/deb/init.d/hadoop-namenode
++++
hadoop-common-project/hadoop-common/src/main/packages/deb/init.d/hadoop-namenode
+@@ -71,7 +71,7 @@ format() {
+ }
+
+ export PATH="${PATH:+$PATH:}/usr/sbin:/usr/bin"
+-export HADOOP_PREFIX="/usr"
++export HADOOP_PREFIX=${HADOOP_PREFIX:-/usr}
+
+ case "$1" in
+ start)
+diff --git
hadoop-common-project/hadoop-common/src/main/packages/deb/init.d/hadoop-tasktracker
hadoop-common-project/hadoop-common/src/main/packages/deb/init.d/hadoop-tasktracker
+index 983030b..ca36cd6 100644
+---
hadoop-common-project/hadoop-common/src/main/packages/deb/init.d/hadoop-tasktracker
++++
hadoop-common-project/hadoop-common/src/main/packages/deb/init.d/hadoop-tasktracker
+@@ -67,7 +67,7 @@ check_privsep_dir() {
+ }
+
+ export PATH="${PATH:+$PATH:}/usr/sbin:/usr/bin"
+-export HADOOP_PREFIX="/usr"
++export HADOOP_PREFIX=${HADOOP_PREFIX:-/usr}
+
+ case "$1" in
+ start)
+diff --git
hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-conf.sh
hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-conf.sh
+index db1f5b9..de47ce2 100644
+--- hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-conf.sh
++++ hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-conf.sh
+@@ -19,7 +19,9 @@ bin=`dirname "$0"`
+ bin=`cd "$bin"; pwd`
+
+ this="${BASH_SOURCE-$0}"
+-export HADOOP_PREFIX=`dirname "$this"`/..
++HADOOP_DEFAULT_PREFIX=`dirname "$this"`/..
++HADOOP_PREFIX=${HADOOP_PREFIX:-$HADOOP_DEFAULT_PREFIX}
++export HADOOP_PREFIX
+
+ usage() {
+ echo "
+diff --git
hadoop-common-project/hadoop-common/src/main/packages/rpm/init.d/hadoop-jobtracker
hadoop-common-project/hadoop-common/src/main/packages/rpm/init.d/hadoop-jobtracker
+index 5c2272b..9e85c66 100644
+---
hadoop-common-project/hadoop-common/src/main/packages/rpm/init.d/hadoop-jobtracker
++++
hadoop-common-project/hadoop-common/src/main/packages/rpm/init.d/hadoop-jobtracker
+@@ -27,7 +27,7 @@ source /etc/default/hadoop-env.sh
+ RETVAL=0
+ PIDFILE="${HADOOP_PID_DIR}/hadoop-mapred-jobtracker.pid"
+ desc="Hadoop jobtracker daemon"
+-export HADOOP_PREFIX="/usr"
++export HADOOP_PREFIX=${HADOOP_PREFIX:-/usr}
+
+ start() {
+ echo -n $"Starting $desc (hadoop-jobtracker): "
+diff --git
hadoop-common-project/hadoop-common/src/main/packages/rpm/init.d/hadoop-namenode
hadoop-common-project/hadoop-common/src/main/packages/rpm/init.d/hadoop-namenode
+index 4e7f74b..3067f03 100644
+---
hadoop-common-project/hadoop-common/src/main/packages/rpm/init.d/hadoop-namenode
++++
hadoop-common-project/hadoop-common/src/main/packages/rpm/init.d/hadoop-namenode
+@@ -27,7 +27,7 @@ source /etc/default/hadoop-env.sh
+ RETVAL=0
+ PIDFILE="${HADOOP_PID_DIR}/hadoop-hdfs-namenode.pid"
+ desc="Hadoop namenode daemon"
+-export HADOOP_PREFIX="/usr"
++export HADOOP_PREFIX=${HADOOP_PREFIX:-/usr}
+
+ start() {
+ echo -n $"Starting $desc (hadoop-namenode): "
+diff --git
hadoop-common-project/hadoop-common/src/main/packages/rpm/init.d/hadoop-tasktracker
hadoop-common-project/hadoop-common/src/main/packages/rpm/init.d/hadoop-tasktracker
+index 2d06c5a..9a57f56 100644
+---
hadoop-common-project/hadoop-common/src/main/packages/rpm/init.d/hadoop-tasktracker
++++
hadoop-common-project/hadoop-common/src/main/packages/rpm/init.d/hadoop-tasktracker
+@@ -27,7 +27,7 @@ source /etc/default/hadoop-env.sh
+ RETVAL=0
+ PIDFILE="${HADOOP_PID_DIR}/hadoop-mapred-tasktracker.pid"
+ desc="Hadoop tasktracker daemon"
+-export HADOOP_PREFIX="/usr"
++export HADOOP_PREFIX=${HADOOP_PREFIX:-/usr}
+
+ start() {
+ echo -n $"Starting $desc (hadoop-tasktracker): "
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7802.patch
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7802.patch?rev=1199077&r1=1199076&r2=1199077&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7802.patch
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HADOOP-7802.patch
Tue Nov 8 02:48:53 2011
@@ -1,5 +1,5 @@
diff --git hadoop-common-project/hadoop-common/src/main/bin/hadoop
hadoop-common-project/hadoop-common/src/main/bin/hadoop
-index a3bed69..c047952 100755
+index a3bed69..9e92b5c 100755
--- hadoop-common-project/hadoop-common/src/main/bin/hadoop
+++ hadoop-common-project/hadoop-common/src/main/bin/hadoop
@@ -21,7 +21,9 @@ bin=`which $0`
@@ -8,8 +8,188 @@ index a3bed69..c047952 100755
-. "$bin"/../libexec/hadoop-config.sh
+DEFAULT_LIBEXEC_DIR="$bin"/../libexec
-+HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXED_DIR}
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
+. $HADOOP_LIBEXEC_DIR/hadoop-config.sh
function print_usage(){
echo "Usage: hadoop [--config confdir] COMMAND"
+diff --git hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh
hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh
+index 01aaad4..a843c93 100755
+--- hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh
++++ hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh
+@@ -39,7 +39,9 @@ fi
+ bin=`dirname "${BASH_SOURCE-$0}"`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin"/../libexec/hadoop-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"/../libexec
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/hadoop-config.sh
+
+ # get arguments
+
+diff --git hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemons.sh
hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemons.sh
+index 08c7e23..181d7ac 100755
+--- hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemons.sh
++++ hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemons.sh
+@@ -29,6 +29,8 @@ fi
+ bin=`dirname "${BASH_SOURCE-$0}"`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin"/../libexec/hadoop-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"/../libexec
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/hadoop-config.sh
+
+ exec "$bin/slaves.sh" --config $HADOOP_CONF_DIR cd "$HADOOP_PREFIX" \;
"$bin/hadoop-daemon.sh" --config $HADOOP_CONF_DIR "$@"
+diff --git hadoop-common-project/hadoop-common/src/main/bin/rcc
hadoop-common-project/hadoop-common/src/main/bin/rcc
+index ebeebd0..5f75b7c 100755
+--- hadoop-common-project/hadoop-common/src/main/bin/rcc
++++ hadoop-common-project/hadoop-common/src/main/bin/rcc
+@@ -30,7 +30,9 @@
+ bin=`dirname "${BASH_SOURCE-$0}"`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin"/../libexec/hadoop-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"/../libexec
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/hadoop-config.sh
+
+ if [ -f "${HADOOP_CONF_DIR}/hadoop-env.sh" ]; then
+ . "${HADOOP_CONF_DIR}/hadoop-env.sh"
+diff --git hadoop-common-project/hadoop-common/src/main/bin/slaves.sh
hadoop-common-project/hadoop-common/src/main/bin/slaves.sh
+index 153f441..016392f 100755
+--- hadoop-common-project/hadoop-common/src/main/bin/slaves.sh
++++ hadoop-common-project/hadoop-common/src/main/bin/slaves.sh
+@@ -38,7 +38,9 @@ fi
+ bin=`dirname "${BASH_SOURCE-$0}"`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin"/../libexec/hadoop-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"/../libexec
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/hadoop-config.sh
+
+ if [ -f "${HADOOP_CONF_DIR}/hadoop-env.sh" ]; then
+ . "${HADOOP_CONF_DIR}/hadoop-env.sh"
+diff --git hadoop-common-project/hadoop-common/src/main/bin/start-all.sh
hadoop-common-project/hadoop-common/src/main/bin/start-all.sh
+index 57fb3d6..f91d9af 100755
+--- hadoop-common-project/hadoop-common/src/main/bin/start-all.sh
++++ hadoop-common-project/hadoop-common/src/main/bin/start-all.sh
+@@ -23,7 +23,9 @@ echo "This script is Deprecated. Instead use start-dfs.sh
and start-mapred.sh"
+ bin=`dirname "${BASH_SOURCE-$0}"`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin"/../libexec/hadoop-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"/../libexec
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/hadoop-config.sh
+
+ # start hdfs daemons if hdfs is present
+ if [ -f "${HADOOP_HDFS_HOME}"/bin/start-dfs.sh ]; then
+diff --git hadoop-common-project/hadoop-common/src/main/bin/stop-all.sh
hadoop-common-project/hadoop-common/src/main/bin/stop-all.sh
+index a2b5ddb..7d8bd59 100755
+--- hadoop-common-project/hadoop-common/src/main/bin/stop-all.sh
++++ hadoop-common-project/hadoop-common/src/main/bin/stop-all.sh
+@@ -23,7 +23,9 @@ echo "This script is Deprecated. Instead use stop-dfs.sh and
stop-mapred.sh"
+ bin=`dirname "${BASH_SOURCE-$0}"`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin"/../libexec/hadoop-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"/../libexec
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/hadoop-config.sh
+
+ # stop hdfs daemons if hdfs is present
+ if [ -f "${HADOOP_HDFS_HOME}"/bin/stop-dfs.sh ]; then
+diff --git
hadoop-common-project/hadoop-common/src/main/packages/hadoop-create-user.sh
hadoop-common-project/hadoop-common/src/main/packages/hadoop-create-user.sh
+index a5d4304..ad8ab35 100644
+--- hadoop-common-project/hadoop-common/src/main/packages/hadoop-create-user.sh
++++ hadoop-common-project/hadoop-common/src/main/packages/hadoop-create-user.sh
+@@ -24,7 +24,9 @@ if [ "$HADOOP_HOME" != "" ]; then
+ echo
+ fi
+
+-. "$bin"/../libexec/hadoop-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"/../libexec
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/hadoop-config.sh
+
+ usage() {
+ echo "
+diff --git
hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-applications.sh
hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-applications.sh
+index 521c159..092e50d 100644
+---
hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-applications.sh
++++
hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-applications.sh
+@@ -19,7 +19,9 @@ bin=$(cd -P -- "$(dirname -- "$this")" && pwd -P)
+ script="$(basename -- "$this")"
+ this="$bin/$script"
+
+-. "$bin"/../libexec/hadoop-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"/../libexec
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/hadoop-config.sh
+
+ usage() {
+ echo "
+diff --git
hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-conf.sh
hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-conf.sh
+index db1f5b9..fa3cc6a 100644
+--- hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-conf.sh
++++ hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-conf.sh
+@@ -502,7 +502,10 @@ if [ "${AUTOSETUP}" == "1" -o "${AUTOSETUP}" == "y" ];
then
+ fi
+ chmod 755 -R ${HADOOP_PREFIX}/sbin/*hadoop*
+ chmod 755 -R ${HADOOP_PREFIX}/bin/hadoop
+- chmod 755 -R ${HADOOP_PREFIX}/libexec/hadoop-config.sh
++
++ HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-${HADOOP_PREFIX}/libexec}
++ chmod 755 -R ${HADOOP_LIBEXEC_DIR}/hadoop-config.sh
++
+ mkdir -p /home/${HADOOP_MR_USER}
+ chown ${HADOOP_MR_USER}:${HADOOP_GROUP} /home/${HADOOP_MR_USER}
+ HDFS_DIR=`echo ${HADOOP_HDFS_DIR} | sed -e 's/,/ /g'`
+diff --git
hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-hdfs.sh
hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-hdfs.sh
+index fc4a732..d2e8f1f 100644
+--- hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-hdfs.sh
++++ hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-hdfs.sh
+@@ -18,7 +18,9 @@
+ bin=`dirname "$0"`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin"/../libexec/hadoop-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"/../libexec
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/hadoop-config.sh
+
+ usage() {
+ echo "
+diff --git
hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-single-node.sh
hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-single-node.sh
+index 5b47e44..845f815 100644
+---
hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-single-node.sh
++++
hadoop-common-project/hadoop-common/src/main/packages/hadoop-setup-single-node.sh
+@@ -25,7 +25,9 @@ if [ "$HADOOP_HOME" != "" ]; then
+ echo
+ fi
+
+-. "$bin"/../libexec/hadoop-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"/../libexec
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/hadoop-config.sh
+
+ usage() {
+ echo "
+diff --git
hadoop-common-project/hadoop-common/src/main/packages/hadoop-validate-setup.sh
hadoop-common-project/hadoop-common/src/main/packages/hadoop-validate-setup.sh
+index 5d3aa14..35d8cb8 100644
+---
hadoop-common-project/hadoop-common/src/main/packages/hadoop-validate-setup.sh
++++
hadoop-common-project/hadoop-common/src/main/packages/hadoop-validate-setup.sh
+@@ -31,7 +31,9 @@
+ bin=`dirname "$0"`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin"/../libexec/hadoop-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"/../libexec
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/hadoop-config.sh
+
+ usage() {
+ echo "
Added:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HDFS-2543.patch
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HDFS-2543.patch?rev=1199077&view=auto
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HDFS-2543.patch
(added)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HDFS-2543.patch
Tue Nov 8 02:48:53 2011
@@ -0,0 +1,41 @@
+diff --git
hadoop-hdfs-project/hadoop-hdfs/src/contrib/fuse-dfs/src/fuse_dfs_wrapper.sh
hadoop-hdfs-project/hadoop-hdfs/src/contrib/fuse-dfs/src/fuse_dfs_wrapper.sh
+index 549b435..97239cc 100755
+---
hadoop-hdfs-project/hadoop-hdfs/src/contrib/fuse-dfs/src/fuse_dfs_wrapper.sh
++++
hadoop-hdfs-project/hadoop-hdfs/src/contrib/fuse-dfs/src/fuse_dfs_wrapper.sh
+@@ -16,9 +16,7 @@
+ # limitations under the License.
+ #
+
+-if [ "$HADOOP_PREFIX" = "" ]; then
+-export HADOOP_PREFIX=/usr/local/share/hadoop
+-fi
++export HADOOP_PREFIX=${HADOOP_PREFIX:-/usr/local/share/hadoop}
+
+ if [ "$OS_ARCH" = "" ]; then
+ export OS_ARCH=amd64
+diff --git
hadoop-hdfs-project/hadoop-hdfs/src/main/packages/deb/init.d/hadoop-secondarynamenode
hadoop-hdfs-project/hadoop-hdfs/src/main/packages/deb/init.d/hadoop-secondarynamenode
+index 1b08cd3..089e372 100644
+---
hadoop-hdfs-project/hadoop-hdfs/src/main/packages/deb/init.d/hadoop-secondarynamenode
++++
hadoop-hdfs-project/hadoop-hdfs/src/main/packages/deb/init.d/hadoop-secondarynamenode
+@@ -67,7 +67,7 @@ check_privsep_dir() {
+ }
+
+ export PATH="${PATH:+$PATH:}/usr/sbin:/usr/bin"
+-export HADOOP_PREFIX="/usr"
++export HADOOP_PREFIX=${HADOOP_PREFIX:-/usr}
+
+ case "$1" in
+ start)
+diff --git
hadoop-hdfs-project/hadoop-hdfs/src/main/packages/rpm/init.d/hadoop-secondarynamenode
hadoop-hdfs-project/hadoop-hdfs/src/main/packages/rpm/init.d/hadoop-secondarynamenode
+index 81fb744..d9ccfc3 100644
+---
hadoop-hdfs-project/hadoop-hdfs/src/main/packages/rpm/init.d/hadoop-secondarynamenode
++++
hadoop-hdfs-project/hadoop-hdfs/src/main/packages/rpm/init.d/hadoop-secondarynamenode
+@@ -27,7 +27,7 @@ source /etc/default/hadoop-env.sh
+ RETVAL=0
+ PIDFILE="${HADOOP_PID_DIR}/hadoop-hdfs-secondarynamenode.pid"
+ desc="Hadoop secondary namenode daemon"
+-export HADOOP_PREFIX="/usr"
++export HADOOP_PREFIX=${HADOOP_PREFIX:-/usr}
+
+ start() {
+ echo -n $"Starting $desc (hadoop-secondarynamenode): "
Added:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HDFS-2544.patch
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HDFS-2544.patch?rev=1199077&view=auto
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HDFS-2544.patch
(added)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/HDFS-2544.patch
Tue Nov 8 02:48:53 2011
@@ -0,0 +1,152 @@
+diff --git hadoop-hdfs-project/hadoop-hdfs/src/main/bin/distribute-exclude.sh
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/distribute-exclude.sh
+index cc538f7..66fc14a 100644
+--- hadoop-hdfs-project/hadoop-hdfs/src/main/bin/distribute-exclude.sh
++++ hadoop-hdfs-project/hadoop-hdfs/src/main/bin/distribute-exclude.sh
+@@ -36,7 +36,9 @@
+ bin=`dirname "$0"`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin/../libexec/hdfs-config.sh"
++DEFAULT_LIBEXEC_DIR="$bin"/../libexec
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/hdfs-config.sh
+
+ if [ "$1" = '' ] ; then
+ "Error: please specify local exclude file as a first argument"
+diff --git hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
+index d9b8f61..314fac8 100755
+--- hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
++++ hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
+@@ -19,7 +19,9 @@ bin=`which $0`
+ bin=`dirname ${bin}`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin"/../libexec/hdfs-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"/../libexec
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/hdfs-config.sh
+
+ function print_usage(){
+ echo "Usage: hdfs [--config confdir] COMMAND"
+diff --git hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs-config.sh
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs-config.sh
+index 48aa20c..09eec6e 100644
+--- hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs-config.sh
++++ hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs-config.sh
+@@ -24,8 +24,10 @@ bin=`cd "$bin"; pwd`
+
+ export HADOOP_PREFIX="${HADOOP_PREFIX:-$bin/..}"
+
+-if [ -e "$bin/../libexec/hadoop-config.sh" ]; then
+- . $bin/../libexec/hadoop-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"/../libexec
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++if [ -e "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh" ]; then
++ . ${HADOOP_LIBEXEC_DIR}/hadoop-config.sh
+ elif [ -e "${HADOOP_COMMON_HOME}/libexec/hadoop-config.sh" ]; then
+ . "$HADOOP_COMMON_HOME"/libexec/hadoop-config.sh
+ elif [ -e "${HADOOP_HOME}/libexec/hadoop-config.sh" ]; then
+diff --git hadoop-hdfs-project/hadoop-hdfs/src/main/bin/refresh-namenodes.sh
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/refresh-namenodes.sh
+index 2092764..d3f6759 100644
+--- hadoop-hdfs-project/hadoop-hdfs/src/main/bin/refresh-namenodes.sh
++++ hadoop-hdfs-project/hadoop-hdfs/src/main/bin/refresh-namenodes.sh
+@@ -23,7 +23,9 @@
+ bin=`dirname "$0"`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin/../libexec/hdfs-config.sh"
++DEFAULT_LIBEXEC_DIR="$bin"/../libexec
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/hdfs-config.sh
+
+ namenodes=$("$HADOOP_PREFIX/bin/hdfs" getconf -nnRpcAddresses)
+ if [ "$?" != '0' ] ; then errorFlag='1' ;
+diff --git hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-balancer.sh
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-balancer.sh
+index b6b3aa7..24c6227 100755
+--- hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-balancer.sh
++++ hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-balancer.sh
+@@ -18,7 +18,9 @@
+ bin=`dirname "${BASH_SOURCE-$0}"`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin"/../libexec/hdfs-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"/../libexec
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/hdfs-config.sh
+
+ # Start balancer daemon.
+
+diff --git hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh
+index d6ed5f9..d6d03f7 100755
+--- hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh
++++ hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh
+@@ -25,7 +25,9 @@ usage="Usage: start-dfs.sh [-upgrade|-rollback]"
+ bin=`dirname "${BASH_SOURCE-$0}"`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin"/../libexec/hdfs-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"/../libexec
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/hdfs-config.sh
+
+ # get arguments
+ if [ $# -ge 1 ]; then
+diff --git hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-secure-dns.sh
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-secure-dns.sh
+index bcb9b8f..7ddf687 100644
+--- hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-secure-dns.sh
++++ hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-secure-dns.sh
+@@ -22,7 +22,9 @@ usage="Usage (run as root in order to start secure
datanodes): start-secure-dns.
+ bin=`dirname "${BASH_SOURCE-$0}"`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin"/../libexec/hdfs-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"/../libexec
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/hdfs-config.sh
+
+ if [ "$EUID" -eq 0 ] && [ -n "$HADOOP_SECURE_DN_USER" ]; then
+ "$HADOOP_PREFIX"/sbin/hadoop-daemons.sh --config $HADOOP_CONF_DIR --script
"$bin"/hdfs start datanode $dataStartOpt
+diff --git hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-balancer.sh
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-balancer.sh
+index 7edd0bd..5026c8c 100755
+--- hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-balancer.sh
++++ hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-balancer.sh
+@@ -18,7 +18,9 @@
+ bin=`dirname "${BASH_SOURCE-$0}"`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin"/../libexec/hdfs-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"/../libexec
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/hdfs-config.sh
+
+ # Stop balancer daemon.
+ # Run this on the machine where the balancer is running
+diff --git hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-dfs.sh
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-dfs.sh
+index e64a5ea..11788e2 100755
+--- hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-dfs.sh
++++ hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-dfs.sh
+@@ -18,7 +18,9 @@
+ bin=`dirname "${BASH_SOURCE-$0}"`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin"/../libexec/hdfs-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"/../libexec
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/hdfs-config.sh
+
+ #---------------------------------------------------------
+ # namenodes
+diff --git hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-secure-dns.sh
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-secure-dns.sh
+index a0ae172..fdd47c3 100644
+--- hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-secure-dns.sh
++++ hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-secure-dns.sh
+@@ -22,7 +22,9 @@ usage="Usage (run as root in order to stop secure
datanodes): stop-secure-dns.sh
+ bin=`dirname "${BASH_SOURCE-$0}"`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin"/../libexec/hdfs-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"/../libexec
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/hdfs-config.sh
+
+ if [ "$EUID" -eq 0 ] && [ -n "$HADOOP_SECURE_DN_USER" ]; then
+ "$HADOOP_PREFIX"/sbin/hadoop-daemons.sh --config $HADOOP_CONF_DIR --script
"$bin"/hdfs stop datanode
Added:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3372.patch
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3372.patch?rev=1199077&view=auto
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3372.patch
(added)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3372.patch
Tue Nov 8 02:48:53 2011
@@ -0,0 +1,52 @@
+diff --git hadoop-mapreduce-project/src/examples/python/compile
hadoop-mapreduce-project/src/examples/python/compile
+index e202a1c..32c80ed 100644
+--- hadoop-mapreduce-project/src/examples/python/compile
++++ hadoop-mapreduce-project/src/examples/python/compile
+@@ -12,7 +12,7 @@
+ # limitations under the License.
+
+
+-export HADOOP_PREFIX=../../..
++export HADOOP_PREFIX=${HADOOP_PREFIX:-../../..}
+
+ export CLASSPATH="$HADOOP_PREFIX/build/classes"
+
+diff --git hadoop-mapreduce-project/src/examples/python/pyAbacus/compile
hadoop-mapreduce-project/src/examples/python/pyAbacus/compile
+index c06573b..641d5ff 100644
+--- hadoop-mapreduce-project/src/examples/python/pyAbacus/compile
++++ hadoop-mapreduce-project/src/examples/python/pyAbacus/compile
+@@ -12,7 +12,7 @@
+ # limitations under the License.
+
+
+-export HADOOP_PREFIX=../../../../..
++export HADOOP_PREFIX=${HADOOP_PREFIX:-../../../../..}
+
+ export CLASSPATH="$HADOOP_PREFIX/build/classes"
+ export CLASSPATH=${CLASSPATH}:"$HADOOP_PREFIX/build/contrib/abacus/classes"
+diff --git
hadoop-mapreduce-project/src/packages/deb/init.d/hadoop-historyserver
hadoop-mapreduce-project/src/packages/deb/init.d/hadoop-historyserver
+index 4421f55..6334729 100644
+--- hadoop-mapreduce-project/src/packages/deb/init.d/hadoop-historyserver
++++ hadoop-mapreduce-project/src/packages/deb/init.d/hadoop-historyserver
+@@ -67,7 +67,7 @@ check_privsep_dir() {
+ }
+
+ export PATH="${PATH:+$PATH:}/usr/sbin:/usr/bin"
+-export HADOOP_PREFIX="/usr"
++export HADOOP_PREFIX=${HADOOP_PREFIX:-/usr}
+
+ case "$1" in
+ start)
+diff --git
hadoop-mapreduce-project/src/packages/rpm/init.d/hadoop-historyserver
hadoop-mapreduce-project/src/packages/rpm/init.d/hadoop-historyserver
+index 71d1658..5677593 100644
+--- hadoop-mapreduce-project/src/packages/rpm/init.d/hadoop-historyserver
++++ hadoop-mapreduce-project/src/packages/rpm/init.d/hadoop-historyserver
+@@ -27,7 +27,7 @@ source /etc/default/hadoop-env.sh
+ RETVAL=0
+ PIDFILE="${HADOOP_PID_DIR}/hadoop-mapred-historyserver.pid"
+ desc="Hadoop historyserver daemon"
+-export HADOOP_PREFIX="/usr"
++export HADOOP_PREFIX=${HADOOP_PREFIX:-/usr}
+
+ start() {
+ echo -n $"Starting $desc (hadoop-historyserver): "
Added:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3373.patch
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3373.patch?rev=1199077&view=auto
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3373.patch
(added)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/MAPREDUCE-3373.patch
Tue Nov 8 02:48:53 2011
@@ -0,0 +1,186 @@
+diff --git hadoop-mapreduce-project/bin/mapred
hadoop-mapreduce-project/bin/mapred
+index e5e9efb..de82a03 100755
+--- hadoop-mapreduce-project/bin/mapred
++++ hadoop-mapreduce-project/bin/mapred
+@@ -19,8 +19,10 @@ bin=`which $0`
+ bin=`dirname ${bin}`
+ bin=`cd "$bin"; pwd`
+
+-if [ -e $bin/../libexec/mapred-config.sh ]; then
+- . $bin/../libexec/mapred-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"/../libexec
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++if [ -e ${HADOOP_LIBEXEC_DIR}/mapred-config.sh ]; then
++ . ${HADOOP_LIBEXEC_DIR}/mapred-config.sh
+ else
+ . "$bin/mapred-config.sh"
+ fi
+diff --git hadoop-mapreduce-project/bin/mapred-config.sh
hadoop-mapreduce-project/bin/mapred-config.sh
+index c79f4fb..d1eb627 100644
+--- hadoop-mapreduce-project/bin/mapred-config.sh
++++ hadoop-mapreduce-project/bin/mapred-config.sh
+@@ -22,8 +22,10 @@ bin=`which "$0"`
+ bin=`dirname "${bin}"`
+ bin=`cd "$bin"; pwd`
+
+-if [ -e "$bin/../libexec/hadoop-config.sh" ]; then
+- . "$bin/../libexec/hadoop-config.sh"
++DEFAULT_LIBEXEC_DIR="$bin"/../libexec
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++if [ -e "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh" ]; then
++ . "${HADOOP_LIBEXEC_DIR}/hadoop-config.sh"
+ elif [ -e "${HADOOP_COMMON_HOME}/libexec/hadoop-config.sh" ]; then
+ . "$HADOOP_COMMON_HOME"/libexec/hadoop-config.sh
+ elif [ -e "${HADOOP_COMMON_HOME}/bin/hadoop-config.sh" ]; then
+diff --git hadoop-mapreduce-project/hadoop-yarn/bin/slaves.sh
hadoop-mapreduce-project/hadoop-yarn/bin/slaves.sh
+index e32a451..ee83477 100644
+--- hadoop-mapreduce-project/hadoop-yarn/bin/slaves.sh
++++ hadoop-mapreduce-project/hadoop-yarn/bin/slaves.sh
+@@ -38,7 +38,9 @@ fi
+ bin=`dirname "${BASH_SOURCE-$0}"`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin"/yarn-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/yarn-config.sh
+
+ # If the slaves file is specified in the command line,
+ # then it takes precedence over the definition in
+diff --git hadoop-mapreduce-project/hadoop-yarn/bin/start-all.sh
hadoop-mapreduce-project/hadoop-yarn/bin/start-all.sh
+index e1a798f..fa4fcf3 100644
+--- hadoop-mapreduce-project/hadoop-yarn/bin/start-all.sh
++++ hadoop-mapreduce-project/hadoop-yarn/bin/start-all.sh
+@@ -23,7 +23,10 @@ echo "starting yarn daemons"
+ bin=`dirname "${BASH_SOURCE-$0}"`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin"/yarn-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/yarn-config.sh
++
+ # start resourceManager
+ "$bin"/yarn-daemon.sh --config $YARN_CONF_DIR start resourcemanager
+ # start nodeManager
+diff --git hadoop-mapreduce-project/hadoop-yarn/bin/stop-all.sh
hadoop-mapreduce-project/hadoop-yarn/bin/stop-all.sh
+index 850af3e..546b67f 100644
+--- hadoop-mapreduce-project/hadoop-yarn/bin/stop-all.sh
++++ hadoop-mapreduce-project/hadoop-yarn/bin/stop-all.sh
+@@ -23,7 +23,10 @@ echo "stopping yarn daemons"
+ bin=`dirname "${BASH_SOURCE-$0}"`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin"/yarn-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/yarn-config.sh
++
+ # stop resourceManager
+ "$bin"/yarn-daemon.sh --config $YARN_CONF_DIR stop resourcemanager
+ # stop nodeManager
+diff --git hadoop-mapreduce-project/hadoop-yarn/bin/yarn
hadoop-mapreduce-project/hadoop-yarn/bin/yarn
+index 059bf10..b11c94b 100644
+--- hadoop-mapreduce-project/hadoop-yarn/bin/yarn
++++ hadoop-mapreduce-project/hadoop-yarn/bin/yarn
+@@ -44,7 +44,9 @@
+ bin=`dirname "${BASH_SOURCE-$0}"`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin"/yarn-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/yarn-config.sh
+
+ cygwin=false
+ case "`uname`" in
+diff --git hadoop-mapreduce-project/hadoop-yarn/bin/yarn-daemon.sh
hadoop-mapreduce-project/hadoop-yarn/bin/yarn-daemon.sh
+index c3d1724..39bb76c 100644
+--- hadoop-mapreduce-project/hadoop-yarn/bin/yarn-daemon.sh
++++ hadoop-mapreduce-project/hadoop-yarn/bin/yarn-daemon.sh
+@@ -39,7 +39,9 @@ fi
+ bin=`dirname "${BASH_SOURCE-$0}"`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin"/yarn-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/yarn-config.sh
+
+ # get arguments
+ startStop=$1
+diff --git hadoop-mapreduce-project/hadoop-yarn/bin/yarn-daemons.sh
hadoop-mapreduce-project/hadoop-yarn/bin/yarn-daemons.sh
+index 4f89a68..e34e4ca 100644
+--- hadoop-mapreduce-project/hadoop-yarn/bin/yarn-daemons.sh
++++ hadoop-mapreduce-project/hadoop-yarn/bin/yarn-daemons.sh
+@@ -30,7 +30,9 @@ fi
+ bin=`dirname "${BASH_SOURCE-$0}"`
+ bin=`cd "$bin"; pwd`
+
+-. $bin/yarn-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/yarn-config.sh
+
+ exec "$bin/slaves.sh" --config $YARN_CONF_DIR cd "$YARN_HOME" \;
"$bin/yarn-daemon.sh" --config $YARN_CONF_DIR "$@"
+
+diff --git
hadoop-mapreduce-project/src/contrib/raid/bin/start-raidnode-remote.sh
hadoop-mapreduce-project/src/contrib/raid/bin/start-raidnode-remote.sh
+index c0aefd3..3e9405e 100644
+--- hadoop-mapreduce-project/src/contrib/raid/bin/start-raidnode-remote.sh
++++ hadoop-mapreduce-project/src/contrib/raid/bin/start-raidnode-remote.sh
+@@ -24,7 +24,9 @@ params=$#
+ bin=`dirname "$0"`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin"/hadoop-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/hadoop-config.sh
+
+ # get arguments
+ if [ $# -ge 1 ]; then
+diff --git hadoop-mapreduce-project/src/contrib/raid/bin/start-raidnode.sh
hadoop-mapreduce-project/src/contrib/raid/bin/start-raidnode.sh
+index 846aa80..d193bb1 100644
+--- hadoop-mapreduce-project/src/contrib/raid/bin/start-raidnode.sh
++++ hadoop-mapreduce-project/src/contrib/raid/bin/start-raidnode.sh
+@@ -25,7 +25,9 @@ params=$#
+ bin=`dirname "$0"`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin"/hadoop-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/hadoop-config.sh
+
+ # get arguments
+ if [ $# -ge 1 ]; then
+diff --git
hadoop-mapreduce-project/src/contrib/raid/bin/stop-raidnode-remote.sh
hadoop-mapreduce-project/src/contrib/raid/bin/stop-raidnode-remote.sh
+index ed870ca..d185629 100644
+--- hadoop-mapreduce-project/src/contrib/raid/bin/stop-raidnode-remote.sh
++++ hadoop-mapreduce-project/src/contrib/raid/bin/stop-raidnode-remote.sh
+@@ -24,7 +24,9 @@ params=$#
+ bin=`dirname "$0"`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin"/hadoop-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/hadoop-config.sh
+
+ # get arguments
+ if [ $# -ge 1 ]; then
+diff --git hadoop-mapreduce-project/src/contrib/raid/bin/stop-raidnode.sh
hadoop-mapreduce-project/src/contrib/raid/bin/stop-raidnode.sh
+index d207e5a..02a61a8 100644
+--- hadoop-mapreduce-project/src/contrib/raid/bin/stop-raidnode.sh
++++ hadoop-mapreduce-project/src/contrib/raid/bin/stop-raidnode.sh
+@@ -25,7 +25,9 @@ params=$#
+ bin=`dirname "$0"`
+ bin=`cd "$bin"; pwd`
+
+-. "$bin"/hadoop-config.sh
++DEFAULT_LIBEXEC_DIR="$bin"
++HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
++. $HADOOP_LIBEXEC_DIR/hadoop-config.sh
+
+ # get arguments
+ if [ $# -ge 1 ]; then
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build?rev=1199077&r1=1199076&r2=1199077&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
Tue Nov 8 02:48:53 2011
@@ -16,17 +16,6 @@
set -ex
-# FIXME: there has to be a better way
-#(wget http://protobuf.googlecode.com/files/protobuf-2.4.1.tar.bz2
-#tar xjvf protobuf-2.4.1.tar.bz2
-#cd protobuf-2.4.1
-#./configure --prefix=`pwd`/root
-#make install)
-
-#PATH=`pwd`/protobuf-2.4.1/root/bin:$PATH
-#export PATH
-
-
mkdir build
mkdir build/src
@@ -35,7 +24,7 @@ mvn -Pdist -Pnative -Psrc -Dtar ${MAVEN_
mvn install ${MAVEN_SKIP_TESTS} $@
mvn site site:stage ${MAVEN_SKIP_TESTS} $@
-(cd build ; tar --strip-components=1 -xzvf
../hadoop-dist/target/hadoop-0.23.0-SNAPSHOT-bin.tar.gz)
+(cd build ; tar --strip-components=1 -xzvf
../hadoop-dist/target/hadoop-0.23.0-SNAPSHOT.tar.gz)
(cd build/src ; tar --strip-components=1 -xzvf
../../hadoop-dist/target/hadoop-0.23.0-SNAPSHOT-src.tar.gz)
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.default
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.default?rev=1199077&r1=1199076&r2=1199077&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.default
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.default
Tue Nov 8 02:48:53 2011
@@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
export HADOOP_HOME_WARN_SUPPRESS=true
-export HADOOP_HOME=/usr/lib/hadoop
export HADOOP_PREFIX=/usr/lib/hadoop
export HADOOP_LIBEXEC_DIR=/usr/libexec
export HADOOP_NAMENODE_USER=hdfs
@@ -25,4 +24,5 @@ export HADOOP_IDENT_STRING=hadoop
export HADOOP_PID_DIR=/var/run/hadoop
export HADOOP_LOG_DIR=/var/log/hadoop
export HADOOP_CONF_DIR=/etc/hadoop/conf
+export YARN_CONF_DIR=/etc/yarn/conf
export
HADOOP_CLASSPATH="${HADOOP_CLASSPATH}:${HADOOP_PREFIX}/*:${HADOOP_PREFIX}/lib/*"
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh?rev=1199077&r1=1199076&r2=1199077&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
Tue Nov 8 02:48:53 2011
@@ -179,6 +179,11 @@ cp ${BUILD_DIR}/share/hadoop/common/lib/
cp ${BUILD_DIR}/share/hadoop/hdfs/lib/*.jar ${HADOOP_LIB_DIR}/
chmod 644 ${HADOOP_LIB_DIR}/*.jar
+# Remove duplicate libraries:
+rm -fv ${HADOOP_LIB_DIR}/slf4j-*-1.5.11.jar
+rm -fv ${HADOOP_LIB_DIR}/stax-api-1.0.1.jar
+rm -fv ${HADOOP_LIB_DIR}/netty-3.2.3.Final.jar
+
# hadoop jar
install -d -m 0755 ${HADOOP_DIR}
cp ${BUILD_DIR}/modules/*.jar ${HADOOP_DIR}/
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1199077&r1=1199076&r2=1199077&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
Tue Nov 8 02:48:53 2011
@@ -25,6 +25,7 @@
%define etc_hadoop /etc/%{name}
%define etc_yarn /etc/yarn
%define config_hadoop %{etc_hadoop}/conf
+%define config_yarn %{etc_yarn}/conf
%define lib_hadoop_dirname /usr/lib
%define lib_hadoop %{lib_hadoop_dirname}/%{name}
%define log_hadoop_dirname /var/log
@@ -125,6 +126,10 @@ Source9: hadoop.nofiles.conf
Patch0: HADOOP-7787.patch
Patch1: HADOOP-7801.patch
Patch2: HADOOP-7802.patch
+Patch3: MAPREDUCE-3372.patch
+Patch4: HDFS-2543.patch
+Patch5: MAPREDUCE-3373.patch
+Patch6: HDFS-2544.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python >= 2.4, git, fuse-devel,fuse, automake, autoconf
Requires: coreutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig,
/sbin/service, bigtop-utils
@@ -272,6 +277,10 @@ before continuing operation.
%patch0
%patch1
%patch2
+%patch3
+%patch4
+%patch5
+%patch6
%build
# This assumes that you installed Java JDK 6 and set JAVA_HOME
@@ -365,12 +374,15 @@ getent passwd hdfs >/dev/null || /usr/sb
%post
%{alternatives_cmd} --install %{config_hadoop} %{name}-conf
%{etc_hadoop}/conf.empty 10
+%{alternatives_cmd} --install %{config_yarn} yarn-conf %{etc_yarn}/conf.empty
10
%{alternatives_cmd} --install %{bin_hadoop}/%{hadoop_name}
%{hadoop_name}-default %{bin_hadoop}/%{name} 20 \
--slave %{log_hadoop_dirname}/%{hadoop_name} %{hadoop_name}-log
%{log_hadoop} \
--slave %{lib_hadoop_dirname}/%{hadoop_name} %{hadoop_name}-lib
%{lib_hadoop} \
--slave /etc/%{hadoop_name} %{hadoop_name}-etc %{etc_hadoop} \
--slave %{man_hadoop}/man1/%{hadoop_name}.1.*z %{hadoop_name}-man
%{man_hadoop}/man1/%{name}.1.*z
+mkdir -p /var/lib/hadoop/cache/hadoop || :
+chown hdfs:hadoop /var/lib/hadoop/cache/hadoop || :
chmod g+w /var/lib/hadoop/cache/hadoop/
mkdir -p /var/log/hadoop || :
touch /var/log/hadoop/SecurityAuth.audit
@@ -429,7 +441,7 @@ if [ $1 -ge 1 ]; then \
service %{name}-%1 condrestart >/dev/null 2>&1 \
fi
-%service_macro namenode post_namenode
+%service_macro namenode
%service_macro secondarynamenode
%service_macro datanode
%service_macro jobtracker
