cluster: STABLE32 - Revert "rgmanager: Fix dependency issue related to ordering"
Lon Hohberger
lon at fedoraproject.org
Thu Jan 5 16:32:42 UTC 2012
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=8ce53c09ea6fe55b18ae15ad8620dd1873ff43cb
Commit: 8ce53c09ea6fe55b18ae15ad8620dd1873ff43cb
Parent: 4b7a2a2cc9b87ec9e31d6d4b05ee11c5519deb41
Author: Lon Hohberger <lhh at redhat.com>
AuthorDate: Thu Jan 5 11:31:22 2012 -0500
Committer: Lon Hohberger <lhh at redhat.com>
CommitterDate: Thu Jan 5 11:31:22 2012 -0500
Revert "rgmanager: Fix dependency issue related to ordering"
This reverts commit 4b7a2a2cc9b87ec9e31d6d4b05ee11c5519deb41.
---
rgmanager/src/resources/default_event_script.sl | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/rgmanager/src/resources/default_event_script.sl b/rgmanager/src/resources/default_event_script.sl
index 4cdf519..bd445c0 100644
--- a/rgmanager/src/resources/default_event_script.sl
+++ b/rgmanager/src/resources/default_event_script.sl
@@ -176,9 +176,7 @@ define move_or_start(service, node_list)
depends = service_property(service, "depend");
if (depends != "") {
(,,, owner, state) = service_status(depends);
- if ((owner < 0) or
- ((event_type == EVENT_NODE) and (owner == node_id) and
- (node_state == 0))) {
+ if (owner < 0) {
debug(service, " is not runnable; dependency not met");
()=service_stop(service);
return ERR_DEPEND;
@@ -543,8 +541,8 @@ define default_service_event_handler()
(s_trans,,,,,, s_state) = service_status(service_name, 1);
if ((s_state == "started") and (state == "started") and
(d_trans >= s_trans)) {
- debug("S:", service_name, " trans ", s_trans);
- debug("D:", services[x], " trans ", d_trans);
+ %debug("S:", service_name, " trans ", s_trans);
+ %debug("D:", services[x], " trans ", d_trans);
debug("Skipping ", services[x],
"; restart not needed");
More information about the cluster-commits
mailing list