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 2011/06/06 23:15:42 UTC
svn commit: r1132776 - in /hadoop/common/trunk: CHANGES.txt bin/hadoop
bin/hadoop-daemon.sh bin/hadoop-daemons.sh bin/slaves.sh bin/start-all.sh
bin/stop-all.sh
Author: todd
Date: Mon Jun 6 21:15:42 2011
New Revision: 1132776
URL: http://svn.apache.org/viewvc?rev=1132776&view=rev
Log:
HADOOP-7356. RPM packages broke bin/hadoop script in developer environment. Contributed by Eric Yang.
Modified:
hadoop/common/trunk/CHANGES.txt
hadoop/common/trunk/bin/hadoop
hadoop/common/trunk/bin/hadoop-daemon.sh
hadoop/common/trunk/bin/hadoop-daemons.sh
hadoop/common/trunk/bin/slaves.sh
hadoop/common/trunk/bin/start-all.sh
hadoop/common/trunk/bin/stop-all.sh
Modified: hadoop/common/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=1132776&r1=1132775&r2=1132776&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Mon Jun 6 21:15:42 2011
@@ -283,6 +283,9 @@ Trunk (unreleased changes)
HADOOP-7353. Cleanup FsShell and prevent masking of RTE stack traces.
(Daryn Sharp via todd)
+ HADOOP-7356. RPM packages broke bin/hadoop script in developer environment.
+ (Eric Yang via todd)
+
Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/common/trunk/bin/hadoop
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/hadoop?rev=1132776&r1=1132775&r2=1132776&view=diff
==============================================================================
--- hadoop/common/trunk/bin/hadoop (original)
+++ hadoop/common/trunk/bin/hadoop Mon Jun 6 21:15:42 2011
@@ -21,7 +21,11 @@ bin=`which $0`
bin=`dirname ${bin}`
bin=`cd "$bin"; pwd`
-. "$bin"/../libexec/hadoop-config.sh
+if [ -e "$bin/../libexec/hadoop-config.sh" ]; then
+ . "$bin"/../libexec/hadoop-config.sh
+else
+ . "$bin"/hadoop-config.sh
+fi
function print_usage(){
echo "Usage: hadoop [--config confdir] COMMAND"
Modified: hadoop/common/trunk/bin/hadoop-daemon.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/hadoop-daemon.sh?rev=1132776&r1=1132775&r2=1132776&view=diff
==============================================================================
--- hadoop/common/trunk/bin/hadoop-daemon.sh (original)
+++ hadoop/common/trunk/bin/hadoop-daemon.sh Mon Jun 6 21:15:42 2011
@@ -39,7 +39,11 @@ fi
bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
-. "$bin"/../libexec/hadoop-config.sh
+if [ -e "$bin/../libexec/hadoop-config.sh" ]; then
+ . "$bin"/../libexec/hadoop-config.sh
+else
+ . "$bin"/hadoop-config.sh
+fi
# get arguments
Modified: hadoop/common/trunk/bin/hadoop-daemons.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/hadoop-daemons.sh?rev=1132776&r1=1132775&r2=1132776&view=diff
==============================================================================
--- hadoop/common/trunk/bin/hadoop-daemons.sh (original)
+++ hadoop/common/trunk/bin/hadoop-daemons.sh Mon Jun 6 21:15:42 2011
@@ -29,6 +29,10 @@ fi
bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
-. $bin/../libexec/hadoop-config.sh
+if [ -e "$bin/../libexec/hadoop-config.sh" ]; then
+ . "$bin"/../libexec/hadoop-config.sh
+else
+ . "$bin"/hadoop-config.sh
+fi
exec "$bin/slaves.sh" --config $HADOOP_CONF_DIR cd "$HADOOP_PREFIX" \; "$bin/hadoop-daemon.sh" --config $HADOOP_CONF_DIR "$@"
Modified: hadoop/common/trunk/bin/slaves.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/slaves.sh?rev=1132776&r1=1132775&r2=1132776&view=diff
==============================================================================
--- hadoop/common/trunk/bin/slaves.sh (original)
+++ hadoop/common/trunk/bin/slaves.sh Mon Jun 6 21:15:42 2011
@@ -38,7 +38,11 @@ fi
bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
-. "$bin"/../libexec/hadoop-config.sh
+if [ -e "$bin/../libexec/hadoop-config.sh" ]; then
+ . "$bin"/../libexec/hadoop-config.sh
+else
+ . "$bin"/hadoop-config.sh
+fi
if [ -f "${HADOOP_CONF_DIR}/hadoop-env.sh" ]; then
. "${HADOOP_CONF_DIR}/hadoop-env.sh"
Modified: hadoop/common/trunk/bin/start-all.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/start-all.sh?rev=1132776&r1=1132775&r2=1132776&view=diff
==============================================================================
--- hadoop/common/trunk/bin/start-all.sh (original)
+++ hadoop/common/trunk/bin/start-all.sh Mon Jun 6 21:15:42 2011
@@ -23,7 +23,11 @@ echo "This script is Deprecated. Instead
bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
-. "$bin"/../libexec/hadoop-config.sh
+if [ -e "$bin/../libexec/hadoop-config.sh" ]; then
+ . "$bin"/../libexec/hadoop-config.sh
+else
+ . "$bin"/hadoop-config.sh
+fi
# start hdfs daemons if hdfs is present
if [ -f "${HADOOP_HDFS_HOME}"/bin/start-dfs.sh ]; then
Modified: hadoop/common/trunk/bin/stop-all.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/bin/stop-all.sh?rev=1132776&r1=1132775&r2=1132776&view=diff
==============================================================================
--- hadoop/common/trunk/bin/stop-all.sh (original)
+++ hadoop/common/trunk/bin/stop-all.sh Mon Jun 6 21:15:42 2011
@@ -23,7 +23,11 @@ echo "This script is Deprecated. Instead
bin=`dirname "${BASH_SOURCE-$0}"`
bin=`cd "$bin"; pwd`
-. "$bin"/../libexec/hadoop-config.sh
+if [ -e "$bin/../libexec/hadoop-config.sh" ]; then
+ . "$bin"/../libexec/hadoop-config.sh
+else
+ . "$bin"/hadoop-config.sh
+fi
# stop hdfs daemons if hdfs is present
if [ -f "${HADOOP_HDFS_HOME}"/bin/stop-dfs.sh ]; then