Просмотр исходного кода

svn merge -c 1503957 FIXES: MAPREDUCE-5380. Invalid mapred command should return non-zero exit code. Contributed by Stephen Chu

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1503959 13f79535-47bb-0310-9956-ffa450edef68
Jason Darrell Lowe 11 лет назад
Родитель
Сommit
65a8fa4b95
2 измененных файлов с 5 добавлено и 2 удалено
  1. 3 0
      hadoop-mapreduce-project/CHANGES.txt
  2. 2 2
      hadoop-mapreduce-project/bin/mapred

+ 3 - 0
hadoop-mapreduce-project/CHANGES.txt

@@ -15,6 +15,9 @@ Release 0.23.10 - UNRELEASED
     MAPREDUCE-3193. FileInputFormat doesn't read files recursively in the
     input path dir (Devaraj K via jlowe)
 
+    MAPREDUCE-5380. Invalid mapred command should return non-zero exit code
+    (Stephen Chu via jlowe)
+
 Release 0.23.9 - 2013-07-08
 
   INCOMPATIBLE CHANGES

+ 2 - 2
hadoop-mapreduce-project/bin/mapred

@@ -78,7 +78,7 @@ elif [ "$COMMAND" = "mradmin" ] \
   echo "Sorry, the $COMMAND command is no longer supported."
   echo "You may find similar functionality with the \"yarn\" shell command."
   print_usage
-  exit
+  exit 1
 elif [ "$COMMAND" = "distcp" ] ; then
   CLASS=org.apache.hadoop.tools.DistCp
   CLASSPATH=${CLASSPATH}:${TOOL_PATH}
@@ -90,7 +90,7 @@ elif [ "$COMMAND" = "archive" ] ; then
 else
   echo $COMMAND - invalid command
   print_usage
-  exit
+  exit 1
 fi
 
 # for developers, add mapred classes to CLASSPATH