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

Ryan McCabe rmccabe at fedoraproject.org
Fri May 4 20:07:23 UTC 2012


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c97149047acc1ba3ee502887877d1cfefbb94ea2
Commit:        c97149047acc1ba3ee502887877d1cfefbb94ea2
Parent:        9ee68d33726c9d5b7d5dd5daf16bdef23047cee5
Author:        Ryan McCabe <rmccabe at redhat.com>
AuthorDate:    Fri May 4 15:59:15 2012 -0400
Committer:     Ryan McCabe <rmccabe at redhat.com>
CommitterDate: Fri May 4 15:59:15 2012 -0400

rgmanager: Fix dependent service handling during recovery

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 c54c068..c9cde4b 100644
--- a/rgmanager/src/resources/default_event_script.sl
+++ b/rgmanager/src/resources/default_event_script.sl
@@ -500,8 +500,6 @@ define default_service_event_handler()
 		}
 
 		()=move_or_start(service_name, nodes);
-
-		return;
 	}
 
 	%
@@ -556,6 +554,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