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 ar...@apache.org on 2013/06/11 21:01:41 UTC
svn commit: r1491907 - in
/hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt
src/main/conf/hadoop-env.cmd src/main/conf/hadoop-env.sh
Author: arpit
Date: Tue Jun 11 19:01:40 2013
New Revision: 1491907
URL: http://svn.apache.org/r1491907
Log:
HADOOP-9625. HADOOP_OPTS not picked up by hadoop command. Contributed by Paul Han
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1491907&r1=1491906&r2=1491907&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jun 11 19:01:40 2013
@@ -450,6 +450,9 @@ Release 2.1.0-beta - UNRELEASED
HADOOP-9604. Javadoc of FSDataOutputStream is slightly inaccurate. (Jingguo
Yao via atm)
+
+ HADOOP-9625. HADOOP_OPTS not picked up by hadoop command.
+ (Paul Han via arpit)
OPTIMIZATIONS
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd?rev=1491907&r1=1491906&r2=1491907&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd Tue Jun 11 19:01:40 2013
@@ -43,7 +43,7 @@ if exist %HADOOP_HOME%\contrib\capacity-
@rem set HADOOP_NAMENODE_INIT_HEAPSIZE=""
@rem Extra Java runtime options. Empty by default.
-@rem set HADOOP_OPTS=-Djava.net.preferIPv4Stack=true
+@rem set HADOOP_OPTS=%HADOOP_OPTS% -Djava.net.preferIPv4Stack=true
@rem Command specific options appended to HADOOP_OPTS when specified
if not defined HADOOP_SECURITY_LOGGER (
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh?rev=1491907&r1=1491906&r2=1491907&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh Tue Jun 11 19:01:40 2013
@@ -45,7 +45,7 @@ done
#export HADOOP_NAMENODE_INIT_HEAPSIZE=""
# Extra Java runtime options. Empty by default.
-export HADOOP_OPTS="-Djava.net.preferIPv4Stack=true"
+export HADOOP_OPTS="$HADOOP_OPTS -Djava.net.preferIPv4Stack=true"
MAC_OSX=false
case "`uname`" in