You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by su...@apache.org on 2013/03/11 21:40:26 UTC
svn commit: r1455323 - in /hadoop/common/branches/branch-1.2: CHANGES.txt
bin/hadoop-daemon.sh
Author: suresh
Date: Mon Mar 11 20:40:25 2013
New Revision: 1455323
URL: http://svn.apache.org/r1455323
Log:
HADOOP-9379. Merging change r1455320 from branch-1.
Modified:
hadoop/common/branches/branch-1.2/CHANGES.txt
hadoop/common/branches/branch-1.2/bin/hadoop-daemon.sh
Modified: hadoop/common/branches/branch-1.2/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/CHANGES.txt?rev=1455323&r1=1455322&r2=1455323&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.2/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.2/CHANGES.txt Mon Mar 11 20:40:25 2013
@@ -518,6 +518,9 @@ Release 1.2.0 - unreleased
HDFS-4558. Fix the NPE thrown when starting balancer. (Junping Du via szetszwo)
+ HADOOP-9379. capture the ulimit info after printing the log to the console.
+ (Arpit Gupta via suresh)
+
Release 1.1.2 - 2013.01.30
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-1.2/bin/hadoop-daemon.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.2/bin/hadoop-daemon.sh?rev=1455323&r1=1455322&r2=1455323&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.2/bin/hadoop-daemon.sh (original)
+++ hadoop/common/branches/branch-1.2/bin/hadoop-daemon.sh Mon Mar 11 20:40:25 2013
@@ -137,6 +137,7 @@ case $startStop in
nohup nice -n $HADOOP_NICENESS "$HADOOP_PREFIX"/bin/hadoop --config $HADOOP_CONF_DIR $command "$@" > "$log" 2>&1 < /dev/null &
echo $! > $pid
sleep 1
+ head "$log"
# capture the ulimit output
if [ "true" = "$starting_secure_dn" ]; then
echo "ulimit -a for secure datanode user $HADOOP_SECURE_DN_USER" >> $log
@@ -146,7 +147,6 @@ case $startStop in
echo "ulimit -a for user $USER" >> $log
ulimit -a >> $log 2>&1
fi
- head -30 "$log"
;;
(stop)