[Cluster-devel] cluster/rgmanager ChangeLog src/daemons/groups ...

[lhh@sourceware.org <lhh@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	lhh at sourceware.org	2007-07-31 18:26:39

Modified files:
	rgmanager      : ChangeLog 
	rgmanager/src/daemons: groups.c rg_thread.c 

Log message:
	Fix #246669

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/ChangeLog.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.5.2.28&r2=1.5.2.29
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/groups.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.8.2.19&r2=1.8.2.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/rg_thread.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.7.2.9&r2=1.7.2.10

--- cluster/rgmanager/ChangeLog	2007/06/28 12:04:02	1.5.2.28
+++ cluster/rgmanager/ChangeLog	2007/07/31 18:26:39	1.5.2.29
@@ -1,3 +1,7 @@
+2007-07-31 Lon Hohberger <lhh@redhat.com>
+	* src/daemons/groups.c, rg_thread.c: Fix #246669 - status check unbounded
+	but should be 1
+
 2007-06-28 Marek Grac <mgrac@redhat.com>
 	* src/resources/named.sh, named.metadata: Add resource agent
 	for named (fix #213524)
--- cluster/rgmanager/src/daemons/groups.c	2007/05/03 15:02:47	1.8.2.19
+++ cluster/rgmanager/src/daemons/groups.c	2007/07/31 18:26:39	1.8.2.20
@@ -877,7 +877,7 @@
 			continue;
 
 		rt_enqueue_request(name, RG_STATUS,
-				   -1, 0, NODE_ID_NONE, 0, 0);
+				   -1, 1, NODE_ID_NONE, 0, 0);
 
 	} while (!list_done(&_tree, curr));
 
--- cluster/rgmanager/src/daemons/rg_thread.c	2007/01/04 15:52:41	1.7.2.9
+++ cluster/rgmanager/src/daemons/rg_thread.c	2007/07/31 18:26:39	1.7.2.10
@@ -598,7 +598,6 @@
 			} while (!list_done(resgroup->rt_queue, curr));
 	
 			if (count >= max) {
-				pthread_cond_broadcast(resgroup->rt_queue_cond);
 				pthread_mutex_unlock(resgroup->rt_queue_mutex);
 				pthread_mutex_unlock(&reslist_mutex);
 				/*