This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
cluster: STABLE3 - rgmanager: follow-service.sl stack cleanup
- From: Lon Hohberger <lon at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Fri, 26 Jun 2009 18:21:02 +0000 (UTC)
- Subject: cluster: STABLE3 - rgmanager: follow-service.sl stack cleanup
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=92d85564d00ec060b68ad4ba4414e0e099568d7b
Commit: 92d85564d00ec060b68ad4ba4414e0e099568d7b
Parent: d7e0c8fae414decf89a9ae498207eaf5dee9f7ab
Author: Lon Hohberger <lhh@redhat.com>
AuthorDate: Tue Jun 23 15:43:14 2009 -0400
Committer: Lon Hohberger <lhh@redhat.com>
CommitterDate: Fri Jun 26 14:20:57 2009 -0400
rgmanager: follow-service.sl stack cleanup
Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
rgmanager/src/resources/follow-service.sl | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/rgmanager/src/resources/follow-service.sl b/rgmanager/src/resources/follow-service.sl
index b7dca85..4f1e724 100644
--- a/rgmanager/src/resources/follow-service.sl
+++ b/rgmanager/src/resources/follow-service.sl
@@ -40,7 +40,7 @@ define nodelist_online(service_name) {
%
define follow_service(svc1, svc2, master) %, followslave)
{
- variable state, owner_svc1, owner_svc2;
+ variable state_svc1, state_svc2, owner_svc1, owner_svc2;
variable nodes1, nodes2, allowed;
debug("*** FOLLOW_SERVICE: follow_service(",svc1,", ",svc2,", ", master, ")");
@@ -55,11 +55,11 @@ define follow_service(svc1, svc2, master) %, followslave)
}
% get infos we need to decide further
- (owner_svc1, state) = service_status(svc1);
- (owner_svc2, state) = service_status(svc2);
+ (,,, owner_svc1, state_svc1) = service_status(svc1);
+ (,,, owner_svc2, state_svc2) = service_status(svc2);
nodes1 = nodelist_online(svc1);
nodes2 = nodelist_online(svc2);
- debug("*** FOLLOW_SERVICE: service_status(",svc1,"): ", service_status(svc1));
+ debug("*** FOLLOW_SERVICE: service_status(",svc1,"): ", state_svc1);
debug("*** FOLLOW_SERVICE: owner_svc1: ", owner_svc1, ", owner_svc2: ", owner_svc2, ", nodes1: ", nodes1, ", nodes2: ", nodes2);
if (((event_type == EVENT_NODE) and (owner_svc1 == node_id) and (node_state == NODE_OFFLINE) and (owner_svc2 >=0)) or
@@ -91,7 +91,7 @@ define follow_service(svc1, svc2, master) %, followslave)
% either svc2 is the master or there are node were to start svc2
if ((master == svc2) or (length(allowed) > 0)) {
()=service_stop(svc2);
- ()=service_start(svc2, allowed);
+ ()=service_start(svc2, allowed);
}
}
else if (((event_type == EVENT_NODE) and (owner_svc2 == node_id) and (node_state == NODE_OFFLINE) and (owner_svc2 >=0)) or