diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 78197c6ba9a..8023e132925 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -542,6 +542,9 @@ Release 2.0.5-beta - UNRELEASED HADOOP-9369. DNS#reverseDns() can return hostname with . appended at the end. (Karthik Kambatla via atm) + HADOOP-9379. capture the ulimit info after printing the log to the + console. (Arpit Gupta via suresh) + Release 2.0.4-alpha - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh index bf03d195e06..ece40eff24f 100755 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-daemon.sh @@ -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 diff --git a/hadoop-yarn-project/hadoop-yarn/bin/yarn-daemon.sh b/hadoop-yarn-project/hadoop-yarn/bin/yarn-daemon.sh index de670facfac..527ae42cfd3 100644 --- a/hadoop-yarn-project/hadoop-yarn/bin/yarn-daemon.sh +++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn-daemon.sh @@ -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)