diff --git a/CHANGES.txt b/CHANGES.txt index b2fcec04903..41c839970c1 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -576,6 +576,9 @@ Release 0.92.0 - Unreleased are requested in a Get (Mikhail Bautin) HBASE-4487 The increment operation can release the rowlock before sync-ing the Hlog (dhruba borthakur) + HBASE-4526 special case for stopping master in hbase-daemon.sh is no longer + required (Roman Shaposhnik) + TASKS HBASE-3559 Move report of split to master OFF the heartbeat channel diff --git a/bin/hbase-daemon.sh b/bin/hbase-daemon.sh index ac1aebcc6f5..22c22842ae7 100755 --- a/bin/hbase-daemon.sh +++ b/bin/hbase-daemon.sh @@ -153,13 +153,8 @@ case $startStop in # kill -0 == see if the PID exists if kill -0 `cat $pid` > /dev/null 2>&1; then echo -n stopping $command - if [ "$command" = "master" ]; then - echo "`date` Killing $command" >> $loglog - kill -9 `cat $pid` > /dev/null 2>&1 - else - echo "`date` Killing $command" >> $loglog - kill `cat $pid` > /dev/null 2>&1 - fi + echo "`date` Killing $command" >> $loglog + kill `cat $pid` > /dev/null 2>&1 while kill -0 `cat $pid` > /dev/null 2>&1; do echo -n "." sleep 1;