HADOOP-9379. Merging change 1455316 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1455318 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
95efc3d0fc
commit
b15c6f6721
|
@ -74,6 +74,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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue