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/10/21 03:38:03 UTC

svn commit: r1400550 - in /hadoop/common/branches/branch-1: CHANGES.txt bin/hadoop

Author: suresh
Date: Sun Oct 21 01:38:03 2012
New Revision: 1400550

URL: http://svn.apache.org/viewvc?rev=1400550&view=rev
Log:
HDFS-3402. Fix failure to start secure datanodes. (Benoy Antony via suresh)

Modified:
    hadoop/common/branches/branch-1/CHANGES.txt
    hadoop/common/branches/branch-1/bin/hadoop

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1400550&r1=1400549&r2=1400550&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Sun Oct 21 01:38:03 2012
@@ -266,6 +266,8 @@ Release 1.2.0 - unreleased
     HADOOP-8861. FSDataOutputStream.sync should call flush() if the underlying 
     wrapped stream is not Syncable. (Amareshwari via umamahesh)
 
+    HDFS-3402. Fix failure to start secure datanodes. (Benoy Antony via suresh)
+
 Release 1.1.1 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-1/bin/hadoop
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/bin/hadoop?rev=1400550&r1=1400549&r2=1400550&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/bin/hadoop (original)
+++ hadoop/common/branches/branch-1/bin/hadoop Sun Oct 21 01:38:03 2012
@@ -241,8 +241,9 @@ elif [ "$COMMAND" = "secondarynamenode" 
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_SECONDARYNAMENODE_OPTS"
 elif [ "$COMMAND" = "datanode" ] ; then
   CLASS='org.apache.hadoop.hdfs.server.datanode.DataNode'
+  HADOOP_OPTS=${HADOOP_OPTS/-server/}
   if [ "$starting_secure_dn" = "true" ]; then
-    HADOOP_OPTS="$HADOOP_OPTS -jvm server $HADOOP_DATANODE_OPTS"
+    HADOOP_OPTS="-jvm server $HADOOP_OPTS  $HADOOP_DATANODE_OPTS"  
   else
     HADOOP_OPTS="$HADOOP_OPTS -server $HADOOP_DATANODE_OPTS"
   fi