Repository: hadoop Updated Branches: refs/heads/trunk 4281c96e2 -> 9b4ba409c
YARN-2189. Admin service for cache manager. Addendum to sort entries Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9b4ba409 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9b4ba409 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9b4ba409 Branch: refs/heads/trunk Commit: 9b4ba409c6683c52c8e931809fc47b593bb90b48 Parents: 4281c96 Author: Karthik Kambatla <[email protected]> Authored: Wed Dec 17 11:18:23 2014 -0800 Committer: Karthik Kambatla <[email protected]> Committed: Wed Dec 17 11:22:12 2014 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/hadoop-yarn/bin/yarn | 22 +++++++++++--------- .../hadoop-yarn/conf/yarn-env.sh | 12 ++++++++++- 2 files changed, 23 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9b4ba409/hadoop-yarn-project/hadoop-yarn/bin/yarn ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/bin/yarn b/hadoop-yarn-project/hadoop-yarn/bin/yarn index ab9f7dd..6f5fd59 100644 --- a/hadoop-yarn-project/hadoop-yarn/bin/yarn +++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn @@ -35,8 +35,8 @@ function hadoop_usage echo " resourcemanager run the ResourceManager" echo " resourcemanager -format-state-store deletes the RMStateStore" echo " rmadmin admin tools" - echo " sharedcachemanager run the SharedCacheManager daemon" echo " scmadmin SharedCacheManager admin tools" + echo " sharedcachemanager run the SharedCacheManager daemon" echo " timelineserver run the timeline server" echo " version print the version" echo " or" @@ -152,6 +152,17 @@ case "${COMMAND}" in hadoop_debug "Append YARN_CLIENT_OPTS onto YARN_OPTS" YARN_OPTS="${YARN_OPTS} ${YARN_CLIENT_OPTS}" ;; + scmadmin) + CLASS='org.apache.hadoop.yarn.client.SCMAdmin' + hadoop_debug "Append YARN_CLIENT_OPTS onto YARN_OPTS" + YARN_OPTS="${YARN_OPTS} ${YARN_CLIENT_OPTS}" + ;; + sharedcachemanager) + supportdaemonization="true" + CLASS='org.apache.hadoop.yarn.server.sharedcachemanager.SharedCacheManager' + hadoop_debug "Append YARN_SHAREDCACHEMANAGER_OPTS onto YARN_OPTS" + YARN_OPTS="${YARN_OPTS} ${YARN_SHAREDCACHEMANAGER_OPTS}" + ;; timelineserver) supportdaemonization="true" CLASS='org.apache.hadoop.yarn.server.applicationhistoryservice.ApplicationHistoryServer' @@ -162,15 +173,6 @@ case "${COMMAND}" in HADOOP_HEAPSIZE_MAX="${YARN_TIMELINESERVER_HEAPSIZE}" fi ;; - sharedcachemanager) - supportdaemonization="true" - CLASS='org.apache.hadoop.yarn.server.sharedcachemanager.SharedCacheManager' - YARN_OPTS="$YARN_OPTS $YARN_SHAREDCACHEMANAGER_OPTS" - ;; - scmadmin) - CLASS='org.apache.hadoop.yarn.client.SCMAdmin' - YARN_OPTS="$YARN_OPTS $YARN_CLIENT_OPTS" - ;; version) CLASS=org.apache.hadoop.util.VersionInfo hadoop_debug "Append YARN_CLIENT_OPTS onto YARN_OPTS" http://git-wip-us.apache.org/repos/asf/hadoop/blob/9b4ba409/hadoop-yarn-project/hadoop-yarn/conf/yarn-env.sh ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/conf/yarn-env.sh b/hadoop-yarn-project/hadoop-yarn/conf/yarn-env.sh index fdf601f..56386f1 100644 --- a/hadoop-yarn-project/hadoop-yarn/conf/yarn-env.sh +++ b/hadoop-yarn-project/hadoop-yarn/conf/yarn-env.sh @@ -133,4 +133,14 @@ # #export YARN_PROXYSERVER_OPTS= - +### +# Shared Cache Manager specific parameters +### +# Specify the JVM options to be used when starting the +# shared cache manager server. +# These options will be appended to the options specified as YARN_OPTS +# and therefore may override any similar flags set in YARN_OPTS +# +# See ResourceManager for some examples +# +#export YARN_SHAREDCACHEMANAGER_OPTS=
