cluster: STABLE32 - rgmanager: Fix call to service_status()

Lon Hohberger lon at fedoraproject.org
Thu Jan 5 15:59:38 UTC 2012


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=4f4c3909267aef26be4e011f36f06cf8323f5b31
Commit:        4f4c3909267aef26be4e011f36f06cf8323f5b31
Parent:        80c13238212bbc9bf988b8c3ba95bce308a332bb
Author:        Lon Hohberger <lhh at redhat.com>
AuthorDate:    Thu Jan 5 09:03:28 2012 -0500
Committer:     Lon Hohberger <lhh at redhat.com>
CommitterDate: Thu Jan 5 10:09:31 2012 -0500

rgmanager: Fix call to service_status()

This patch simply fixes the calls to service_status(), the
s_trans variable was being incorrectly set.

Signed-off-by: Lon Hohberger <lhh at redhat.com>
---
 rgmanager/src/resources/default_event_script.sl |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/rgmanager/src/resources/default_event_script.sl b/rgmanager/src/resources/default_event_script.sl
index 7b78f12..bd445c0 100644
--- a/rgmanager/src/resources/default_event_script.sl
+++ b/rgmanager/src/resources/default_event_script.sl
@@ -520,7 +520,7 @@ define default_service_event_handler()
 			continue;
 		}
 
-		(d_trans,,,, owner, state) = service_status(services[x], 1);
+		(d_trans,,,,, owner, state) = service_status(services[x], 1);
 		if ((service_state == "started") and (owner < 0) and
 		    (state == "stopped")) {
 			info("Dependency met; starting ", services[x]);
@@ -538,9 +538,12 @@ define default_service_event_handler()
 			% as above is running and the dependent service was
 			% started at or after the service, then stopping it
 			% will result in unwanted service outage.
-			(s_trans,,,, s_state) = service_status(service_name);
+			(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("Skipping ", services[x],
 				      "; restart not needed");
 				continue;


More information about the cluster-commits mailing list