cluster: RHEL510 - rgmanager: Fix dependent service handling during recovery

Ryan McCabe rmccabe at fedoraproject.org
Mon Feb 18 18:32:01 UTC 2013


Gitweb:        http://git.fedorahosted.org/git/?p=cluster.git;a=commitdiff;h=e6c64dc7a0a6432151fc88c22796d76deed180b7
Commit:        e6c64dc7a0a6432151fc88c22796d76deed180b7
Parent:        75c20f80a14595f912814bb78e66fc5702c82296
Author:        Ryan McCabe <rmccabe at redhat.com>
AuthorDate:    Fri May 4 15:59:15 2012 -0400
Committer:     Ryan McCabe <rmccabe at redhat.com>
CommitterDate: Mon Feb 18 13:29:37 2013 -0500

rgmanager: Fix dependent service handling during recovery

Resolves: rhbz#909459

Signed-off-by: Ryan McCabe <rmccabe at redhat.com>
Acked-by: Lon Hohberger <lhh at redhat.com>
---
 rgmanager/src/resources/default_event_script.sl |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/rgmanager/src/resources/default_event_script.sl b/rgmanager/src/resources/default_event_script.sl
index 62de2d2..d337f76 100644
--- a/rgmanager/src/resources/default_event_script.sl
+++ b/rgmanager/src/resources/default_event_script.sl
@@ -480,8 +480,6 @@ define default_service_event_handler()
 		}
 
 		()=move_or_start(service_name, nodes);
-
-		return;
 	}
 
 	%
@@ -536,6 +534,10 @@ define default_service_event_handler()
 		}
 	}
 
+	if (service_state == "recovering") {
+		return;
+	}
+
 	%
 	% Try to restart exclusive service which might have been recently
 	% stopped in order to make room for other exclusive services.


More information about the cluster-commits mailing list