HDFS-3402. Fix hdfs script for secure datanodes. Contributed by Benoy Antony.

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

hdfs/CHANGES.txt

@@ -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

hdfs/bin/hdfs

@@ -68,8 +68,9 @@ elif [ "$COMMAND" = "secondarynamenode" ] ; then
   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