You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2011/10/03 19:14:23 UTC
svn commit: r1178462 - in /hbase/trunk: CHANGES.txt bin/hbase-daemon.sh
Author: stack
Date: Mon Oct 3 17:14:23 2011
New Revision: 1178462
URL: http://svn.apache.org/viewvc?rev=1178462&view=rev
Log:
HBASE-4526 special case for stopping master in hbase-daemon.sh is no longer required
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/bin/hbase-daemon.sh
Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1178462&r1=1178461&r2=1178462&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Mon Oct 3 17:14:23 2011
@@ -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
Modified: hbase/trunk/bin/hbase-daemon.sh
URL: http://svn.apache.org/viewvc/hbase/trunk/bin/hbase-daemon.sh?rev=1178462&r1=1178461&r2=1178462&view=diff
==============================================================================
--- hbase/trunk/bin/hbase-daemon.sh (original)
+++ hbase/trunk/bin/hbase-daemon.sh Mon Oct 3 17:14:23 2011
@@ -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;