cluster: RHEL59 - rgmanager: Fix return code when relocation fails and svc is running on original node

Ryan McCabe rmccabe at fedoraproject.org
Mon Jul 16 15:09:32 UTC 2012


Gitweb:        http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=13005d1ff5246a332bfc6795ad443b0148cd11b2
Commit:        13005d1ff5246a332bfc6795ad443b0148cd11b2
Parent:        467d015c53e5e2d00025708cda95b3df41ebda1f
Author:        Ryan McCabe <rmccabe at redhat.com>
AuthorDate:    Wed Jul 11 09:11:33 2012 -0400
Committer:     Ryan McCabe <rmccabe at redhat.com>
CommitterDate: Mon Jul 16 11:09:20 2012 -0400

rgmanager: Fix return code when relocation fails and svc is running on original node

Return RG_ERELO (Relocation failure; service running on original node) when
relocation failed and the service was restarted successfully on the original
node.

This is the behavior that's currently in the STABLE32 and RHEL6 branches.

Acked-by: Lon Hohberger <lhh 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 4357d21..9000f1b 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 0;
+			return RG_ERELO;
 		}
 	}
 


More information about the cluster-commits mailing list