Author: mattf
Date: Thu Nov 10 00:04:58 2011
New Revision: 1200053
URL: http://svn.apache.org/viewvc?rev=1200053&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/CHANGES.txt (contents, props
changed)
hadoop/common/branches/branch-0.20-security/bin/hadoop
Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1200053&r1=1200052&r2=1200053&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Thu Nov 10 00:04:58
2011
@@ -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)
Propchange: hadoop/common/branches/branch-0.20-security/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 10 00:04:58 2011
@@ -2,7 +2,7 @@
/hadoop/common/branches/branch-0.20-append/CHANGES.txt:955380,955398,955448,956329
/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt:1128390,1147228,1148069,1149316,1154413,1159730,1161741
-/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt:1170696,1171234,1171294,1174368,1176042,1176248,1176638,1176645
+/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt:1170696,1171234,1171294,1174368,1176042,1176248,1176638,1176645,1200050
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
Modified: hadoop/common/branches/branch-0.20-security/bin/hadoop
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/bin/hadoop?rev=1200053&r1=1200052&r2=1200053&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/bin/hadoop (original)
+++ hadoop/common/branches/branch-0.20-security/bin/hadoop Thu Nov 10 00:04:58
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"
