hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tomwh...@apache.org
Subject svn commit: r1203455 - in /hadoop/common/trunk/hadoop-mapreduce-project: ./ bin/ hadoop-yarn/bin/ src/contrib/raid/bin/
Date Fri, 18 Nov 2011 00:57:09 GMT
Author: tomwhite
Date: Fri Nov 18 00:57:08 2011
New Revision: 1203455

URL: http://svn.apache.org/viewvc?rev=1203455&view=rev
Log:
MAPREDUCE-3373. Hadoop scripts unconditionally source "$bin"/../libexec/hadoop-config.sh.
Contributed by Bruno Mahé

Modified:
    hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
    hadoop/common/trunk/hadoop-mapreduce-project/bin/mapred
    hadoop/common/trunk/hadoop-mapreduce-project/bin/mapred-config.sh
    hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/slaves.sh
    hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/start-all.sh
    hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/stop-all.sh
    hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/yarn
    hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/yarn-daemon.sh
    hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/yarn-daemons.sh
    hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/raid/bin/start-raidnode-remote.sh
    hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/raid/bin/start-raidnode.sh
    hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/raid/bin/stop-raidnode-remote.sh
    hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/raid/bin/stop-raidnode.sh

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1203455&r1=1203454&r2=1203455&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Fri Nov 18 00:57:08 2011
@@ -100,6 +100,9 @@ Release 0.23.1 - Unreleased
     MAPREDUCE-3102. Changed NodeManager to fail fast when LinuxContainerExecutor
     has wrong configuration or permissions. (Hitesh Shah via vinodkv)
 
+    MAPREDUCE-3373. Hadoop scripts unconditionally source
+    "$bin"/../libexec/hadoop-config.sh. (Bruno Mahé via tomwhite)
+
   OPTIMIZATIONS
 
   BUG FIXES

Modified: hadoop/common/trunk/hadoop-mapreduce-project/bin/mapred
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/bin/mapred?rev=1203455&r1=1203454&r2=1203455&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/bin/mapred (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/bin/mapred Fri Nov 18 00:57:08 2011
@@ -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

Modified: hadoop/common/trunk/hadoop-mapreduce-project/bin/mapred-config.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/bin/mapred-config.sh?rev=1203455&r1=1203454&r2=1203455&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/bin/mapred-config.sh (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/bin/mapred-config.sh Fri Nov 18 00:57:08
2011
@@ -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

Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/slaves.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/slaves.sh?rev=1203455&r1=1203454&r2=1203455&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/slaves.sh (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/slaves.sh Fri Nov 18 00:57:08
2011
@@ -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 

Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/start-all.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/start-all.sh?rev=1203455&r1=1203454&r2=1203455&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/start-all.sh (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/start-all.sh Fri Nov 18 00:57:08
2011
@@ -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

Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/stop-all.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/stop-all.sh?rev=1203455&r1=1203454&r2=1203455&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/stop-all.sh (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/stop-all.sh Fri Nov 18 00:57:08
2011
@@ -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

Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/yarn
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/yarn?rev=1203455&r1=1203454&r2=1203455&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/yarn (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/yarn Fri Nov 18 00:57:08
2011
@@ -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

Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/yarn-daemon.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/yarn-daemon.sh?rev=1203455&r1=1203454&r2=1203455&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/yarn-daemon.sh (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/yarn-daemon.sh Fri Nov 18
00:57:08 2011
@@ -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

Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/yarn-daemons.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/yarn-daemons.sh?rev=1203455&r1=1203454&r2=1203455&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/yarn-daemons.sh (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/yarn-daemons.sh Fri Nov 18
00:57:08 2011
@@ -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 "$@"
 

Modified: hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/raid/bin/start-raidnode-remote.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/raid/bin/start-raidnode-remote.sh?rev=1203455&r1=1203454&r2=1203455&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/raid/bin/start-raidnode-remote.sh
(original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/raid/bin/start-raidnode-remote.sh
Fri Nov 18 00:57:08 2011
@@ -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

Modified: hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/raid/bin/start-raidnode.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/raid/bin/start-raidnode.sh?rev=1203455&r1=1203454&r2=1203455&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/raid/bin/start-raidnode.sh (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/raid/bin/start-raidnode.sh Fri
Nov 18 00:57:08 2011
@@ -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: hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/raid/bin/stop-raidnode-remote.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/raid/bin/stop-raidnode-remote.sh?rev=1203455&r1=1203454&r2=1203455&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/raid/bin/stop-raidnode-remote.sh
(original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/raid/bin/stop-raidnode-remote.sh
Fri Nov 18 00:57:08 2011
@@ -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

Modified: hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/raid/bin/stop-raidnode.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/raid/bin/stop-raidnode.sh?rev=1203455&r1=1203454&r2=1203455&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/raid/bin/stop-raidnode.sh (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/raid/bin/stop-raidnode.sh Fri
Nov 18 00:57:08 2011
@@ -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



Mime
View raw message