MAPREDUCE-3112. Calling hadoop cli inside mapreduce job leads to errors. Contributed by Eric Yang.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security-205@1177102 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -47,6 +47,9 @@ Release 0.20.205.0 - 2011.09.27
 
   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. 

src/packages/templates/conf/hadoop-env.sh

@@ -14,7 +14,7 @@ export HADOOP_CONF_DIR=${HADOOP_CONF_DIR:-"/etc/hadoop"}
 #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}"