From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26354 invoked by alias); 28 Aug 2008 20:55:12 -0000 Received: (qmail 26348 invoked by alias); 28 Aug 2008 20:55:11 -0000 X-Spam-Status: No, hits=0.2 required=5.0 tests=AWL,BAYES_40,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: RHEL5 - 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/RHEL5 X-Git-Reftype: branch X-Git-Oldrev: f92fd23fde054edc4585145e5b7122c1addb95b4 X-Git-Newrev: 6417845e62ce91d9e5d188ef0be4b605b64007ea From: Lon Hohberger Message-Id: <20080828205408.BD43912037A@lists.fedorahosted.org> Date: Thu, 28 Aug 2008 20:55: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/msg00357.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=6417845e62ce91d9e5d188ef0be4b605b64007ea Commit: 6417845e62ce91d9e5d188ef0be4b605b64007ea Parent: f92fd23fde054edc4585145e5b7122c1addb95b4 Author: Lon Hohberger AuthorDate: Thu Aug 28 16:53:11 2008 -0400 Committer: Lon Hohberger CommitterDate: Thu Aug 28 16:53:54 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 8401bca..b722ab2 100644 --- a/rgmanager/src/daemons/main.c +++ b/rgmanager/src/daemons/main.c @@ -60,6 +60,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; @@ -909,7 +912,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"); } } @@ -1018,6 +1039,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 f614668..7df0e6c 100644 --- a/rgmanager/src/daemons/rg_event.c +++ b/rgmanager/src/daemons/rg_event.c @@ -174,6 +174,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. */