You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yarn-commits@hadoop.apache.org by co...@apache.org on 2013/04/07 00:44:19 UTC

svn commit: r1465309 - in /hadoop/common/branches/branch-2.0.4-alpha/hadoop-yarn-project: ./ hadoop-yarn/bin/yarn-daemon.sh

Author: cos
Date: Sat Apr  6 22:44:19 2013
New Revision: 1465309

URL: http://svn.apache.org/r1465309
Log:
svn merge -c1455316 from trunk

HADOOP-9379. capture the ulimit info after printing the log to the console. (Arpit Gupta via suresh)


Modified:
    hadoop/common/branches/branch-2.0.4-alpha/hadoop-yarn-project/   (props changed)
    hadoop/common/branches/branch-2.0.4-alpha/hadoop-yarn-project/hadoop-yarn/bin/yarn-daemon.sh

Propchange: hadoop/common/branches/branch-2.0.4-alpha/hadoop-yarn-project/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk/hadoop-yarn-project:r1455316

Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-yarn-project/hadoop-yarn/bin/yarn-daemon.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-yarn-project/hadoop-yarn/bin/yarn-daemon.sh?rev=1465309&r1=1465308&r2=1465309&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.0.4-alpha/hadoop-yarn-project/hadoop-yarn/bin/yarn-daemon.sh (original)
+++ hadoop/common/branches/branch-2.0.4-alpha/hadoop-yarn-project/hadoop-yarn/bin/yarn-daemon.sh Sat Apr  6 22:44:19 2013
@@ -124,10 +124,10 @@ case $startStop in
     nohup nice -n $YARN_NICENESS "$HADOOP_YARN_HOME"/bin/yarn --config $YARN_CONF_DIR $command "$@" > "$log" 2>&1 < /dev/null &
     echo $! > $pid
     sleep 1
+    head "$log"
     # capture the ulimit output
     echo "ulimit -a" >> $log
     ulimit -a >> $log 2>&1
-    head -30 "$log"
     ;;
           
   (stop)