cluster: RHEL59 - rgmanager: Don't immediately stop services that have started sucessfully

Ryan McCabe rmccabe at fedoraproject.org
Tue Jul 10 19:57:45 UTC 2012


Gitweb:        http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=5a1d50a8308bb5b40c6a8d990f628bdaa9c20a59
Commit:        5a1d50a8308bb5b40c6a8d990f628bdaa9c20a59
Parent:        55710722d15be8f2eafdae472086182f88b2a0d5
Author:        Ryan McCabe <rmccabe at redhat.com>
AuthorDate:    Thu Jun 28 15:24:48 2012 -0400
Committer:     Ryan McCabe <rmccabe at redhat.com>
CommitterDate: Tue Jul 10 15:56:33 2012 -0400

rgmanager: Don't immediately stop services that have started sucessfully

This patch fixes a bug that caused services to be started, then
immediately stopped during recovery. This occurred when a service
had its recovery policy set to relocate and was in a restricted
failover domain. If starting the service failed on other nodes in the
failover domain, the service would be restarted on the original node,
then immediately stopped, even if it had started successfully. This
patch causes rgmanager to leave the service running if it restarted
successfully.

Resolves: rhbz#789366

Acked-by: Fabio M. Di Nitto <fdinitto at redhat.com>
Signed-off-by: Ryan McCabe <rmccabe at redhat.com>
---
 rgmanager/src/daemons/rg_state.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/rgmanager/src/daemons/rg_state.c b/rgmanager/src/daemons/rg_state.c
index a8b1e36..4357d21 100644
--- a/rgmanager/src/daemons/rg_state.c
+++ b/rgmanager/src/daemons/rg_state.c
@@ -2061,7 +2061,7 @@ exhausted:
 		       svcName);
 		if (svc_start(svcName, RG_START_RECOVER) == 0) {
 			*new_owner = me;
-			return RG_EFAIL;
+			return 0;
 		}
 	}
 


More information about the cluster-commits mailing list