svn commit: r1127706 - in /hadoop/hdfs/trunk: CHANGES.txt bin/hdfs

[jg...@apache.org]

Author: jghoman
Date: Wed May 25 22:14:10 2011
New Revision: 1127706

URL: http://svn.apache.org/viewvc?rev=1127706&view=rev
Log:
HDFS-1943. Fail to start datanode while start-dfs.sh is executed by root user. Contributed by Wei Yongjun.

Modified:
    hadoop/hdfs/trunk/CHANGES.txt
    hadoop/hdfs/trunk/bin/hdfs

Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=1127706&r1=1127705&r2=1127706&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Wed May 25 22:14:10 2011
@@ -615,6 +615,9 @@ Trunk (unreleased changes)
     HDFS-1371. One bad node can incorrectly flag many files as corrupt.
     (Tanping Wang via jitendra)
 
+    HDFS-1943. Fail to start datanode while start-dfs.sh is executed by 
+    root user. (Wei Yongjun via jghoman)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/hdfs/trunk/bin/hdfs
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/bin/hdfs?rev=1127706&r1=1127705&r2=1127706&view=diff
==============================================================================
--- hadoop/hdfs/trunk/bin/hdfs (original)
+++ hadoop/hdfs/trunk/bin/hdfs Wed May 25 22:14:10 2011
@@ -71,7 +71,7 @@ elif [ "$COMMAND" = "secondarynamenode" 
   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"