Author: mattf
Date: Wed Sep 28 23:05:44 2011
New Revision: 1177101
URL: http://svn.apache.org/viewvc?rev=1177101&view=rev
Log:
MAPREDUCE-3112. Calling hadoop cli inside mapreduce job leads to errors.
Contributed by Eric Yang.
Modified:
hadoop/common/branches/branch-0.20-security/CHANGES.txt
hadoop/common/branches/branch-0.20-security/src/packages/templates/conf/hadoop-env.sh
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=1177101&r1=1177100&r2=1177101&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Wed Sep 28 23:05:44
2011
@@ -85,6 +85,9 @@ Release 0.20.205.0 - unreleased
BUG FIXES
+ MAPREDUCE-3112. Calling hadoop cli inside mapreduce job leads to errors.
+ (Eric Yang via mattf)
+
HDFS-7691. Hadoop deb pkg group id. (Eric Yang via mattf)
HADOOP-7685. Resolve issues with hadoop-common file hadoop-setup-conf.sh.
Modified:
hadoop/common/branches/branch-0.20-security/src/packages/templates/conf/hadoop-env.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/packages/templates/conf/hadoop-env.sh?rev=1177101&r1=1177100&r2=1177101&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-security/src/packages/templates/conf/hadoop-env.sh
(original)
+++
hadoop/common/branches/branch-0.20-security/src/packages/templates/conf/hadoop-env.sh
Wed Sep 28 23:05:44 2011
@@ -14,7 +14,7 @@ export HADOOP_CONF_DIR=${HADOOP_CONF_DIR
#export HADOOP_NAMENODE_INIT_HEAPSIZE=""
# Extra Java runtime options. Empty by default.
-export HADOOP_OPTS="-Djava.net.preferIPv4Stack=true $HADOOP_OPTS"
+export HADOOP_OPTS="-Djava.net.preferIPv4Stack=true $HADOOP_CLIENT_OPTS"
# Command specific options appended to HADOOP_OPTS when specified
export HADOOP_NAMENODE_OPTS="-Dsecurity.audit.logger=INFO,DRFAS
-Dhdfs.audit.logger=INFO,DRFAAUDIT ${HADOOP_NAMENODE_OPTS}"
