MAPREDUCE-3578. Starting nodemanager as root gives "Unknown -jvm option"

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1298941 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas White 2012-03-09 17:37:00 +00:00
parent 381a9b2d58
commit 4001b95cf2
2 changed files with 4 additions and 5 deletions

View File

@ -134,6 +134,9 @@ Release 0.23.3 - UNRELEASED
MAPREDUCE-3952. In MR2, when Total input paths to process == 1,
CombinefileInputFormat.getSplits() returns 0 split. (zhenxiao via tucu)
MAPREDUCE-3578. Starting nodemanager as root gives "Unknown -jvm option"
(tomwhite)
Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES

View File

@ -181,11 +181,7 @@ elif [ "$COMMAND" = "resourcemanager" ] ; then
elif [ "$COMMAND" = "nodemanager" ] ; then
CLASSPATH=${CLASSPATH}:$YARN_CONF_DIR/nm-config/log4j.properties
CLASS='org.apache.hadoop.yarn.server.nodemanager.NodeManager'
if [[ $EUID -eq 0 ]]; then
YARN_OPTS="$YARN_OPTS -jvm server $YARN_NODEMANAGER_OPTS"
else
YARN_OPTS="$YARN_OPTS -server $YARN_NODEMANAGER_OPTS"
fi
YARN_OPTS="$YARN_OPTS -server $YARN_NODEMANAGER_OPTS"
if [ "$YARN_NODEMANAGER_HEAPSIZE" != "" ]; then
JAVA_HEAP_MAX="-Xmx""$YARN_NODEMANAGER_HEAPSIZE""m"
fi