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-common-project/ (props changed) hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/ (props changed) hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed) hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh Propchange: hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project:r1455316 Propchange: hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1455316 Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1465309&r1=1465308&r2=1465309&view=diff ============================================================================== --- hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt Sat Apr 6 22:44:19 2013 @@ -98,6 +98,9 @@ Release 2.0.4-alpha - UNRELEASED HADOOP-9405. TestGridmixSummary#testExecutionSummarizer is broken. (Andrew Wang via atm) + HADOOP-9379. capture the ulimit info after printing the log to the + console. (Arpit Gupta via suresh) + Release 2.0.3-alpha - 2013-02-06 INCOMPATIBLE CHANGES Propchange: hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/CHANGES.txt ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1455316 Modified: hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh?rev=1465309&r1=1465308&r2=1465309&view=diff ============================================================================== --- hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh (original) +++ hadoop/common/branches/branch-2.0.4-alpha/hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh Sat Apr 6 22:44:19 2013 @@ -156,6 +156,7 @@ case $startStop in esac 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 @@ -165,7 +166,6 @@ case $startStop in echo "ulimit -a for user $USER" >> $log ulimit -a >> $log 2>&1 fi - head -30 "$log" sleep 3; if ! ps -p $! > /dev/null ; then exit 1