Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge -r 1298940:1298941 from trunk to branch-0.23. Fixes: MAPREDUCE-3578 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298942 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas White 2012-03-09 17:38:10 +00:00
parent db5ad9eed1
commit 4a151380c7
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

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

6
hadoop-mapreduce-project/hadoop-yarn/bin/yarn
View File

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