[Cluster-devel] cluster/rgmanager/src/daemons rg_state.c

[lhh at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	lhh at sourceware.org	2007-06-22 14:23:04

Modified files:
	rgmanager/src/daemons: rg_state.c 

Log message:
	Make exclusive resources work again

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/rg_state.c.diff?cvsroot=cluster&r1=1.33&r2=1.34

--- cluster/rgmanager/src/daemons/rg_state.c	2007/06/14 15:06:51	1.33
+++ cluster/rgmanager/src/daemons/rg_state.c	2007/06/22 14:23:04	1.34
@@ -1592,7 +1592,7 @@
 handle_start_req(char *svcName, int req, int *new_owner)
 {
 	int ret, tolerance = FOD_BEST;
-//	cluster_member_list_t *membership = member_list();
+	cluster_member_list_t *membership = member_list();
 	int need_check = have_exclusive_resources();
 
 	/*
@@ -1601,7 +1601,6 @@
 	 */
 	if (req == RG_ENABLE)
 		tolerance = FOD_GOOD;
-/*	
 	if (req != RG_RESTART &&
 	    req != RG_START_RECOVER &&
 	    (node_should_start_safe(my_id(), membership, svcName) <
@@ -1622,7 +1621,7 @@
 		}
 	}
 	free_member_list(membership);
-*/
+
 	/* Check for dependency.  We cannot start unless our
 	   dependency is met */
 	if (check_depend_safe(svcName) == 0)