[SCM] CTDB repository - branch master updated - ctdb-1.12-213-gd8b400d

[Ronnie Sahlberg]

The branch, master has been updated
       via  d8b400d76665f37ffd9de302eedcff9f23807225 (commit)
       via  d3542d43141c1548bab356fbdef34dfedb4f167f (commit)
      from  9b85aa1aa14091dc1de470a587f7c054b9e40078 (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d8b400d76665f37ffd9de302eedcff9f23807225
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Tue Feb 21 19:02:36 2012 +1100

    when shutting down ctdb, allow it 30 seconds instead of 10 before will -9 the daemon

commit d3542d43141c1548bab356fbdef34dfedb4f167f
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Tue Feb 21 19:00:33 2012 +1100

    Log the "Received SHUTDOWN ..." first in the shutown process instead of last.
    
    Sometimes ctdb is termnated ifrom the initscript if the shutdown takes too long an no message is logged.

-----------------------------------------------------------------------

Summary of changes:
 config/ctdb.init      |    2 +-
 server/ctdb_control.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/ctdb.init b/config/ctdb.init
index 9b30b86..0b86344 100755
--- a/config/ctdb.init
+++ b/config/ctdb.init
@@ -313,7 +313,7 @@ stop() {
     while pkill -0 -f $ctdbd ; do
 	sleep 1
 	count=$(($count + 1))
-	[ $count -gt 10 ] && {
+	[ $count -gt 30 ] && {
 	    echo -n $"killing ctdbd "
 	    pkill -9 -f $ctdbd
 	    pkill -9 -f $CTDB_BASE/events.d/
diff --git a/server/ctdb_control.c b/server/ctdb_control.c
index c734588..36b76cd 100644
--- a/server/ctdb_control.c
+++ b/server/ctdb_control.c
@@ -308,6 +308,7 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
 		return 0;
 
 	case CTDB_CONTROL_SHUTDOWN:
+		DEBUG(DEBUG_NOTICE,("Received SHUTDOWN command. Stopping CTDB daemon.\n"));
 		ctdb_stop_recoverd(ctdb);
 		ctdb_stop_keepalive(ctdb);
 		ctdb_stop_monitoring(ctdb);
@@ -316,7 +317,6 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
 			ctdb->methods->shutdown(ctdb);
 		}
 		ctdb_event_script(ctdb, CTDB_EVENT_SHUTDOWN);
-		DEBUG(DEBUG_NOTICE,("Received SHUTDOWN command. Stopping CTDB daemon.\n"));
 		exit(0);
 
 	case CTDB_CONTROL_TAKEOVER_IPv4:


-- 
CTDB repository