From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10153 invoked by alias); 24 Sep 2008 17:58:08 -0000 Received: (qmail 10143 invoked by alias); 24 Sep 2008 17:58:07 -0000 X-Spam-Status: No, hits=-0.3 required=5.0 tests=AWL,BAYES_05,J_CHICKENPOX_43,KAM_MX,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com X-Spam-Level: Subject: master - rgmanager: Wait for fence domain join to complete To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 9f0d36f3fee3c7c00e2f5cf7cbd9ea878220a69d X-Git-Newrev: 0bdab80b760ea52742cb144c53f4c212d2b7c184 From: Lon Hohberger Message-Id: <20080924175655.294E312042E@lists.fedorahosted.org> Date: Wed, 24 Sep 2008 17:58: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: 2008-q3/txt/msg00516.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=0bdab80b760ea52742cb144c53f4c212d2b7c184 Commit: 0bdab80b760ea52742cb144c53f4c212d2b7c184 Parent: 9f0d36f3fee3c7c00e2f5cf7cbd9ea878220a69d Author: Lon Hohberger AuthorDate: Thu Aug 28 16:53:11 2008 -0400 Committer: Lon Hohberger CommitterDate: Wed Sep 24 13:40:12 2008 -0400 rgmanager: Wait for fence domain join to complete rhbz 459754, take 3 --- rgmanager/src/daemons/main.c | 25 ++++++++++++++++++++++++- rgmanager/src/daemons/rg_event.c | 14 ++++++++++++++ 2 files changed, 38 insertions(+), 1 deletions(-) diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c index 89bdcd1..0c168f5 100644 --- a/rgmanager/src/daemons/main.c +++ b/rgmanager/src/daemons/main.c @@ -42,6 +42,9 @@ int svc_exists(char *); int watchdog_init(void); int32_t master_event_callback(char *key, uint64_t viewno, void *data, uint32_t datalen); +int node_has_fencing(int nodeid); +int fence_domain_joined(void); + int shutdown_pending = 0, running = 1, need_reconfigure = 0; char debug = 0; /* XXX* */ static int signalled = 0; @@ -892,7 +895,25 @@ clu_initialize(cman_handle_t *ch) while (cman_is_quorate(*ch) == 0) { sleep(1); } - clulog(LOG_NOTICE, "Quorum formed, starting\n"); + clulog(LOG_NOTICE, "Quorum formed\n"); + } + +} + + +void +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) + sleep(1); + clulog(LOG_INFO, "Fence domain joined\n"); + } else { + clulog(LOG_DEBUG, "Fence domain already joined " + "or no fencing configured\n"); } } @@ -1001,6 +1022,8 @@ main(int argc, char **argv) clulog(LOG_INFO, "I am node #%d\n", my_id()); + wait_for_fencing(); + /* We know we're quorate. At this point, we need to read the resource group trees from ccsd. diff --git a/rgmanager/src/daemons/rg_event.c b/rgmanager/src/daemons/rg_event.c index af3bf08..fc5b1cb 100644 --- a/rgmanager/src/daemons/rg_event.c +++ b/rgmanager/src/daemons/rg_event.c @@ -157,6 +157,20 @@ node_has_fencing(int nodeid) } +/* Since the API for groupd is private, use group_tool to find + out if we've joined the fence domain */ +int +fence_domain_joined(void) +{ + int rv; + + rv = system("group_tool ls fence default &> /dev/null"); + if (rv == 0) + return 1; + return 0; +} + + /** Quick query to cman to see if a node has been fenced. */