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 2010/04/30 01:23:53 UTC
svn commit: r939510 - in /hadoop/common/trunk: ./ bin/
Author: tomwhite
Date: Thu Apr 29 23:23:53 2010
New Revision: 939510
URL: http://svn.apache.org/viewvc?rev=939510&view=rev
Log:
HADOOP-6630. hadoop-config.sh fails to get executed if hadoop wrapper scripts are in path. Contributed by Allen Wittenauer.
Modified:
hadoop/common/trunk/CHANGES.txt
hadoop/common/trunk/bin/hadoop-config.sh
hadoop/common/trunk/bin/hadoop-daemon.sh
hadoop/common/trunk/bin/hadoop-daemons.sh
hadoop/common/trunk/bin/rcc
hadoop/common/trunk/bin/slaves.sh
hadoop/common/trunk/bin/start-all.sh
hadoop/common/trunk/bin/start-balancer.sh
hadoop/common/trunk/bin/start-dfs.sh
hadoop/common/trunk/bin/start-mapred.sh
hadoop/common/trunk/bin/stop-all.sh
hadoop/common/trunk/bin/stop-balancer.sh
hadoop/common/trunk/bin/stop-dfs.sh
hadoop/common/trunk/bin/stop-mapred.sh
Modified: hadoop/common/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=939510&r1=939509&r2=939510&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Thu Apr 29 23:23:53 2010
@@ -382,6 +382,9 @@ Trunk (unreleased changes)
HADOOP-6709. Re-instate deprecated FileSystem methods that were removed
after 0.20. (tomwhite)
+ HADOOP-6630. hadoop-config.sh fails to get executed if hadoop wrapper
+ scripts are in path. (Allen Wittenauer via tomwhite)
+
Release 0.21.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/common/trunk/bin/hadoop-config.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/hadoop-config.sh?rev=939510&r1=939509&r2=939510&view=diff
==============================================================================
--- hadoop/common/trunk/bin/hadoop-config.sh (original)
+++ hadoop/common/trunk/bin/hadoop-config.sh Thu Apr 29 23:23:53 2010
@@ -19,7 +19,7 @@
# resolve links - $0 may be a softlink
-this="$0"
+this="${BASH_SOURCE-$0}"
while [ -h "$this" ]; do
ls=`ls -ld "$this"`
link=`expr "$ls" : '.*-> \(.*\)$'`
Modified: hadoop/common/trunk/bin/hadoop-daemon.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/hadoop-daemon.sh?rev=939510&r1=939509&r2=939510&view=diff
==============================================================================
--- hadoop/common/trunk/bin/hadoop-daemon.sh (original)
+++ hadoop/common/trunk/bin/hadoop-daemon.sh Thu Apr 29 23:23:53 2010
@@ -36,7 +36,7 @@ if [ $# -le 1 ]; then
exit 1
fi
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
. "$bin"/hadoop-config.sh
Modified: hadoop/common/trunk/bin/hadoop-daemons.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/hadoop-daemons.sh?rev=939510&r1=939509&r2=939510&view=diff
==============================================================================
--- hadoop/common/trunk/bin/hadoop-daemons.sh (original)
+++ hadoop/common/trunk/bin/hadoop-daemons.sh Thu Apr 29 23:23:53 2010
@@ -26,7 +26,7 @@ if [ $# -le 1 ]; then
exit 1
fi
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
. $bin/hadoop-config.sh
Modified: hadoop/common/trunk/bin/rcc
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/rcc?rev=939510&r1=939509&r2=939510&view=diff
==============================================================================
--- hadoop/common/trunk/bin/rcc (original)
+++ hadoop/common/trunk/bin/rcc Thu Apr 29 23:23:53 2010
@@ -27,7 +27,7 @@
# HADOOP_CONF_DIR Alternate conf dir. Default is ${HADOOP_HOME}/conf.
#
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
. "$bin"/hadoop-config.sh
Modified: hadoop/common/trunk/bin/slaves.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/slaves.sh?rev=939510&r1=939509&r2=939510&view=diff
==============================================================================
--- hadoop/common/trunk/bin/slaves.sh (original)
+++ hadoop/common/trunk/bin/slaves.sh Thu Apr 29 23:23:53 2010
@@ -35,7 +35,7 @@ if [ $# -le 0 ]; then
exit 1
fi
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
. "$bin"/hadoop-config.sh
Modified: hadoop/common/trunk/bin/start-all.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/start-all.sh?rev=939510&r1=939509&r2=939510&view=diff
==============================================================================
--- hadoop/common/trunk/bin/start-all.sh (original)
+++ hadoop/common/trunk/bin/start-all.sh Thu Apr 29 23:23:53 2010
@@ -20,7 +20,7 @@
echo "This script is Deprecated. Instead use start-dfs.sh and start-mapred.sh"
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
. "$bin"/hadoop-config.sh
Modified: hadoop/common/trunk/bin/start-balancer.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/start-balancer.sh?rev=939510&r1=939509&r2=939510&view=diff
==============================================================================
--- hadoop/common/trunk/bin/start-balancer.sh (original)
+++ hadoop/common/trunk/bin/start-balancer.sh Thu Apr 29 23:23:53 2010
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
. "$bin"/hdfs-config.sh
Modified: hadoop/common/trunk/bin/start-dfs.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/start-dfs.sh?rev=939510&r1=939509&r2=939510&view=diff
==============================================================================
--- hadoop/common/trunk/bin/start-dfs.sh (original)
+++ hadoop/common/trunk/bin/start-dfs.sh Thu Apr 29 23:23:53 2010
@@ -22,7 +22,7 @@
usage="Usage: start-dfs.sh [-upgrade|-rollback]"
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
. "$bin"/hdfs-config.sh
Modified: hadoop/common/trunk/bin/start-mapred.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/start-mapred.sh?rev=939510&r1=939509&r2=939510&view=diff
==============================================================================
--- hadoop/common/trunk/bin/start-mapred.sh (original)
+++ hadoop/common/trunk/bin/start-mapred.sh Thu Apr 29 23:23:53 2010
@@ -18,7 +18,7 @@
# Start hadoop map reduce daemons. Run this on master node.
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
. $bin/mapred-config.sh
Modified: hadoop/common/trunk/bin/stop-all.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/stop-all.sh?rev=939510&r1=939509&r2=939510&view=diff
==============================================================================
--- hadoop/common/trunk/bin/stop-all.sh (original)
+++ hadoop/common/trunk/bin/stop-all.sh Thu Apr 29 23:23:53 2010
@@ -20,7 +20,7 @@
echo "This script is Deprecated. Instead use stop-dfs.sh and stop-mapred.sh"
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
. "$bin"/hadoop-config.sh
Modified: hadoop/common/trunk/bin/stop-balancer.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/stop-balancer.sh?rev=939510&r1=939509&r2=939510&view=diff
==============================================================================
--- hadoop/common/trunk/bin/stop-balancer.sh (original)
+++ hadoop/common/trunk/bin/stop-balancer.sh Thu Apr 29 23:23:53 2010
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
. "$bin"/hdfs-config.sh
Modified: hadoop/common/trunk/bin/stop-dfs.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/stop-dfs.sh?rev=939510&r1=939509&r2=939510&view=diff
==============================================================================
--- hadoop/common/trunk/bin/stop-dfs.sh (original)
+++ hadoop/common/trunk/bin/stop-dfs.sh Thu Apr 29 23:23:53 2010
@@ -18,7 +18,7 @@
# Stop hadoop DFS daemons. Run this on master node.
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
. "$bin"/hdfs-config.sh
Modified: hadoop/common/trunk/bin/stop-mapred.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/stop-mapred.sh?rev=939510&r1=939509&r2=939510&view=diff
==============================================================================
--- hadoop/common/trunk/bin/stop-mapred.sh (original)
+++ hadoop/common/trunk/bin/stop-mapred.sh Thu Apr 29 23:23:53 2010
@@ -18,7 +18,7 @@
# Stop hadoop map reduce daemons. Run this on master node.
-bin=`dirname "$0"`
+bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
. $bin/mapred-config.sh