svn commit: r1150914 - in /hadoop/common/trunk/common: CHANGES.txt bin/hadoop-daemon.sh

[suresh]

Author: suresh
Date: Mon Jul 25 21:12:18 2011
New Revision: 1150914

URL: http://svn.apache.org/viewvc?rev=1150914&view=rev
Log:
HADOOP-7438. Fix deprecated warnings from hadoop-daemon.sh script. Contributed 
by Ravi Prakash.

Modified:
    hadoop/common/trunk/common/CHANGES.txt
    hadoop/common/trunk/common/bin/hadoop-daemon.sh

Modified: hadoop/common/trunk/common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/common/CHANGES.txt?rev=1150914&r1=1150913&r2=1150914&view=diff
==============================================================================
--- hadoop/common/trunk/common/CHANGES.txt (original)
+++ hadoop/common/trunk/common/CHANGES.txt Mon Jul 25 21:12:18 2011
@@ -350,7 +350,8 @@ Trunk (unreleased changes)
     HADOOP-7268. FileContext.getLocalFSFileContext() behavior needs to be fixed
     w.r.t tokens. (jitendra)
 
-    HADOOP-7290. Unit test failure in 
TestUserGroupInformation.testGetServerSideGroups. (Trevor Robison via eli)
+    HADOOP-7290. Unit test failure in 
+    TestUserGroupInformation.testGetServerSideGroups. (Trevor Robison via eli)
 
     HADOOP-7292. Fix racy test case TestSinkQueue. (Luke Lu via todd)
 
@@ -416,6 +417,9 @@ Trunk (unreleased changes)
     HADOOP-7111. Several TFile tests failing when native libraries are
     present. (atm)
 
+    HADOOP-7438. Fix deprecated warnings from hadoop-daemon.sh script.
+    (Ravi Prakash via suresh)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/trunk/common/bin/hadoop-daemon.sh
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/common/bin/hadoop-daemon.sh?rev=1150914&r1=1150913&r2=1150914&view=diff
==============================================================================
--- hadoop/common/trunk/common/bin/hadoop-daemon.sh (original)
+++ hadoop/common/trunk/common/bin/hadoop-daemon.sh Mon Jul 25 21:12:18 2011
@@ -137,7 +137,19 @@ case $startStop in
     hadoop_rotate_log $log
     echo starting $command, logging to $log
     cd "$HADOOP_PREFIX"
-    nohup nice -n $HADOOP_NICENESS $hadoopScript --config $HADOOP_CONF_DIR 
$command "$@" > "$log" 2>&1 < /dev/null &
+    case $command in
+      namenode|secondarynamenode|datanode|dfs|dfsadmin|fsck|balancer)
+        if [ -z "$HADOOP_HDFS_HOME" ]; then
+          hdfsScript="$HADOOP_PREFIX"/bin/hdfs
+        else
+          hdfsScript="$HADOOP_HDFS_HOME"/bin/hdfs
+        fi
+        nohup nice -n $HADOOP_NICENESS $hdfsScript --config $HADOOP_CONF_DIR 
$command "$@" > "$log" 2>&1 < /dev/null &
+      ;;
+      (*)
+        nohup nice -n $HADOOP_NICENESS $hadoopScript --config $HADOOP_CONF_DIR 
$command "$@" > "$log" 2>&1 < /dev/null &
+      ;;
+    esac
     echo $! > $pid
     sleep 1; head "$log"
     sleep 3;