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

hadoop-mapreduce-project/CHANGES.txt

@@ -49,6 +49,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

hadoop-mapreduce-project/hadoop-yarn/bin/yarn

@@ -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