cluster: STABLE3 - rgmanager: Unbreak failover

cluster: STABLE3 - rgmanager: Unbreak failover

[Lon Hohberger]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=a54949644f498bd426e3f3ef0c3deafb02a8836b
Commit:        a54949644f498bd426e3f3ef0c3deafb02a8836b
Parent:        678d2b3a6244a0c2b4efd82a123a7a48b575de52
Author:        Lon Hohberger <lhh@redhat.com>
AuthorDate:    Thu Mar 5 16:20:37 2009 -0500
Committer:     Lon Hohberger <lhh@redhat.com>
CommitterDate: Thu Mar 5 16:20:37 2009 -0500

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 cb36db6..7321e25 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;
 
 	/* Event thread usually doesn't hang around.  When it's
    	   spawned, sleep for this many seconds in order to let
@@ -448,26 +428,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,