public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
* cluster: STABLE3 - cman: Tidy up cman sockets when we exit
@ 2009-03-20 9:00 Christine Caulfield
0 siblings, 0 replies; only message in thread
From: Christine Caulfield @ 2009-03-20 9:00 UTC (permalink / raw)
To: cluster-cvs-relay
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=64b4ae12b61e66ce1720d7bdda0cc4adf6353bc5
Commit: 64b4ae12b61e66ce1720d7bdda0cc4adf6353bc5
Parent: 10dd5397419c8eeab1ebe77342fae5fb4fe4c0fd
Author: Christine Caulfield <ccaulfie@redhat.com>
AuthorDate: Fri Mar 20 08:59:46 2009 +0000
Committer: Christine Caulfield <ccaulfie@redhat.com>
CommitterDate: Fri Mar 20 08:59:46 2009 +0000
cman: Tidy up cman sockets when we exit
Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>
---
cman/daemon/commands.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c
index 3c1d893..ac8d33e 100644
--- a/cman/daemon/commands.c
+++ b/cman/daemon/commands.c
@@ -962,8 +962,10 @@ static int do_cmd_leave_cluster(char *cmdbuf, int *retlen)
quit_threads = 1;
/* No messaging available yet, just die */
- if (!we_are_a_cluster_member)
+ if (!we_are_a_cluster_member) {
+ cman_finish();
exit(0);
+ }
send_leave(leave_flags);
use_count = 0;
@@ -1865,6 +1867,7 @@ static void do_process_transition(int nodeid, char *data)
if (msg->flags & NODE_FLAGS_SEESDISALLOWED && !have_disallowed()) {
/* Must use syslog directly here or the message will never arrive */
syslog(LOG_CRIT, "CMAN: Joined a cluster with disallowed nodes. must die");
+ cman_finish();
exit(2);
}
msg->flags &= ~NODE_FLAGS_SEESDISALLOWED;
@@ -2027,6 +2030,7 @@ static void process_internal_message(char *data, int nodeid, int need_byteswap)
/* Must use syslog directly here or the message will never arrive */
syslog(LOG_CRIT, "cman killed by node %d because %s\n", nodeid,
killmsg_reason(killmsg->reason));
+ cman_finish();
exit(1);
}
break;
@@ -2040,6 +2044,7 @@ static void process_internal_message(char *data, int nodeid, int need_byteswap)
/* Tell whomever asked us to leave that we are now going down */
if (shutdown_con)
send_status_return(shutdown_con, CMAN_CMD_TRY_SHUTDOWN, 0);
+ cman_finish();
exit(0);
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-03-20 9:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-03-20 9:00 cluster: STABLE3 - cman: Tidy up cman sockets when we exit Christine Caulfield
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).