Author: mattf
Date: Wed Nov 9 23:57:01 2011
New Revision: 1200050
URL: http://svn.apache.org/viewvc?rev=1200050&view=rev
Log:
HDFS-1943. Fail to start datanode while start-dfs.sh is executed by root user.
Wei Yongjun's patch updated by Matt Foley.
Modified:
hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
hadoop/common/branches/branch-0.20-security-205/bin/hadoop
Modified: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt?rev=1200050&r1=1200049&r2=1200050&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Wed Nov 9
23:57:01 2011
@@ -33,6 +33,9 @@ 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.
Modified: hadoop/common/branches/branch-0.20-security-205/bin/hadoop
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/bin/hadoop?rev=1200050&r1=1200049&r2=1200050&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/bin/hadoop (original)
+++ hadoop/common/branches/branch-0.20-security-205/bin/hadoop Wed Nov 9
23:57:01 2011
@@ -250,7 +250,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"
