From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12724 invoked by alias); 26 Jun 2009 18:21:38 -0000 Received: (qmail 12716 invoked by alias); 26 Jun 2009 18:21:38 -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: STABLE3 - 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/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 92d85564d00ec060b68ad4ba4414e0e099568d7b X-Git-Newrev: d060cdd752140cf23f56650635755fd807000624 From: Lon Hohberger Message-Id: <20090626182104.C5D8012028E@lists.fedorahosted.org> Date: Fri, 26 Jun 2009 18:21: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/msg00778.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d060cdd752140cf23f56650635755fd807000624 Commit: d060cdd752140cf23f56650635755fd807000624 Parent: 92d85564d00ec060b68ad4ba4414e0e099568d7b Author: Lon Hohberger AuthorDate: Thu Jun 25 15:27:52 2009 -0400 Committer: Lon Hohberger CommitterDate: Fri Jun 26 14:20:58 2009 -0400 rgmanager: Allow exit while waiting for fencing Resolves: 508147 Signed-off-by: Lon Hohberger --- rgmanager/src/daemons/main.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c index 8f9fc2f..88970f1 100644 --- a/rgmanager/src/daemons/main.c +++ b/rgmanager/src/daemons/main.c @@ -853,20 +853,25 @@ cman_connect(cman_handle_t *ch) } -static void +static int wait_for_fencing(void) { if (node_has_fencing(my_id()) && !fence_domain_joined()) { logt_print(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); + } logt_print(LOG_INFO, "Fence domain joined\n"); } else { logt_print(LOG_DEBUG, "Fence domain already joined " "or no fencing configured\n"); } + + return 0; } @@ -963,7 +968,8 @@ main(int argc, char **argv) logt_print(LOG_INFO, "I am node #%d\n", my_id()); - wait_for_fencing(); + if (wait_for_fencing() != 0) + goto out; /* We know we're quorate. At this point, we need to @@ -977,6 +983,9 @@ main(int argc, char **argv) return -1; } + if (shutdown_pending) + goto out; + if (msg_listen(MSG_SOCKET, RGMGR_SOCK, me.cn_nodeid, &local_ctx) < 0) { logt_print(LOG_CRIT, "#10: Couldn't set up cluster message system: %s\n",