From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22653 invoked by alias); 25 Jun 2009 20:03:22 -0000 Received: (qmail 22599 invoked by alias); 25 Jun 2009 20:03:21 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_43,SPF_HELO_PASS X-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_43,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: RHEL5 - rgmanager: Allow exit while waiting for fencing To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/RHEL5 X-Git-Reftype: branch X-Git-Oldrev: 5b0b8f8002f1ab4b4a8cfff92649d9ed50746795 X-Git-Newrev: 6fbdf268d92e2d3567f452c9e92e3898b58564ac From: Lon Hohberger Message-Id: <20090625200258.AA9181201ED@lists.fedorahosted.org> Date: Thu, 25 Jun 2009 20:03:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00765.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=6fbdf268d92e2d3567f452c9e92e3898b58564ac Commit: 6fbdf268d92e2d3567f452c9e92e3898b58564ac Parent: 5b0b8f8002f1ab4b4a8cfff92649d9ed50746795 Author: Lon Hohberger AuthorDate: Thu Jun 25 15:27:52 2009 -0400 Committer: Lon Hohberger CommitterDate: Thu Jun 25 16:02:36 2009 -0400 rgmanager: Allow exit while waiting for fencing Resolves: 508147 Signed-off-by: Lon Hohberger --- rgmanager/src/daemons/main.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c index 94de2d3..d795bab 100644 --- a/rgmanager/src/daemons/main.c +++ b/rgmanager/src/daemons/main.c @@ -952,20 +952,25 @@ clu_initialize(cman_handle_t *ch) } -void +int wait_for_fencing(void) { if (node_has_fencing(my_id()) && !fence_domain_joined()) { clulog(LOG_INFO, "Waiting for fence domain join operation " "to complete\n"); - while (fence_domain_joined() == 0) + while (fence_domain_joined() == 0) { + if (shutdown_pending) + return 1; sleep(1); + } clulog(LOG_INFO, "Fence domain joined\n"); } else { clulog(LOG_DEBUG, "Fence domain already joined " "or no fencing configured\n"); } + + return 0; } @@ -1057,6 +1062,7 @@ main(int argc, char **argv) } if (clu_lock_init(rgmanager_lsname) != 0) { + cman_finish(clu); printf("Locks not working!\n"); return -1; } @@ -1073,7 +1079,8 @@ main(int argc, char **argv) clulog(LOG_INFO, "I am node #%d\n", my_id()); - wait_for_fencing(); + if (wait_for_fencing() != 0) + goto out_cleanup; /* We know we're quorate. At this point, we need to @@ -1087,6 +1094,9 @@ main(int argc, char **argv) return -1; } + if (shutdown_pending) + goto out_cleanup; + if (msg_listen(MSG_SOCKET, RGMGR_SOCK, me.cn_nodeid, &local_ctx) < 0) { clulog(LOG_CRIT, "#10: Couldn't set up cluster message system: %s\n", @@ -1146,6 +1156,8 @@ main(int argc, char **argv) if (rg_initialized()) cleanup(cluster_ctx); + +out_cleanup: clulog(LOG_NOTICE, "Shutdown complete, exiting\n"); clu_lock_finished(rgmanager_lsname); cman_finish(clu);