From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lon Hohberger Date: Thu, 25 Jun 2009 17:18:19 -0400 Subject: [Cluster-devel] [PATCH] rgmanager: Allow exit while waiting for fencing Message-ID: <1245964699-5288-1-git-send-email-lhh@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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", -- 1.6.0.6