HDFS-1943. fail to start datanode while start-dfs.sh is executed by root user. Contributed by Wei Yongjun.

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

hdfs/CHANGES.txt

@@ -631,6 +631,9 @@ Release 0.22.0 - Unreleased
     HDFS-2290. Block with corrupt replica is not getting replicated.
     (Benoy Antony via shv)
 
+    HDFS-1943. fail to start datanode while start-dfs.sh is executed by root
+    user (Wei Yongjun via cos)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS

hdfs/bin/hdfs

@@ -68,7 +68,7 @@ elif [ "$COMMAND" = "secondarynamenode" ] ; then
   HADOOP_OPTS="$HADOOP_OPTS $HADOOP_SECONDARYNAMENODE_OPTS"
 elif [ "$COMMAND" = "datanode" ] ; then
   CLASS='org.apache.hadoop.hdfs.server.datanode.DataNode'
-  if [[ $EUID -eq 0 ]]; then
+  if [ "$starting_secure_dn" = "true" ]; then
     HADOOP_OPTS="$HADOOP_OPTS -jvm server $HADOOP_DATANODE_OPTS"
   else
     HADOOP_OPTS="$HADOOP_OPTS -server $HADOOP_DATANODE_OPTS"