cluster: STABLE3 - rgmanager: Fix error recovery with central_processing

Lon Hohberger lon at fedoraproject.org
Mon Oct 26 21:50:12 UTC 2009


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=8d8de2f9eb192684fce8a3f773fb1176d83cfa7f
Commit:        8d8de2f9eb192684fce8a3f773fb1176d83cfa7f
Parent:        709037b5d4d131f7bb306bb6e1ce1797e6556858
Author:        Lon Hohberger <lhh at redhat.com>
AuthorDate:    Mon Oct 26 17:38:42 2009 -0400
Committer:     Lon Hohberger <lhh at redhat.com>
CommitterDate: Mon Oct 26 17:49:49 2009 -0400

rgmanager: Fix error recovery with central_processing

Resolves: rhbz#530409

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

diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c
index 4d53e63..95a73ca 100644
--- a/rgmanager/src/daemons/rg_state.c
+++ b/rgmanager/src/daemons/rg_state.c
@@ -2052,7 +2052,8 @@ handle_start_remote_req(char *svcName, int req)
 	if (need_check)
 		pthread_mutex_unlock(&exclusive_mutex);
 
-	if (svc_stop(svcName, RG_STOP_RECOVER) == 0)
+	if (svc_stop(svcName, central_events_enabled() ?
+		     RG_STATE_STOPPED : RG_STOP_RECOVER) == 0)
 		return RG_EFAIL;
 
 	svc_fail(svcName);


More information about the cluster-commits mailing list