Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
Reply-To: common-dev@hadoop.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1407280 - in /hadoop/common/branches/branch-1.1:
 CHANGES.txt
 src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java
 src/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNode.java
Date: Thu, 08 Nov 2012 21:44:03 -0000
To: common-commits@hadoop.apache.org
From: suresh@apache.org
Message-Id: <20121108214403.8D38F2388A91@eris.apache.org>

Author: suresh
Date: Thu Nov  8 21:44:02 2012
New Revision: 1407280

URL: http://svn.apache.org/viewvc?rev=1407280&view=rev
Log:
HDFS-4134. Merging revision 1407278 from branch-1 to release 1.1.1.

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

Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1407280&r1=1407279&r2=1407280&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Thu Nov  8 21:44:02 2012
@@ -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
 

Modified: hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java?rev=1407280&r1=1407279&r2=1407280&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java (original)
+++ hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNode.java Thu Nov  8 21:44:02 2012
@@ -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" +

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