hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gkesa...@apache.org
Subject svn commit: r1152037 - /hadoop/common/branches/branch-0.20-security-204/bin/
Date Thu, 28 Jul 2011 23:39:44 GMT
Author: gkesavan
Date: Thu Jul 28 23:39:42 2011
New Revision: 1152037

URL: http://svn.apache.org/viewvc?rev=1152037&view=rev
Log:
HADOOP-7356. Fix bin scripts to support dev build environment

Modified:
    hadoop/common/branches/branch-0.20-security-204/bin/hadoop
    hadoop/common/branches/branch-0.20-security-204/bin/hadoop-daemon.sh
    hadoop/common/branches/branch-0.20-security-204/bin/hadoop-daemons.sh
    hadoop/common/branches/branch-0.20-security-204/bin/rcc
    hadoop/common/branches/branch-0.20-security-204/bin/slaves.sh
    hadoop/common/branches/branch-0.20-security-204/bin/start-all.sh
    hadoop/common/branches/branch-0.20-security-204/bin/start-balancer.sh
    hadoop/common/branches/branch-0.20-security-204/bin/start-dfs.sh
    hadoop/common/branches/branch-0.20-security-204/bin/start-jobhistoryserver.sh
    hadoop/common/branches/branch-0.20-security-204/bin/start-mapred.sh
    hadoop/common/branches/branch-0.20-security-204/bin/stop-all.sh
    hadoop/common/branches/branch-0.20-security-204/bin/stop-balancer.sh
    hadoop/common/branches/branch-0.20-security-204/bin/stop-dfs.sh
    hadoop/common/branches/branch-0.20-security-204/bin/stop-jobhistoryserver.sh
    hadoop/common/branches/branch-0.20-security-204/bin/stop-mapred.sh

Modified: hadoop/common/branches/branch-0.20-security-204/bin/hadoop
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/bin/hadoop?rev=1152037&r1=1152036&r2=1152037&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/bin/hadoop (original)
+++ hadoop/common/branches/branch-0.20-security-204/bin/hadoop Thu Jul 28 23:39:42 2011
@@ -50,7 +50,11 @@
 bin=`dirname "$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
 
 cygwin=false
 case "`uname`" in

Modified: hadoop/common/branches/branch-0.20-security-204/bin/hadoop-daemon.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/bin/hadoop-daemon.sh?rev=1152037&r1=1152036&r2=1152037&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/bin/hadoop-daemon.sh (original)
+++ hadoop/common/branches/branch-0.20-security-204/bin/hadoop-daemon.sh Thu Jul 28 23:39:42
2011
@@ -39,7 +39,11 @@ fi
 bin=`dirname "$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
 startStop=$1

Modified: hadoop/common/branches/branch-0.20-security-204/bin/hadoop-daemons.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/bin/hadoop-daemons.sh?rev=1152037&r1=1152036&r2=1152037&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/bin/hadoop-daemons.sh (original)
+++ hadoop/common/branches/branch-0.20-security-204/bin/hadoop-daemons.sh Thu Jul 28 23:39:42
2011
@@ -29,6 +29,10 @@ fi
 bin=`dirname "$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_HOME" \; "$bin/hadoop-daemon.sh"
--config $HADOOP_CONF_DIR "$@"

Modified: hadoop/common/branches/branch-0.20-security-204/bin/rcc
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/bin/rcc?rev=1152037&r1=1152036&r2=1152037&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/bin/rcc (original)
+++ hadoop/common/branches/branch-0.20-security-204/bin/rcc Thu Jul 28 23:39:42 2011
@@ -30,7 +30,11 @@
 bin=`dirname "$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/branches/branch-0.20-security-204/bin/slaves.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/bin/slaves.sh?rev=1152037&r1=1152036&r2=1152037&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/bin/slaves.sh (original)
+++ hadoop/common/branches/branch-0.20-security-204/bin/slaves.sh Thu Jul 28 23:39:42 2011
@@ -38,7 +38,11 @@ fi
 bin=`dirname "$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 the slaves file is specified in the command line,
 # then it takes precedence over the definition in 

Modified: hadoop/common/branches/branch-0.20-security-204/bin/start-all.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/bin/start-all.sh?rev=1152037&r1=1152036&r2=1152037&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/bin/start-all.sh (original)
+++ hadoop/common/branches/branch-0.20-security-204/bin/start-all.sh Thu Jul 28 23:39:42 2011
@@ -21,7 +21,11 @@
 bin=`dirname "$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 dfs daemons
 "$bin"/start-dfs.sh --config $HADOOP_CONF_DIR

Modified: hadoop/common/branches/branch-0.20-security-204/bin/start-balancer.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/bin/start-balancer.sh?rev=1152037&r1=1152036&r2=1152037&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/bin/start-balancer.sh (original)
+++ hadoop/common/branches/branch-0.20-security-204/bin/start-balancer.sh Thu Jul 28 23:39:42
2011
@@ -18,7 +18,11 @@
 bin=`dirname "$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 balancer daemon.
 

Modified: hadoop/common/branches/branch-0.20-security-204/bin/start-dfs.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/bin/start-dfs.sh?rev=1152037&r1=1152036&r2=1152037&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/bin/start-dfs.sh (original)
+++ hadoop/common/branches/branch-0.20-security-204/bin/start-dfs.sh Thu Jul 28 23:39:42 2011
@@ -25,7 +25,11 @@ usage="Usage: start-dfs.sh [-upgrade|-ro
 bin=`dirname "$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
 if [ $# -ge 1 ]; then

Modified: hadoop/common/branches/branch-0.20-security-204/bin/start-jobhistoryserver.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/bin/start-jobhistoryserver.sh?rev=1152037&r1=1152036&r2=1152037&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/bin/start-jobhistoryserver.sh (original)
+++ hadoop/common/branches/branch-0.20-security-204/bin/start-jobhistoryserver.sh Thu Jul
28 23:39:42 2011
@@ -21,7 +21,11 @@
 bin=`dirname "$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 daemon
 "$bin"/hadoop-daemon.sh --config $HADOOP_CONF_DIR start historyserver

Modified: hadoop/common/branches/branch-0.20-security-204/bin/start-mapred.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/bin/start-mapred.sh?rev=1152037&r1=1152036&r2=1152037&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/bin/start-mapred.sh (original)
+++ hadoop/common/branches/branch-0.20-security-204/bin/start-mapred.sh Thu Jul 28 23:39:42
2011
@@ -21,7 +21,11 @@
 bin=`dirname "$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 mapred daemons
 # start jobtracker first to minimize connection errors at startup

Modified: hadoop/common/branches/branch-0.20-security-204/bin/stop-all.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/bin/stop-all.sh?rev=1152037&r1=1152036&r2=1152037&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/bin/stop-all.sh (original)
+++ hadoop/common/branches/branch-0.20-security-204/bin/stop-all.sh Thu Jul 28 23:39:42 2011
@@ -21,7 +21,11 @@
 bin=`dirname "$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
 
 "$bin"/stop-mapred.sh --config $HADOOP_CONF_DIR
 "$bin"/stop-dfs.sh --config $HADOOP_CONF_DIR

Modified: hadoop/common/branches/branch-0.20-security-204/bin/stop-balancer.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/bin/stop-balancer.sh?rev=1152037&r1=1152036&r2=1152037&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/bin/stop-balancer.sh (original)
+++ hadoop/common/branches/branch-0.20-security-204/bin/stop-balancer.sh Thu Jul 28 23:39:42
2011
@@ -18,7 +18,11 @@
 bin=`dirname "$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 balancer daemon.
 # Run this on the machine where the balancer is running

Modified: hadoop/common/branches/branch-0.20-security-204/bin/stop-dfs.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/bin/stop-dfs.sh?rev=1152037&r1=1152036&r2=1152037&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/bin/stop-dfs.sh (original)
+++ hadoop/common/branches/branch-0.20-security-204/bin/stop-dfs.sh Thu Jul 28 23:39:42 2011
@@ -21,7 +21,11 @@
 bin=`dirname "$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
 
 "$bin"/hadoop-daemon.sh --config $HADOOP_CONF_DIR stop namenode
 "$bin"/hadoop-daemons.sh --config $HADOOP_CONF_DIR stop datanode

Modified: hadoop/common/branches/branch-0.20-security-204/bin/stop-jobhistoryserver.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/bin/stop-jobhistoryserver.sh?rev=1152037&r1=1152036&r2=1152037&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/bin/stop-jobhistoryserver.sh (original)
+++ hadoop/common/branches/branch-0.20-security-204/bin/stop-jobhistoryserver.sh Thu Jul 28
23:39:42 2011
@@ -21,7 +21,11 @@
 bin=`dirname "$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
 
 "$bin"/hadoop-daemon.sh --config $HADOOP_CONF_DIR stop historyserver
 

Modified: hadoop/common/branches/branch-0.20-security-204/bin/stop-mapred.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-204/bin/stop-mapred.sh?rev=1152037&r1=1152036&r2=1152037&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-204/bin/stop-mapred.sh (original)
+++ hadoop/common/branches/branch-0.20-security-204/bin/stop-mapred.sh Thu Jul 28 23:39:42
2011
@@ -21,7 +21,11 @@
 bin=`dirname "$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
 
 "$bin"/hadoop-daemon.sh --config $HADOOP_CONF_DIR stop jobtracker
 "$bin"/hadoop-daemons.sh --config $HADOOP_CONF_DIR stop tasktracker



Mime
View raw message