ソースを参照

HADOOP-7331. Make hadoop-daemon.sh return exit code 1 if daemon processes did not get started. Contributed by Tanping Wang.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1130833 13f79535-47bb-0310-9956-ffa450edef68
Todd Lipcon 14 年 前
コミット
1e8c213e18
2 ファイル変更9 行追加0 行削除
  1. 3 0
      CHANGES.txt
  2. 6 0
      bin/hadoop-daemon.sh

+ 3 - 0
CHANGES.txt

@@ -187,6 +187,9 @@ Trunk (unreleased changes)
 
     HADOOP-7337. Change PureJavaCrc32 annotations to public stable.  (szetszwo)
 
+    HADOOP-7331. Make hadoop-daemon.sh return exit code 1 if daemon processes
+    did not get started. (Tanping Wang via todd)
+
   OPTIMIZATIONS
   
     HADOOP-7333. Performance improvement in PureJavaCrc32. (Eric Caspole

+ 6 - 0
bin/hadoop-daemon.sh

@@ -136,6 +136,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)
@@ -146,9 +150,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
     ;;