You are viewing a plain text version of this content. The canonical link for it is here.

Posted to mapreduce-commits@hadoop.apache.org by to...@apache.org on 2012/03/09 18:37:01 UTC

svn commit: r1298941 - in /hadoop/common/trunk/hadoop-mapreduce-project: CHANGES.txt hadoop-yarn/bin/yarn

Author: tomwhite
Date: Fri Mar  9 17:37:00 2012
New Revision: 1298941

URL: http://svn.apache.org/viewvc?rev=1298941&view=rev
Log:
MAPREDUCE-3578. Starting nodemanager as root gives "Unknown -jvm option"

Modified:
    hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
    hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/yarn

Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1298941&r1=1298940&r2=1298941&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Fri Mar  9 17:37:00 2012
@@ -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

Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/yarn
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/yarn?rev=1298941&r1=1298940&r2=1298941&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/yarn (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/bin/yarn Fri Mar  9 17:37:00 2012
@@ -181,11 +181,7 @@ elif [ "$COMMAND" = "resourcemanager" ] 
 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