cluster: STABLE31 - rgmanager: Fix dependency restart bug in CP mode
Lon Hohberger
lon at fedoraproject.org
Wed Oct 19 03:17:28 UTC 2011
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c751d1894640b096808d2f13e331bee4c536f96a
Commit: c751d1894640b096808d2f13e331bee4c536f96a
Parent: 90373b84a47814c38ba030509882bc8cca3fe458
Author: Lon Hohberger <lhh at redhat.com>
AuthorDate: Fri Oct 7 12:31:16 2011 -0400
Committer: Lon Hohberger <lhh at redhat.com>
CommitterDate: Thu Oct 13 16:15:57 2011 -0400
rgmanager: Fix dependency restart bug in CP mode
If we:
- had central_processing mode enabled,
- had a service with 'depend' set on another
service,
- we attempted to restart the service with the
dependency, and
- the dependency was missing
rgmanager would leave the state in 'recovering'
Resolves: rhbz#743442
Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
rgmanager/src/resources/default_event_script.sl | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/rgmanager/src/resources/default_event_script.sl b/rgmanager/src/resources/default_event_script.sl
index 759215c..57f65e9 100644
--- a/rgmanager/src/resources/default_event_script.sl
+++ b/rgmanager/src/resources/default_event_script.sl
@@ -178,6 +178,9 @@ define move_or_start(service, node_list)
(,,, owner, state) = service_status(depends);
if (owner < 0) {
debug(service, " is not runnable; dependency not met");
+ if (state == "recovering") {
+ service_stop(service);
+ }
return ERR_DEPEND;
}
}
More information about the cluster-commits
mailing list