Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-9625. Merging change r1491907 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491959 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arpit Gupta 2013-06-11 21:04:52 +00:00
parent 03f6e8ab56
commit 13381835cc
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -125,6 +125,9 @@ Release 2.1.0-beta - UNRELEASED
HADOOP-9604. Javadoc of FSDataOutputStream is slightly inaccurate. (Jingguo HADOOP-9604. Javadoc of FSDataOutputStream is slightly inaccurate. (Jingguo
Yao via atm) Yao via atm)
HADOOP-9625. HADOOP_OPTS not picked up by hadoop command.
(Paul Han via arpit)
OPTIMIZATIONS OPTIMIZATIONS

2
hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.cmd
View File

@ -43,7 +43,7 @@ if exist %HADOOP_HOME%\contrib\capacity-scheduler (
@rem set HADOOP_NAMENODE_INIT_HEAPSIZE="" @rem set HADOOP_NAMENODE_INIT_HEAPSIZE=""
@rem Extra Java runtime options. Empty by default. @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 @rem Command specific options appended to HADOOP_OPTS when specified
if not defined HADOOP_SECURITY_LOGGER ( if not defined HADOOP_SECURITY_LOGGER (

2
hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh
View File

@ -45,7 +45,7 @@ done
#export HADOOP_NAMENODE_INIT_HEAPSIZE="" #export HADOOP_NAMENODE_INIT_HEAPSIZE=""
# Extra Java runtime options. Empty by default. # Extra Java runtime options. Empty by default.
export HADOOP_OPTS="-Djava.net.preferIPv4Stack=true" export HADOOP_OPTS="$HADOOP_OPTS -Djava.net.preferIPv4Stack=true"
# Command specific options appended to HADOOP_OPTS when specified # Command specific options appended to HADOOP_OPTS when specified
export HADOOP_NAMENODE_OPTS="-Dhadoop.security.logger=${HADOOP_SECURITY_LOGGER:-INFO,RFAS} -Dhdfs.audit.logger=${HDFS_AUDIT_LOGGER:-INFO,NullAppender} $HADOOP_NAMENODE_OPTS" export HADOOP_NAMENODE_OPTS="-Dhadoop.security.logger=${HADOOP_SECURITY_LOGGER:-INFO,RFAS} -Dhdfs.audit.logger=${HDFS_AUDIT_LOGGER:-INFO,NullAppender} $HADOOP_NAMENODE_OPTS"