You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by gk...@apache.org on 2011/09/22 22:18:33 UTC
svn commit: r1174370 - in /hadoop/common/branches/branch-0.20-security-205:
CHANGES.txt src/packages/hadoop-setup-conf.sh
src/packages/templates/conf/hadoop-env.sh
Author: gkesavan
Date: Thu Sep 22 20:18:32 2011
New Revision: 1174370
URL: http://svn.apache.org/viewvc?rev=1174370&view=rev
Log:
HADOOP-7658. Fix hadoop config template for secured and unsecured installation. Contributed by Eric Yang
Modified:
hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
hadoop/common/branches/branch-0.20-security-205/src/packages/hadoop-setup-conf.sh
hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/hadoop-env.sh
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=1174370&r1=1174369&r2=1174370&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Thu Sep 22 20:18:32 2011
@@ -174,6 +174,9 @@ Release 0.20.205.0 - 2011.09.12
HDFS-2218. Disable TestHdfsProxy.testHdfsProxyInterface in automated test suite
for 0.20-security-205 release. (Matt Foley)
+
+ HADOOP-7658. Fix hadoop config template for secured and unsecured
+ installation (Eric Yang via gkesavan)
IMPROVEMENTS
Modified: hadoop/common/branches/branch-0.20-security-205/src/packages/hadoop-setup-conf.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/packages/hadoop-setup-conf.sh?rev=1174370&r1=1174369&r2=1174370&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/packages/hadoop-setup-conf.sh (original)
+++ hadoop/common/branches/branch-0.20-security-205/src/packages/hadoop-setup-conf.sh Thu Sep 22 20:18:32 2011
@@ -270,11 +270,13 @@ if [ "${SECURITY_TYPE}" = "kerberos" ];
HADOOP_DN_ADDR="0.0.0.0:1019"
HADOOP_DN_HTTP_ADDR="0.0.0.0:1022"
SECURITY="true"
+ HADOOP_SECURE_DN_USER=${HADOOP_HDFS_USER}
else
TASK_CONTROLLER="org.apache.hadoop.mapred.DefaultTaskController"
HADDOP_DN_ADDR="0.0.0.0:50010"
HADOOP_DN_HTTP_ADDR="0.0.0.0:50075"
SECURITY="false"
+ HADOOP_SECURE_DN_USER=""
fi
if [ "${AUTOMATED}" != "1" ]; then
Modified: hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/hadoop-env.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/hadoop-env.sh?rev=1174370&r1=1174369&r2=1174370&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/hadoop-env.sh (original)
+++ hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/hadoop-env.sh Thu Sep 22 20:18:32 2011
@@ -29,7 +29,7 @@ export HADOOP_CLIENT_OPTS="-Xmx128m ${HA
#HADOOP_JAVA_PLATFORM_OPTS="-XX:-UsePerfData ${HADOOP_JAVA_PLATFORM_OPTS}"
# On secure datanodes, user to run the datanode as after dropping privileges
-export HADOOP_SECURE_DN_USER=${HADOOP_HDFS_USER}
+export HADOOP_SECURE_DN_USER=${HADOOP_SECURE_DN_USER}
# Where log files are stored. $HADOOP_HOME/logs by default.
export HADOOP_LOG_DIR=${HADOOP_LOG_DIR}/$USER