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 ka...@apache.org on 2014/12/17 20:47:32 UTC
hadoop git commit: YARN-2189. Admin service for cache manager.
Addendum to fix merge conflicts
Repository: hadoop
Updated Branches:
refs/heads/branch-2 89d6ac498 -> 300a66530
YARN-2189. Admin service for cache manager. Addendum to fix merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/300a6653
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/300a6653
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/300a6653
Branch: refs/heads/branch-2
Commit: 300a6653070954186eb41c3eec8a7d6905da29ae
Parents: 89d6ac4
Author: Karthik Kambatla <ka...@apache.org>
Authored: Wed Dec 17 11:47:24 2014 -0800
Committer: Karthik Kambatla <ka...@apache.org>
Committed: Wed Dec 17 11:47:24 2014 -0800
----------------------------------------------------------------------
hadoop-yarn-project/hadoop-yarn/bin/yarn | 107 +++-----------------------
1 file changed, 10 insertions(+), 97 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/300a6653/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 de8cd91..bc4c117 100644
--- a/hadoop-yarn-project/hadoop-yarn/bin/yarn
+++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn
@@ -103,104 +103,7 @@ case $COMMAND in
--help|-help|-h)
print_usage
exit
-<<<<<<< HEAD
;;
-=======
- ;;
- daemonlog)
- CLASS=org.apache.hadoop.log.LogLevel
- hadoop_debug "Append YARN_CLIENT_OPTS onto YARN_OPTS"
- YARN_OPTS="${YARN_OPTS} ${YARN_CLIENT_OPTS}"
- ;;
- jar)
- CLASS=org.apache.hadoop.util.RunJar
- hadoop_debug "Append YARN_CLIENT_OPTS onto YARN_OPTS"
- YARN_OPTS="${YARN_OPTS} ${YARN_CLIENT_OPTS}"
- ;;
- historyserver)
- supportdaemonization="true"
- 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
- echo "Starting the History Server anyway..." 1>&2
- CLASS='org.apache.hadoop.yarn.server.applicationhistoryservice.ApplicationHistoryServer'
- ;;
- logs)
- CLASS=org.apache.hadoop.yarn.client.cli.LogsCLI
- hadoop_debug "Append YARN_CLIENT_OPTS onto YARN_OPTS"
- YARN_OPTS="${YARN_OPTS} ${YARN_CLIENT_OPTS}"
- ;;
- node)
- CLASS=org.apache.hadoop.yarn.client.cli.NodeCLI
- hadoop_debug "Append YARN_CLIENT_OPTS onto YARN_OPTS"
- YARN_OPTS="${YARN_OPTS} ${YARN_CLIENT_OPTS}"
- ;;
- nodemanager)
- supportdaemonization="true"
- CLASS='org.apache.hadoop.yarn.server.nodemanager.NodeManager'
- hadoop_debug "Append YARN_NODEMANAGER_OPTS onto YARN_OPTS"
- YARN_OPTS="${YARN_OPTS} ${YARN_NODEMANAGER_OPTS}"
- if [[ -n "${YARN_NODEMANAGER_HEAPSIZE}" ]]; then
- JAVA_HEAP_MAX="-Xmx${YARN_NODEMANAGER_HEAPSIZE}m"
- fi
- ;;
- proxyserver)
- supportdaemonization="true"
- CLASS='org.apache.hadoop.yarn.server.webproxy.WebAppProxyServer'
- hadoop_debug "Append YARN_PROXYSERVER_OPTS onto YARN_OPTS"
- YARN_OPTS="${YARN_OPTS} ${YARN_PROXYSERVER_OPTS}"
- if [[ -n "${YARN_PROXYSERVER_HEAPSIZE}" ]]; then
- JAVA_HEAP_MAX="-Xmx${YARN_PROXYSERVER_HEAPSIZE}m"
- fi
- ;;
- queue)
- CLASS=org.apache.hadoop.yarn.client.cli.QueueCLI
- hadoop_debug "Append YARN_CLIENT_OPTS onto YARN_OPTS"
- YARN_OPTS="${YARN_OPTS} ${YARN_CLIENT_OPTS}"
- ;;
- resourcemanager)
- supportdaemonization="true"
- CLASS='org.apache.hadoop.yarn.server.resourcemanager.ResourceManager'
- YARN_OPTS="${YARN_OPTS} ${YARN_RESOURCEMANAGER_OPTS}"
- hadoop_debug "Append YARN_RESOURCEMANAGER_OPTS onto YARN_OPTS"
- if [[ -n "${YARN_RESOURCEMANAGER_HEAPSIZE}" ]]; then
- JAVA_HEAP_MAX="-Xmx${YARN_RESOURCEMANAGER_HEAPSIZE}m"
- fi
- ;;
- rmadmin)
- CLASS='org.apache.hadoop.yarn.client.cli.RMAdminCLI'
- hadoop_debug "Append YARN_CLIENT_OPTS onto YARN_OPTS"
- YARN_OPTS="${YARN_OPTS} ${YARN_CLIENT_OPTS}"
- ;;
- timelineserver)
- supportdaemonization="true"
- CLASS='org.apache.hadoop.yarn.server.applicationhistoryservice.ApplicationHistoryServer'
- hadoop_debug "Append YARN_TIMELINESERVER_OPTS onto YARN_OPTS"
- YARN_OPTS="${YARN_OPTS} ${YARN_TIMELINESERVER_OPTS}"
- if [[ -n "${YARN_TIMELINESERVER_HEAPSIZE}" ]]; then
- JAVA_HEAP_MAX="-Xmx${YARN_TIMELINESERVER_HEAPSIZE}m"
- 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"
- YARN_OPTS="${YARN_OPTS} ${YARN_CLIENT_OPTS}"
- ;;
- *)
- CLASS="${COMMAND}"
- if ! hadoop_validate_classname "${CLASS}"; then
- hadoop_exit_with_usage 1
- fi
- ;;
->>>>>>> 7896815... YARN-2189. [YARN-1492] Admin service for cache manager. (Chris Trezzo via kasha)
esac
if [ -f "${YARN_CONF_DIR}/yarn-env.sh" ]; then
@@ -304,6 +207,9 @@ if [ "$COMMAND" = "classpath" ] ; then
elif [ "$COMMAND" = "rmadmin" ] ; then
CLASS='org.apache.hadoop.yarn.client.cli.RMAdminCLI'
YARN_OPTS="$YARN_OPTS $YARN_CLIENT_OPTS"
+elif [ "$COMMAND" = "scmadmin" ] ; then
+ CLASS='org.apache.hadoop.yarn.client.SCMAdmin'
+ YARN_OPTS="$YARN_OPTS $YARN_CLIENT_OPTS"
elif [ "$COMMAND" = "application" ] ||
[ "$COMMAND" = "applicationattempt" ] ||
[ "$COMMAND" = "container" ]; then
@@ -339,6 +245,13 @@ elif [ "$COMMAND" = "timelineserver" ] ; then
if [ "$YARN_TIMELINESERVER_HEAPSIZE" != "" ]; then
JAVA_HEAP_MAX="-Xmx""$YARN_TIMELINESERVER_HEAPSIZE""m"
fi
+elif [ "$COMMAND" = "sharedcachemanager" ] ; then
+ CLASSPATH=${CLASSPATH}:$YARN_CONF_DIR/scm-config/log4j.properties
+ CLASS='org.apache.hadoop.yarn.server.sharedcachemanager.SharedCacheManager'
+ YARN_OPTS="$YARN_OPTS $YARN_SHAREDCACHEMANAGER_OPTS"
+ if [ "$YARN_SHAREDCACHEMANAGER_HEAPSIZE" != "" ]; then
+ JAVA_HEAP_MAX="-Xmx""$YARN_SHAREDCACHEMANAGER_HEAPSIZE""m"
+ fi
elif [ "$COMMAND" = "nodemanager" ] ; then
CLASSPATH=${CLASSPATH}:$YARN_CONF_DIR/nm-config/log4j.properties
CLASS='org.apache.hadoop.yarn.server.nodemanager.NodeManager'