Author: vinodkv
Date: Sun May 11 00:05:31 2014
New Revision: 1593749
URL: http://svn.apache.org/r1593749
Log:
YARN-1982. Renamed the daemon name to be TimelineServer instead of History
Server and deprecated the old usage. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1593748 ../../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
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/conf/yarn-env.sh
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=1593749&r1=1593748&r2=1593749&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Sun May 11
00:05:31 2014
@@ -55,6 +55,9 @@ Release 2.5.0 - UNRELEASED
YARN-766. TestNodeManagerShutdown in branch-2 should use Shell to form the
output path and a format
issue in trunk. (Contributed by Siddharth Seth)
+ YARN-1982. Renamed the daemon name to be TimelineServer instead of History
+ Server and deprecated the old usage. (Zhijie Shen via vinodkv)
+
OPTIMIZATIONS
BUG FIXES
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=1593749&r1=1593748&r2=1593749&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
Sun May 11 00:05:31 2014
@@ -63,7 +63,7 @@ function print_usage(){
echo "where COMMAND is one of:"
echo " resourcemanager run the ResourceManager"
echo " nodemanager run a nodemanager on each slave"
- echo " historyserver run the application history server"
+ echo " timelineserver run the timeline server"
echo " rmadmin admin tools"
echo " version print the version"
echo " jar <jar> run a jar file"
@@ -153,7 +153,6 @@ if [ -d "$HADOOP_YARN_HOME/yarn-server/y
fi
if [ -d
"$HADOOP_YARN_HOME/yarn-server/yarn-server-resourcemanager/target/classes" ];
then
CLASSPATH=${CLASSPATH}:$HADOOP_YARN_HOME/yarn-server/yarn-server-resourcemanager/target/classes
-
CLASSPATH=${CLASSPATH}:$HADOOP_YARN_HOME/yarn-server/yarn-server-applicationhistoryservice/target/classes
fi
if [ -d
"$HADOOP_YARN_HOME/yarn-server/yarn-server-applicationhistoryservice/target/classes"
]; then
CLASSPATH=${CLASSPATH}:$HADOOP_YARN_HOME/yarn-server/yarn-server-applicationhistoryservice/target/classes
@@ -217,12 +216,21 @@ elif [ "$COMMAND" = "resourcemanager" ]
JAVA_HEAP_MAX="-Xmx""$YARN_RESOURCEMANAGER_HEAPSIZE""m"
fi
elif [ "$COMMAND" = "historyserver" ] ; then
+ echo "DEPRECATED: Use of this command to start the timeline server is
deprecated." 1>&2
+ echo "Instead use the timelineserver command for it." 1>&2
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_HISTORYSERVER_HEAPSIZE" != "" ]; then
JAVA_HEAP_MAX="-Xmx""$YARN_HISTORYSERVER_HEAPSIZE""m"
- fi
+ fi
+elif [ "$COMMAND" = "timelineserver" ] ; then
+ CLASSPATH=${CLASSPATH}:$YARN_CONF_DIR/timelineserver-config/log4j.properties
+
CLASS='org.apache.hadoop.yarn.server.applicationhistoryservice.ApplicationHistoryServer'
+ YARN_OPTS="$YARN_OPTS $YARN_TIMELINESERVER_OPTS"
+ if [ "$YARN_TIMELINESERVER_HEAPSIZE" != "" ]; then
+ JAVA_HEAP_MAX="-Xmx""$YARN_TIMELINESERVER_HEAPSIZE""m"
+ fi
elif [ "$COMMAND" = "nodemanager" ] ; then
CLASSPATH=${CLASSPATH}:$YARN_CONF_DIR/nm-config/log4j.properties
CLASS='org.apache.hadoop.yarn.server.nodemanager.NodeManager'
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=1593749&r1=1593748&r2=1593749&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
Sun May 11 00:05:31 2014
@@ -120,11 +120,12 @@ if "%1" == "--config" (
if exist
%HADOOP_YARN_HOME%\yarn-server\yarn-server-resourcemanager\target\classes (
set
CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\yarn-server\yarn-server-resourcemanager\target\classes
- set
CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\yarn-server\yarn-server-applicationhistoryservice\target\classes
)
+
if exist
%HADOOP_YARN_HOME%\yarn-server\yarn-server-applicationhistoryservice\target\classes
(
set
CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\yarn-server\yarn-server-applicationhistoryservice\target\classes
)
+
if exist %HADOOP_YARN_HOME%\build\test\classes (
set CLASSPATH=%CLASSPATH%;%HADOOP_YARN_HOME%\build\test\classes
)
@@ -142,7 +143,8 @@ if "%1" == "--config" (
)
set yarncommands=resourcemanager nodemanager proxyserver rmadmin version jar
^
- application applicationattempt container node logs daemonlog historyserver
+ application applicationattempt container node logs daemonlog
historyserver ^
+ timelineserver
for %%i in ( %yarncommands% ) do (
if %yarn-command% == %%i set yarncommand=true
)
@@ -204,6 +206,8 @@ goto :eof
goto :eof
:historyserver
+ @echo DEPRECATED: Use of this command to start the timeline server is
deprecated. 1>&2
+ @echo Instead use the timelineserver command for it. 1>&2
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%
@@ -212,6 +216,15 @@ goto :eof
)
goto :eof
+:timelineserver
+ set
CLASSPATH=%CLASSPATH%;%YARN_CONF_DIR%\timelineserver-config\log4j.properties
+ set
CLASS=org.apache.hadoop.yarn.server.applicationhistoryservice.ApplicationHistoryServer
+ set YARN_OPTS=%YARN_OPTS% %HADOOP_TIMELINESERVER_OPTS%
+ if defined YARN_TIMELINESERVER_HEAPSIZE (
+ set JAVA_HEAP_MAX=-Xmx%YARN_TIMELINESERVER_HEAPSIZE%m
+ )
+ goto :eof
+
:nodemanager
set CLASSPATH=%CLASSPATH%;%YARN_CONF_DIR%\nm-config\log4j.properties
set CLASS=org.apache.hadoop.yarn.server.nodemanager.NodeManager
@@ -277,7 +290,7 @@ goto :eof
@echo where COMMAND is one of:
@echo resourcemanager run the ResourceManager
@echo nodemanager run a nodemanager on each slave
- @echo historyserver run the application history server
+ @echo timelineserver run the timeline server
@echo rmadmin admin tools
@echo version print the version
@echo jar ^<jar^> run a jar file
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/conf/yarn-env.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/conf/yarn-env.sh?rev=1593749&r1=1593748&r2=1593749&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/conf/yarn-env.sh
(original)
+++
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/conf/yarn-env.sh
Sun May 11 00:05:31 2014
@@ -54,14 +54,14 @@ fi
# or JAVA_HEAP_MAX with YARN_HEAPMAX as the preferred option of the two.
#export YARN_RESOURCEMANAGER_HEAPSIZE=1000
-# Specify the max Heapsize for the HistoryManager using a numerical value
+# Specify the max Heapsize for the timeline server using a numerical value
# in the scale of MB. For example, to specify an jvm option of -Xmx1000m, set
# the value to 1000.
# This value will be overridden by an Xmx setting specified in either YARN_OPTS
-# and/or YARN_HISTORYSERVER_OPTS.
+# and/or YARN_TIMELINESERVER_OPTS.
# If not specified, the default value will be picked from either YARN_HEAPMAX
# or JAVA_HEAP_MAX with YARN_HEAPMAX as the preferred option of the two.
-#export YARN_HISTORYSERVER_HEAPSIZE=1000
+#export YARN_TIMELINESERVER_HEAPSIZE=1000
# Specify the JVM options to be used when starting the ResourceManager.
# These options will be appended to the options specified as YARN_OPTS
