This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
rgmanager: master - rgmanager: Unbreak failover
- From: Lon Hohberger <lon at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Thu, 12 Mar 2009 15:11:36 +0000 (UTC)
- Subject: rgmanager: master - rgmanager: Unbreak failover
Gitweb: http://git.fedorahosted.org/git/rgmanager.git?p=rgmanager.git;a=commitdiff;h=f08937ea6541856af198fc18a0369ff55a059c2a
Commit: f08937ea6541856af198fc18a0369ff55a059c2a
Parent: 15e48b31f2d7e3108f9b899a501a3015821e1e2c
Author: Lon Hohberger <lhh@redhat.com>
AuthorDate: Thu Mar 5 16:20:37 2009 -0500
Committer: Lon Hohberger <lhh@redhat.com>
CommitterDate: Thu Mar 12 11:11:20 2009 -0400
rgmanager: Unbreak failover
* group_tool ls isn't what we want anymore; fence_tool ls is
* rgmanager no longer needs to explicitly wait for fencing
since dlm_controld does now.
Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
rgmanager/src/daemons/rg_event.c | 44 +------------------------------------
1 files changed, 2 insertions(+), 42 deletions(-)
diff --git a/rgmanager/src/daemons/rg_event.c b/rgmanager/src/daemons/rg_event.c
index a1a07c6..1c1f195 100644
--- a/rgmanager/src/daemons/rg_event.c
+++ b/rgmanager/src/daemons/rg_event.c
@@ -166,7 +166,7 @@ fence_domain_joined(void)
{
int rv;
- rv = system("group_tool ls fence default &> /dev/null");
+ rv = system("fence_tool ls &> /dev/null");
if (rv == 0)
return 1;
return 0;
@@ -174,26 +174,6 @@ fence_domain_joined(void)
/**
- Quick query to cman to see if a node has been fenced.
- */
-int
-node_fenced(int nodeid)
-{
- cman_handle_t ch;
- int fenced = 0;
- uint64_t fence_time;
-
- ch = cman_init(NULL);
- if (cman_get_fenceinfo(ch, nodeid, &fence_time, &fenced, NULL) < 0)
- fenced = 0;
-
- cman_finish(ch);
-
- return fenced;
-}
-
-
-/**
Callback from view-formation when a commit occurs for the Transition-
Master key.
*/
@@ -376,7 +356,7 @@ _event_thread_f(void __attribute__ ((unused)) *arg)
event_t *ev;
struct timeval now;
struct timespec expire;
- int notice = 0, count = 0;
+ int count = 0;
while (1) {
pthread_mutex_lock(&event_queue_mutex);
@@ -441,26 +421,6 @@ _event_thread_f(void __attribute__ ((unused)) *arg)
ev->ev.node.ne_clean?"Clean":"Dirty")
*/
- if (ev->ev.node.ne_state == 0 &&
- !ev->ev.node.ne_clean &&
- node_has_fencing(ev->ev.node.ne_nodeid)) {
- notice = 0;
- while (!node_fenced(ev->ev.node.ne_nodeid)) {
- if (!notice) {
- notice = 1;
- logt_print(LOG_INFO, "Waiting for "
- "node #%d to be fenced\n",
- ev->ev.node.ne_nodeid);
- }
- sleep(2);
- }
-
- if (notice)
- logt_print(LOG_INFO, "Node #%d fenced; "
- "continuing\n",
- ev->ev.node.ne_nodeid);
- }
-
node_event(ev->ev.node.ne_local,
ev->ev.node.ne_nodeid,
ev->ev.node.ne_state,