HDFS-1943. Fail to start datanode while start-dfs.sh is executed by root user. Wei Yongjun's patch updated by Matt Foley.

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

CHANGES.txt

@@ -8,8 +8,6 @@ Release 0.20.206.0 - unreleased
                     branch-0.20-security (Ravi Gummadi via amarrk)
   BUG FIXES
 
-    HADOOP-7784. Fixed jsvc packaging. (Eric Yang)
-
     HDFS-2305. Running multiple 2NNs can result in corrupt file system. (atm)
 
     HADOOP-7634. Docs specify wrong owner for task-controller.cfg (eli)
@@ -94,6 +92,11 @@ Release 0.20.205.1 - unreleased
 
   BUG FIXES
 
+    HDFS-1943. Fail to start datanode while start-dfs.sh is executed by root
+    user. (Wei Yongjun's patch updated by Matt Foley)
+
+    HADOOP-7784. Fixed jsvc packaging. (Eric Yang)
+
     HADOOP-7740. Fixed security audit logger configuration. 
     (Arpit Gupta via Eric Yang)
 

bin/hadoop

@@ -250,7 +250,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"