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/hdfs/trunk@1127706 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 9c64d8b..d5e4b37 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -615,6 +615,9 @@
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
diff --git a/bin/hdfs b/bin/hdfs
index 76ff689..ce9dc0a 100755
--- a/bin/hdfs
+++ b/bin/hdfs
@@ -71,7 +71,7 @@
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"
