Merging r1130833 for HADOOP-7331 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/yahoo-merge@1130879 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -86,6 +86,9 @@ Trunk (unreleased changes)
     HADOOP-7001.  Configuration changes can occur via the Reconfigurable
     interface. (Patrick Kline via dhruba)
 
+    HADOOP-7331. Make hadoop-daemon.sh return exit code 1 if daemon processes
+    did not get started. (Tanping Wang via todd)
+
   OPTIMIZATIONS
 
   BUG FIXES

bin/hadoop-daemon.sh

@@ -135,6 +135,10 @@ case $startStop in
     nohup nice -n $HADOOP_NICENESS $hadoopScript --config $HADOOP_CONF_DIR $command "$@" > "$log" 2>&1 < /dev/null &
     echo $! > $pid
     sleep 1; head "$log"
+    sleep 3;
+    if ! ps -p $! > /dev/null ; then
+      exit 1
+    fi
     ;;
           
   (stop)
@@ -145,9 +149,11 @@ case $startStop in
         kill `cat $pid`
       else
         echo no $command to stop
+        exit 1
       fi
     else
       echo no $command to stop
+      exit 1
     fi
     ;;