[SCM] CTDB repository - branch master updated - ctdb-1.13-194-g1a6a011

[Ronnie Sahlberg]

The branch, master has been updated
       via  1a6a011c772f7d302d114d7c8a151fa7820ec85f (commit)
      from  ac89da4eea98fa686408c5671a6c44c0fd1d7a58 (commit)

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


- Log -----------------------------------------------------------------
commit 1a6a011c772f7d302d114d7c8a151fa7820ec85f
Author: Ronnie Sahlberg <ronniesahlb...@gmail.com>
Date:   Wed May 30 11:50:13 2012 +1000

    Run the shutdown eventscript before we tear down the transport
    
    This allows eventscripts to still be able to call and use ctdb during the 
shutdown phase.

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

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


Changeset truncated at 500 lines:

diff --git a/server/ctdb_control.c b/server/ctdb_control.c
index 5c1eedd..9708acd 100644
--- a/server/ctdb_control.c
+++ b/server/ctdb_control.c
@@ -323,10 +323,10 @@ static int32_t ctdb_control_dispatch(struct ctdb_context 
*ctdb,
                ctdb_stop_keepalive(ctdb);
                ctdb_stop_monitoring(ctdb);
                ctdb_release_all_ips(ctdb);
+               ctdb_event_script(ctdb, CTDB_EVENT_SHUTDOWN);
                if (ctdb->methods != NULL) {
                        ctdb->methods->shutdown(ctdb);
                }
-               ctdb_event_script(ctdb, CTDB_EVENT_SHUTDOWN);
                exit(0);
 
        case CTDB_CONTROL_TAKEOVER_IPv4:


-- 
CTDB repository