cluster: RHEL5 - rgmanager: Fix stack overflows on stress testing

cluster: RHEL5 - rgmanager: Fix stack overflows on stress testing

[Lon Hohberger]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c2600ba9290b8e3d35f4a8d0fb0d2c01c71a6021
Commit:        c2600ba9290b8e3d35f4a8d0fb0d2c01c71a6021
Parent:        e3835309fe31d96795f47513aecb6629cb46faa0
Author:        Lon Hohberger <lhh@redhat.com>
AuthorDate:    Fri Jun 19 18:20:46 2009 -0400
Committer:     Lon Hohberger <lhh@redhat.com>
CommitterDate: Mon Jun 22 14:16:08 2009 -0400

rgmanager: Fix stack overflows on stress testing

S/Lang requires you to eat all the values on the
stack if not assigned, or you can discard all values,
but you can't take 2/5 without explicitly discarding
the other three.

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

diff --git a/rgmanager/src/resources/default_event_script.sl b/rgmanager/src/resources/default_event_script.sl
index 9144526..7809b20 100644
--- a/rgmanager/src/resources/default_event_script.sl
+++ b/rgmanager/src/resources/default_event_script.sl
@@ -36,7 +36,7 @@ define separate_nodes(node_list)
 	len = length(services);
 	for (x = 0; x < len; x++) {
 
-		(owner, state) = service_status(services[x]);
+		(,,, owner, state) = service_status(services[x]);
 		if (owner < 0) {
 			continue;
 		}
@@ -99,7 +99,7 @@ define exclusive_prioritize(svc, node_list)
 			continue;
 		}
 
-		(owner, state) = service_status(services[x]);
+		(,,, owner, state) = service_status(services[x]);
 		if (owner < 0) {
 			continue;
 		}
@@ -148,14 +148,14 @@ define move_or_start(service, node_list)
 
 	depends = service_property(service, "depend");
 	if (depends != "") {
-		(owner, state) = service_status(depends);
+		(,,, owner, state) = service_status(depends);
 		if (owner < 0) {
 			debug(service, " is not runnable; dependency not met");
 			return ERR_DEPEND;
 		}
 	}
 
-	(owner, state) = service_status(service);
+	(,,, owner, state) = service_status(service);
 	debug("Evaluating ", service, " state=", state, " owner=", owner);
 
 	len = length(node_list);
@@ -220,7 +220,7 @@ define allowed_nodes(service)
 	(nofailback, restricted, ordered, nodes_domain) =
 			service_domain_info(service);
 
-	(owner, state) = service_status(service);
+	(,,, owner, state) = service_status(service);
 
 	anodes = nodes_online();
 
@@ -270,7 +270,7 @@ define allowed_nodes(service)
 
 	(nofailback, restricted, ordered, nodes_domain) =
 			service_domain_info(service);
-	(owner, state) = service_status(service);
+	(,,, owner, state) = service_status(service);
 
 	anodes = nodes_online();
 
@@ -481,7 +481,7 @@ define default_service_event_handler()
 			continue;
 		}
 
-		(owner, state) = service_status(services[x]);
+		(,,, owner, state) = service_status(services[x]);
 		if ((service_state == "started") and (owner < 0) and
 		    (state == "stopped")) {
 			info("Dependency met; starting ", services[x]);
@@ -514,7 +514,7 @@ define default_user_event_handler()
 	variable owner, state;
 
 	nodes = allowed_nodes(service_name);
-	(owner, state) = service_status(service_name);
+	(,,, owner, state) = service_status(service_name);
 
 	if (user_request == USER_RESTART) {