You are viewing a plain text version of this content. The canonical link for it is here.

Posted to hdfs-commits@hadoop.apache.org by sh...@apache.org on 2012/06/05 03:09:41 UTC

svn commit: r1346210 - in /hadoop/common/branches/branch-0.22/hdfs: CHANGES.txt bin/hdfs

Author: shv
Date: Tue Jun  5 01:09:41 2012
New Revision: 1346210

URL: http://svn.apache.org/viewvc?rev=1346210&view=rev
Log:
HDFS-3402. Fix hdfs script for secure datanodes. Contributed by Benoy Antony.

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

Modified: hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt?rev=1346210&r1=1346209&r2=1346210&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/hdfs/CHANGES.txt Tue Jun  5 01:09:41 2012
@@ -35,6 +35,10 @@ Release 0.22.1 - Unreleased
 
     HDFS-3368. Missing blocks due to bad DataNodes coming up and down. (shv)
 
+  SUBTASKS OF HADOOP-8357. Restore security in Hadoop 0.22 branch.
+
+    HDFS-3402. Fix hdfs script for secure datanodes. (Benoy Antony via shv)
+
 Release 0.22.0 - 2011-11-29
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-0.22/hdfs/bin/hdfs
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/hdfs/bin/hdfs?rev=1346210&r1=1346209&r2=1346210&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/hdfs/bin/hdfs (original)
+++ hadoop/common/branches/branch-0.22/hdfs/bin/hdfs Tue Jun  5 01:09:41 2012
@@ -68,8 +68,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