You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by su...@apache.org on 2012/11/08 22:40:32 UTC

svn commit: r1407278 - in /hadoop/common/branches/branch-1: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java

Author: suresh
Date: Thu Nov  8 21:40:32 2012
New Revision: 1407278

URL: http://svn.apache.org/viewvc?rev=1407278&view=rev
Log:
HDFS-4134. Namenode and Datanode entry points should return negative exit code on bad arguments. Contributed by Steve Loughran.

Modified:
    hadoop/common/branches/branch-1/CHANGES.txt
    hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java
    hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1407278&r1=1407277&r2=1407278&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Thu Nov  8 21:40:32 2012
@@ -327,8 +327,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
 

Modified: hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java?rev=1407278&r1=1407277&r2=1407278&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java (original)
+++ hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java Thu Nov  8 21:40:32 2012
@@ -1616,7 +1616,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" +

Modified: hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java?rev=1407278&r1=1407277&r2=1407278&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java (original)
+++ hadoop/common/branches/branch-1/src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java Thu Nov  8 21:40:32 2012
@@ -1423,7 +1423,7 @@ public class NameNode implements ClientP
     StartupOption startOpt = parseArguments(argv);
     if (startOpt == null) {
       printUsage();
-      return null;
+      System.exit(-2);
     }
     setStartupOption(conf, startOpt);