cluster: STABLE3 - rgmanager: Fix stop/start race

[Lon Hohberger <lon@fedoraproject.org>]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=3ad71b4ee6d277ff87d83683bb65f6d4cc69d905
Commit:        3ad71b4ee6d277ff87d83683bb65f6d4cc69d905
Parent:        6a9c8dbb44439d57a9da92990619a1d47c081136
Author:        Lon Hohberger <lhh@redhat.com>
AuthorDate:    Mon Jun 15 14:18:36 2009 -0400
Committer:     Lon Hohberger <lhh@redhat.com>
CommitterDate: Mon Jun 22 09:32:04 2009 -0400

rgmanager: Fix stop/start race

If a thread exits right as rgmanager gets a request
to start a new thread, there's a chance that the
the starting thread will incorrectly have a reference
to the old thread and not retry when it should.

Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
 rgmanager/src/daemons/rg_thread.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/rgmanager/src/daemons/rg_thread.c b/rgmanager/src/daemons/rg_thread.c
index 1aa64b3..5d22968 100644
--- a/rgmanager/src/daemons/rg_thread.c
+++ b/rgmanager/src/daemons/rg_thread.c
@@ -584,6 +584,8 @@ spawn_if_needed(const char *resgroupname)
 	int ret;
 	resthread_t *resgroup = NULL;
 
+retry:
+	resgroup = NULL;
 	pthread_mutex_lock(&reslist_mutex);
 	while (resgroup == NULL) {
 		resgroup = find_resthread_byname(resgroupname);
@@ -601,8 +603,8 @@ spawn_if_needed(const char *resgroupname)
 	ret = (resgroup->rt_status == RG_STATE_STOPPING);
 
 	pthread_mutex_unlock(&reslist_mutex);
-	if (wait_initialize(resgroupname) < 0) {
-		return -1;
+	if (!ret && wait_initialize(resgroupname) < 0) {
+		goto retry;
 	}
 
 	return ret;