YARN-2438. yarn-env.sh cleanup (aw)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0c8aec43 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0c8aec43 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0c8aec43 Branch: refs/heads/HDFS-6581 Commit: 0c8aec43f0acd4f896df8cd605d97808f9a09887 Parents: 88e329f Author: Allen Wittenauer <a...@apache.org> Authored: Mon Sep 15 14:09:45 2014 -0700 Committer: Allen Wittenauer <a...@apache.org> Committed: Mon Sep 15 14:09:50 2014 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 2 + .../hadoop-yarn/conf/yarn-env.sh | 52 +++++++++++++------- 2 files changed, 37 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0c8aec43/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 629d3b3..b41ad82 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -8,6 +8,8 @@ Trunk - Unreleased IMPROVEMENTS + YARN-2438. yarn-env.sh cleanup (aw) + OPTIMIZATIONS BUG FIXES http://git-wip-us.apache.org/repos/asf/hadoop/blob/0c8aec43/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 755cfd8..0f5e9b7 100644 --- a/hadoop-yarn-project/hadoop-yarn/conf/yarn-env.sh +++ b/hadoop-yarn-project/hadoop-yarn/conf/yarn-env.sh @@ -1,3 +1,4 @@ +# # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with # this work for additional information regarding copyright ownership. @@ -25,27 +26,21 @@ ## ### -# Generic settings for YARN +# YARN-specific overrides for generic settings ### -# User for YARN daemons -export HADOOP_YARN_USER=${HADOOP_YARN_USER:-yarn} - -# -# By default, YARN will use HADOOP_CONF_DIR. Specify a custom -# YARN_CONF_DIR here -# export YARN_CONF_DIR="${YARN_CONF_DIR:-$HADOOP_YARN_HOME/conf}" -# - -# Override Hadoop's log directory & file -# export YARN_LOG_DIR="$HADOOP_YARN_HOME/logs" -# export YARN_LOGFILE='yarn.log' +# By default, YARN will use HADOOP_LOG_DIR for YARN logging. Specify a custom +# log directory for YARN things here: +# export YARN_LOG_DIR="${HADOOP_LOG_DIR}" -# Need a custom-to-YARN service-level authorization policy file? -# export YARN_POLICYFILE="yarn-policy.xml" +# By default, YARN will use the value of HADOOP_LOGFILE as the 'fallback' log +# file # when log4j settings are not defined. Specify a custom YARN log file +# here: +# export YARN_LOGFILE=${HADOOP_LOGFILE} -#Override the log4j settings for all YARN apps -# export YARN_ROOT_LOGGER="INFO,console" +#Override the log4j settings for all YARN apps By default, YARN will use +# HADOOP_ROOT_LOGGER. +# export YARN_ROOT_LOGGER=${HADOOP_ROOT_LOGGER} ### # Resource Manager specific parameters @@ -125,3 +120,26 @@ export HADOOP_YARN_USER=${HADOOP_YARN_USER:-yarn} # #export YARN_TIMELINESERVER_OPTS= +### +# Web App Proxy Server specifc parameters +### + +# Specify the max Heapsize for the proxy 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, +# HADOOP_OPTS, and/or YARN_PROXYSERVER_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_PROXYSERVER_HEAPSIZE=1000 + +# Specify the JVM options to be used when starting the proxy 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_PROXYSERVER_OPTS= + +
