HDFS-4134. Merging revision 1407278 from branch-1 to release 1.1.1.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1.1@1407280 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -26,8 +26,11 @@ Release 1.1.1 - Unreleased
     directory deletion completes. It allows other operations when the 
     deletion is in progress. (umamahesh via suresh)
 
-    HDFS-2815. Namenode is not coming out of safemode when we perform ( NN crash + restart ). 
-    Also FSCK report shows blocks missed. (umamahesh)
+    HDFS-2815. Namenode is not coming out of safemode when we perform
+    (NN crash + restart). Also FSCK report shows blocks missed. (umamahesh)
+
+    HDFS-4134. hadoop namenode and datanode entry points should return 
+    negative exit code on bad arguments. (Steve Loughran via suresh)
 
 Release 1.1.0 - 2012.09.28
 

src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java

@@ -1569,7 +1569,7 @@ public class DataNode extends Configured
       conf = new Configuration();
     if (!parseArguments(args, conf)) {
       printUsage();
-      return null;
+      System.exit(-2);
     }
     if (conf.get("dfs.network.script") != null) {
       LOG.error("This configuration for rack identification is not supported" +

src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java

@@ -1382,7 +1382,7 @@ public class NameNode implements ClientProtocol, DatanodeProtocol,
     StartupOption startOpt = parseArguments(argv);
     if (startOpt == null) {
       printUsage();
-      return null;
+      System.exit(-2);
     }
     setStartupOption(conf, startOpt);