Author: zjshen
Date: Tue Feb 4 04:47:23 2014
New Revision: 1564195
URL: http://svn.apache.org/r1564195
Log:
YARN-1684. Fixed history server heap size in yarn script. Contributed by Billie
Rinaldi.
svn merge --ignore-ancestry -c 1564193 ../../trunk/
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1564195&r1=1564194&r2=1564195&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Tue Feb 4
04:47:23 2014
@@ -151,6 +151,9 @@ Release 2.4.0 - UNRELEASED
YARN-1673. Fix option parsing in YARN's application CLI after it is broken
by YARN-967. (Mayank Bansal via vinodkv)
+ YARN-1684. Fixed history server heap size in yarn script. (Billie Rinaldi
+ via zjshen)
+
Release 2.3.0 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn?rev=1564195&r1=1564194&r2=1564195&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn
(original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn
Tue Feb 4 04:47:23 2014
@@ -204,7 +204,7 @@ elif [ "$COMMAND" = "historyserver" ] ;
CLASSPATH=${CLASSPATH}:$YARN_CONF_DIR/ahs-config/log4j.properties
CLASS='org.apache.hadoop.yarn.server.applicationhistoryservice.ApplicationHistoryServer'
YARN_OPTS="$YARN_OPTS $YARN_HISTORYSERVER_OPTS"
- if [ "$YARN_RESOURCEMANAGER_HEAPSIZE" != "" ]; then
+ if [ "$YARN_HISTORYSERVER_HEAPSIZE" != "" ]; then
JAVA_HEAP_MAX="-Xmx""$YARN_HISTORYSERVER_HEAPSIZE""m"
fi
elif [ "$COMMAND" = "nodemanager" ] ; then
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd?rev=1564195&r1=1564194&r2=1564195&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
(original)
+++
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd
Tue Feb 4 04:47:23 2014
@@ -207,7 +207,7 @@ goto :eof
set CLASSPATH=%CLASSPATH%;%YARN_CONF_DIR%\ahs-config\log4j.properties
set
CLASS=org.apache.hadoop.yarn.server.applicationhistoryservice.ApplicationHistoryServer
set YARN_OPTS=%YARN_OPTS% %HADOOP_HISTORYSERVER_OPTS%
- if defined YARN_RESOURCEMANAGER_HEAPSIZE (
+ if defined YARN_HISTORYSERVER_HEAPSIZE (
set JAVA_HEAP_MAX=-Xmx%YARN_HISTORYSERVER_HEAPSIZE%m
)
goto :eof
