Send Linux-ha-cvs mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: crm by andrew from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Fri, 17 Feb 2006 06:22:19 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/pengine
Modified Files:
native.c ptest.c
Log Message:
Logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -3 -r1.111 -r1.112
--- native.c 15 Feb 2006 13:17:16 -0000 1.111
+++ native.c 17 Feb 2006 13:22:19 -0000 1.112
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.111 2006/02/15 13:17:16 andrew Exp $ */
+/* $Id: native.c,v 1.112 2006/02/17 13:22:19 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -424,9 +424,10 @@
start->uuid);
is_optional = start->optional;
} else {
+ crm_debug_2("Marking %s optional", key);
is_optional = TRUE;
}
-
+
/* start a monitor for an already active resource */
possible_matches = find_actions_exact(rsc->actions, key, node);
if(possible_matches == NULL) {
@@ -436,21 +437,26 @@
mon = custom_action(rsc, key, name, node,
is_optional, TRUE, data_set);
+
+ if(is_optional) {
+ crm_debug("%s\t %s (optional)",
+ crm_str(node_uname), mon->uuid);
+ }
if(start == NULL || start->runnable == FALSE) {
- crm_debug("%s:\t %s (cancelled : start un-runnable)",
+ crm_debug("%s\t %s (cancelled : start un-runnable)",
crm_str(node_uname), mon->uuid);
mon->runnable = FALSE;
} else if(node == NULL
|| node->details->online == FALSE
|| node->details->unclean) {
- crm_debug("%s:\t %s (cancelled : no node available)",
+ crm_debug("%s\t %s (cancelled : no node available)",
crm_str(node_uname), mon->uuid);
mon->runnable = FALSE;
} else if(mon->optional == FALSE) {
- crm_notice("%s:\t %s", crm_str(node_uname),mon->uuid);
+ crm_notice("%s\t %s", crm_str(node_uname),mon->uuid);
}
custom_action_order(rsc, start_key(rsc), NULL,
NULL, crm_strdup(key), mon,
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/ptest.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- ptest.c 14 Feb 2006 12:07:48 -0000 1.71
+++ ptest.c 17 Feb 2006 13:22:19 -0000 1.72
@@ -1,4 +1,4 @@
-/* $Id: ptest.c,v 1.71 2006/02/14 12:07:48 andrew Exp $ */
+/* $Id: ptest.c,v 1.72 2006/02/17 13:22:19 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -326,6 +326,7 @@
dot_write("}");
transition = unpack_graph(data_set.graph);
+ print_graph(LOG_NOTICE, transition);
do {
graph_rc = run_graph(transition);
------------------------------
Message: 2
Date: Fri, 17 Feb 2006 06:22:59 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/pengine/testcases
Modified Files:
bad1.exp bad2.exp comments.exp master-1.exp master-2.exp
master-3.exp rsc_dep1.exp rsc_dep2.exp rsc_dep3.exp
rsc_dep4.exp rsc_dep5.exp rsc_dep7.exp rsc_dep8.exp
simple11.exp simple6.exp
Log Message:
Update the test cases, some synapses now have a priority field
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/bad1.exp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- bad1.exp 30 Sep 2005 13:01:17 -0000 1.20
+++ bad1.exp 17 Feb 2006 13:22:58 -0000 1.21
@@ -1,5 +1,5 @@
<transition_graph global_timeout="60s" transition_id="0">
- <synapse id="0">
+ <synapse id="0" priority="2">
<action_set>
<rsc_op id="3" rsc_id="rsc2" operation="monitor"
operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -8,7 +8,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="1">
+ <synapse id="1" priority="2">
<action_set>
<rsc_op id="6" rsc_id="rsc2" operation="monitor"
operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -17,7 +17,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="2">
+ <synapse id="2" priority="2">
<action_set>
<rsc_op id="8" rsc_id="rsc2" operation="start"
operation_key="rsc2_start_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -30,7 +30,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="3">
+ <synapse id="3" priority="1">
<action_set>
<rsc_op id="4" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc1" class="heartbeat" type="apache"/>
@@ -39,7 +39,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="4">
+ <synapse id="4" priority="1">
<action_set>
<rsc_op id="7" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc1" class="heartbeat" type="apache"/>
@@ -48,7 +48,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="5">
+ <synapse id="5" priority="1">
<action_set>
<rsc_op id="9" rsc_id="rsc1" operation="start"
operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc1" class="heartbeat" type="apache"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/bad2.exp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- bad2.exp 30 Sep 2005 13:01:17 -0000 1.20
+++ bad2.exp 17 Feb 2006 13:22:58 -0000 1.21
@@ -1,5 +1,5 @@
<transition_graph global_timeout="60s" transition_id="0">
- <synapse id="0">
+ <synapse id="0" priority="2">
<action_set>
<rsc_op id="3" rsc_id="rsc2" operation="monitor"
operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -8,7 +8,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="1">
+ <synapse id="1" priority="2">
<action_set>
<rsc_op id="6" rsc_id="rsc2" operation="monitor"
operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -17,7 +17,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="2">
+ <synapse id="2" priority="2">
<action_set>
<rsc_op id="8" rsc_id="rsc2" operation="start"
operation_key="rsc2_start_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -30,7 +30,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="3">
+ <synapse id="3" priority="1">
<action_set>
<rsc_op id="4" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc1" class="heartbeat" type="apache"/>
@@ -39,7 +39,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="4">
+ <synapse id="4" priority="1">
<action_set>
<rsc_op id="7" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc1" class="heartbeat" type="apache"/>
@@ -48,7 +48,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="5">
+ <synapse id="5" priority="1">
<action_set>
<rsc_op id="9" rsc_id="rsc1" operation="start"
operation_key="rsc1_start_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc1" class="heartbeat" type="apache"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/comments.exp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- comments.exp 30 Sep 2005 13:01:17 -0000 1.6
+++ comments.exp 17 Feb 2006 13:22:58 -0000 1.7
@@ -1,5 +1,5 @@
<transition_graph global_timeout="60s" transition_id="0">
- <synapse id="0">
+ <synapse id="0" priority="1">
<action_set>
<rsc_op id="3" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc1" class="heartbeat" type="apache"/>
@@ -8,7 +8,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="1">
+ <synapse id="1" priority="1">
<action_set>
<rsc_op id="6" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc1" class="heartbeat" type="apache"/>
@@ -17,7 +17,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="2">
+ <synapse id="2" priority="1">
<action_set>
<rsc_op id="8" rsc_id="rsc1" operation="start"
operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc1" class="heartbeat" type="apache"/>
@@ -30,7 +30,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="3">
+ <synapse id="3" priority="1">
<action_set>
<rsc_op id="4" rsc_id="rsc2" operation="monitor"
operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -39,7 +39,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="4">
+ <synapse id="4" priority="1">
<action_set>
<rsc_op id="7" rsc_id="rsc2" operation="monitor"
operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -48,7 +48,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="5">
+ <synapse id="5" priority="1">
<action_set>
<rsc_op id="9" rsc_id="rsc2" operation="start"
operation_key="rsc2_start_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc2" class="heartbeat" type="apache"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-1.exp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- master-1.exp 19 Oct 2005 08:30:01 -0000 1.2
+++ master-1.exp 17 Feb 2006 13:22:58 -0000 1.3
@@ -1,5 +1,5 @@
<transition_graph global_timeout="60s" transition_id="0">
- <synapse id="0">
+ <synapse id="0" priority="40">
<action_set>
<rsc_op id="1" rsc_id="rsc1:child_rsc1:3" operation="start"
operation_key="rsc1:child_rsc1:3_start_0" on_node="node2" on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
@@ -12,7 +12,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="1">
+ <synapse id="1" priority="40">
<action_set>
<rsc_op id="2" rsc_id="rsc1:child_rsc1:3" operation="promote"
operation_key="rsc1:child_rsc1:3_promote_0" on_node="node2"
on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
@@ -25,7 +25,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="2">
+ <synapse id="2" priority="30">
<action_set>
<rsc_op id="3" rsc_id="rsc1:child_rsc1:1" operation="start"
operation_key="rsc1:child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
@@ -38,7 +38,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="3">
+ <synapse id="3" priority="20">
<action_set>
<rsc_op id="4" rsc_id="rsc1:child_rsc1:2" operation="start"
operation_key="rsc1:child_rsc1:2_start_0" on_node="node1" on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:2" class="heartbeat" type="apache"/>
@@ -51,7 +51,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="4">
+ <synapse id="4" priority="20">
<action_set>
<rsc_op id="5" rsc_id="rsc1:child_rsc1:2" operation="promote"
operation_key="rsc1:child_rsc1:2_promote_0" on_node="node1"
on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:2" class="heartbeat" type="apache"/>
@@ -64,7 +64,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="5">
+ <synapse id="5" priority="10">
<action_set>
<rsc_op id="6" rsc_id="rsc1:child_rsc1:0" operation="start"
operation_key="rsc1:child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-2.exp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- master-2.exp 14 Feb 2006 12:09:23 -0000 1.3
+++ master-2.exp 17 Feb 2006 13:22:58 -0000 1.4
@@ -1,5 +1,5 @@
<transition_graph global_timeout="60s" transition_id="0">
- <synapse id="0">
+ <synapse id="0" priority="20">
<action_set>
<rsc_op id="1" rsc_id="rsc1:child_rsc1:2" operation="start"
operation_key="rsc1:child_rsc1:2_start_0" on_node="node1" on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:2" class="heartbeat" type="apache"/>
@@ -12,7 +12,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="1">
+ <synapse id="1" priority="20">
<action_set>
<rsc_op id="2" rsc_id="rsc1:child_rsc1:2" operation="promote"
operation_key="rsc1:child_rsc1:2_promote_0" on_node="node1"
on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:2" class="heartbeat" type="apache"/>
@@ -25,7 +25,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="2">
+ <synapse id="2" priority="20">
<action_set>
<rsc_op id="31" rsc_id="rsc1:child_rsc1:2" operation="notify"
operation_key="rsc1:child_rsc1:2_post_notify_start_0" on_node="node1"
on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:2" class="heartbeat" type="apache"/>
@@ -38,7 +38,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="3">
+ <synapse id="3" priority="20">
<action_set>
<rsc_op id="32" rsc_id="rsc1:child_rsc1:2" operation="notify"
operation_key="rsc1:child_rsc1:2_pre_notify_promote_0" on_node="node1"
on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:2" class="heartbeat" type="apache"/>
@@ -51,7 +51,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="4">
+ <synapse id="4" priority="20">
<action_set>
<rsc_op id="33" rsc_id="rsc1:child_rsc1:2" operation="notify"
operation_key="rsc1:child_rsc1:2_post_notify_promote_0" on_node="node1"
on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:2" class="heartbeat" type="apache"/>
@@ -64,7 +64,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="5">
+ <synapse id="5" priority="20">
<action_set>
<rsc_op id="3" rsc_id="rsc1:child_rsc1:3" operation="start"
operation_key="rsc1:child_rsc1:3_start_0" on_node="node2" on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
@@ -77,7 +77,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="6">
+ <synapse id="6" priority="20">
<action_set>
<rsc_op id="4" rsc_id="rsc1:child_rsc1:3" operation="promote"
operation_key="rsc1:child_rsc1:3_promote_0" on_node="node2"
on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
@@ -90,7 +90,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="7">
+ <synapse id="7" priority="20">
<action_set>
<rsc_op id="34" rsc_id="rsc1:child_rsc1:3" operation="notify"
operation_key="rsc1:child_rsc1:3_post_notify_start_0" on_node="node2"
on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
@@ -103,7 +103,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="8">
+ <synapse id="8" priority="20">
<action_set>
<rsc_op id="35" rsc_id="rsc1:child_rsc1:3" operation="notify"
operation_key="rsc1:child_rsc1:3_pre_notify_promote_0" on_node="node2"
on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
@@ -116,7 +116,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="9">
+ <synapse id="9" priority="20">
<action_set>
<rsc_op id="36" rsc_id="rsc1:child_rsc1:3" operation="notify"
operation_key="rsc1:child_rsc1:3_post_notify_promote_0" on_node="node2"
on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
@@ -129,7 +129,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="10">
+ <synapse id="10" priority="10">
<action_set>
<rsc_op id="5" rsc_id="rsc1:child_rsc1:0" operation="start"
operation_key="rsc1:child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
@@ -142,7 +142,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="11">
+ <synapse id="11" priority="10">
<action_set>
<rsc_op id="37" rsc_id="rsc1:child_rsc1:0" operation="notify"
operation_key="rsc1:child_rsc1:0_post_notify_start_0" on_node="node1"
on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
@@ -155,7 +155,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="12">
+ <synapse id="12" priority="10">
<action_set>
<rsc_op id="38" rsc_id="rsc1:child_rsc1:0" operation="notify"
operation_key="rsc1:child_rsc1:0_pre_notify_promote_0" on_node="node1"
on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
@@ -168,7 +168,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="13">
+ <synapse id="13" priority="10">
<action_set>
<rsc_op id="39" rsc_id="rsc1:child_rsc1:0" operation="notify"
operation_key="rsc1:child_rsc1:0_post_notify_promote_0" on_node="node1"
on_node_uuid="uuid1">
<primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
@@ -181,7 +181,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="14">
+ <synapse id="14" priority="10">
<action_set>
<rsc_op id="6" rsc_id="rsc1:child_rsc1:1" operation="start"
operation_key="rsc1:child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
@@ -194,7 +194,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="15">
+ <synapse id="15" priority="10">
<action_set>
<rsc_op id="40" rsc_id="rsc1:child_rsc1:1" operation="notify"
operation_key="rsc1:child_rsc1:1_post_notify_start_0" on_node="node2"
on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
@@ -207,7 +207,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="16">
+ <synapse id="16" priority="10">
<action_set>
<rsc_op id="41" rsc_id="rsc1:child_rsc1:1" operation="notify"
operation_key="rsc1:child_rsc1:1_pre_notify_promote_0" on_node="node2"
on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
@@ -220,7 +220,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="17">
+ <synapse id="17" priority="10">
<action_set>
<rsc_op id="42" rsc_id="rsc1:child_rsc1:1" operation="notify"
operation_key="rsc1:child_rsc1:1_post_notify_promote_0" on_node="node2"
on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-3.exp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- master-3.exp 19 Oct 2005 08:30:01 -0000 1.2
+++ master-3.exp 17 Feb 2006 13:22:58 -0000 1.3
@@ -1,5 +1,5 @@
<transition_graph global_timeout="60s" transition_id="0">
- <synapse id="0">
+ <synapse id="0" priority="140">
<action_set>
<rsc_op id="1" rsc_id="rsc1:child_rsc1:3" operation="start"
operation_key="rsc1:child_rsc1:3_start_0" on_node="node2" on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
@@ -12,7 +12,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="1">
+ <synapse id="1" priority="140">
<action_set>
<rsc_op id="2" rsc_id="rsc1:child_rsc1:3" operation="promote"
operation_key="rsc1:child_rsc1:3_promote_0" on_node="node2"
on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
@@ -25,7 +25,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="2">
+ <synapse id="2" priority="130">
<action_set>
<rsc_op id="3" rsc_id="rsc1:child_rsc1:1" operation="start"
operation_key="rsc1:child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2">
<primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rsc_dep1.exp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- rsc_dep1.exp 30 Sep 2005 13:01:20 -0000 1.15
+++ rsc_dep1.exp 17 Feb 2006 13:22:58 -0000 1.16
@@ -1,5 +1,5 @@
<transition_graph global_timeout="60s" transition_id="0">
- <synapse id="0">
+ <synapse id="0" priority="2">
<action_set>
<rsc_op id="3" rsc_id="rsc2" operation="monitor"
operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -8,7 +8,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="1">
+ <synapse id="1" priority="2">
<action_set>
<rsc_op id="6" rsc_id="rsc2" operation="monitor"
operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -17,7 +17,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="2">
+ <synapse id="2" priority="2">
<action_set>
<rsc_op id="8" rsc_id="rsc2" operation="start"
operation_key="rsc2_start_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -30,7 +30,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="3">
+ <synapse id="3" priority="1">
<action_set>
<rsc_op id="4" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc1" class="heartbeat" type="apache"/>
@@ -39,7 +39,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="4">
+ <synapse id="4" priority="1">
<action_set>
<rsc_op id="7" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc1" class="heartbeat" type="apache"/>
@@ -48,7 +48,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="5">
+ <synapse id="5" priority="1">
<action_set>
<rsc_op id="9" rsc_id="rsc1" operation="start"
operation_key="rsc1_start_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc1" class="heartbeat" type="apache"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rsc_dep2.exp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- rsc_dep2.exp 30 Sep 2005 13:01:20 -0000 1.10
+++ rsc_dep2.exp 17 Feb 2006 13:22:58 -0000 1.11
@@ -1,5 +1,5 @@
<transition_graph global_timeout="60s" transition_id="0">
- <synapse id="0">
+ <synapse id="0" priority="2">
<action_set>
<rsc_op id="3" rsc_id="rsc2" operation="monitor"
operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -8,7 +8,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="1">
+ <synapse id="1" priority="2">
<action_set>
<rsc_op id="7" rsc_id="rsc2" operation="monitor"
operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -17,7 +17,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="2">
+ <synapse id="2" priority="2">
<action_set>
<rsc_op id="10" rsc_id="rsc2" operation="start"
operation_key="rsc2_start_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -30,7 +30,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="3">
+ <synapse id="3" priority="2">
<action_set>
<rsc_op id="4" rsc_id="rsc4" operation="monitor"
operation_key="rsc4_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc4" class="heartbeat" type="apache"/>
@@ -39,7 +39,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="4">
+ <synapse id="4" priority="1">
<action_set>
<rsc_op id="8" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc1" class="heartbeat" type="apache"/>
@@ -48,7 +48,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="5">
+ <synapse id="5" priority="1">
<action_set>
<rsc_op id="5" rsc_id="rsc3" operation="monitor"
operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc3" class="heartbeat" type="apache"/>
@@ -57,7 +57,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="6">
+ <synapse id="6" priority="1">
<action_set>
<rsc_op id="9" rsc_id="rsc3" operation="monitor"
operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc3" class="heartbeat" type="apache"/>
@@ -66,7 +66,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="7">
+ <synapse id="7" priority="1">
<action_set>
<rsc_op id="15" rsc_id="rsc3" operation="start"
operation_key="rsc3_start_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc3" class="heartbeat" type="apache"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rsc_dep3.exp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- rsc_dep3.exp 30 Sep 2005 13:01:20 -0000 1.15
+++ rsc_dep3.exp 17 Feb 2006 13:22:58 -0000 1.16
@@ -1,5 +1,5 @@
<transition_graph global_timeout="60s" transition_id="0">
- <synapse id="0">
+ <synapse id="0" priority="2">
<action_set>
<rsc_op id="3" rsc_id="rsc2" operation="monitor"
operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -8,7 +8,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="1">
+ <synapse id="1" priority="2">
<action_set>
<rsc_op id="6" rsc_id="rsc2" operation="monitor"
operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -17,7 +17,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="2">
+ <synapse id="2" priority="2">
<action_set>
<rsc_op id="8" rsc_id="rsc2" operation="start"
operation_key="rsc2_start_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -30,7 +30,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="3">
+ <synapse id="3" priority="1">
<action_set>
<rsc_op id="4" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc1" class="heartbeat" type="apache"/>
@@ -39,7 +39,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="4">
+ <synapse id="4" priority="1">
<action_set>
<rsc_op id="7" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc1" class="heartbeat" type="apache"/>
@@ -48,7 +48,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="5">
+ <synapse id="5" priority="1">
<action_set>
<rsc_op id="9" rsc_id="rsc1" operation="start"
operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc1" class="heartbeat" type="apache"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rsc_dep4.exp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- rsc_dep4.exp 19 Oct 2005 08:30:01 -0000 1.12
+++ rsc_dep4.exp 17 Feb 2006 13:22:58 -0000 1.13
@@ -1,5 +1,5 @@
<transition_graph global_timeout="60s" transition_id="0">
- <synapse id="0">
+ <synapse id="0" priority="2">
<action_set>
<rsc_op id="3" rsc_id="rsc2" operation="monitor"
operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -8,7 +8,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="1">
+ <synapse id="1" priority="2">
<action_set>
<rsc_op id="6" rsc_id="rsc2" operation="monitor"
operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -17,7 +17,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="2">
+ <synapse id="2" priority="2">
<action_set>
<rsc_op id="10" rsc_id="rsc2" operation="start"
operation_key="rsc2_start_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -30,7 +30,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="3">
+ <synapse id="3" priority="2">
<action_set>
<rsc_op id="7" rsc_id="rsc4" operation="monitor"
operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc4" class="heartbeat" type="apache"/>
@@ -39,7 +39,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="4">
+ <synapse id="4" priority="2">
<action_set>
<rsc_op id="11" rsc_id="rsc4" operation="stop"
operation_key="rsc4_stop_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc4" class="heartbeat" type="apache"/>
@@ -48,7 +48,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="5">
+ <synapse id="5" priority="2">
<action_set>
<rsc_op id="12" rsc_id="rsc4" operation="start"
operation_key="rsc4_start_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc4" class="heartbeat" type="apache"/>
@@ -64,7 +64,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="6">
+ <synapse id="6" priority="1">
<action_set>
<rsc_op id="8" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc1" class="heartbeat" type="apache"/>
@@ -73,7 +73,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="7">
+ <synapse id="7" priority="1">
<action_set>
<rsc_op id="4" rsc_id="rsc3" operation="monitor"
operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc3" class="heartbeat" type="apache"/>
@@ -82,7 +82,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="8">
+ <synapse id="8" priority="1">
<action_set>
<rsc_op id="9" rsc_id="rsc3" operation="monitor"
operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc3" class="heartbeat" type="apache"/>
@@ -91,7 +91,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="9">
+ <synapse id="9" priority="1">
<action_set>
<rsc_op id="15" rsc_id="rsc3" operation="start"
operation_key="rsc3_start_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc3" class="heartbeat" type="apache"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rsc_dep5.exp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- rsc_dep5.exp 30 Sep 2005 13:01:20 -0000 1.15
+++ rsc_dep5.exp 17 Feb 2006 13:22:58 -0000 1.16
@@ -1,5 +1,5 @@
<transition_graph global_timeout="60s" transition_id="0">
- <synapse id="0">
+ <synapse id="0" priority="3">
<action_set>
<rsc_op id="3" rsc_id="rsc3" operation="monitor"
operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc3" class="heartbeat" type="apache"/>
@@ -8,7 +8,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="1">
+ <synapse id="1" priority="3">
<action_set>
<rsc_op id="7" rsc_id="rsc3" operation="monitor"
operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc3" class="heartbeat" type="apache"/>
@@ -17,7 +17,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="2">
+ <synapse id="2" priority="3">
<action_set>
<rsc_op id="10" rsc_id="rsc3" operation="start"
operation_key="rsc3_start_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc3" class="heartbeat" type="apache"/>
@@ -30,7 +30,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="3">
+ <synapse id="3" priority="2">
<action_set>
<rsc_op id="4" rsc_id="rsc2" operation="monitor"
operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -39,7 +39,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="4">
+ <synapse id="4" priority="2">
<action_set>
<rsc_op id="8" rsc_id="rsc2" operation="monitor"
operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -48,7 +48,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="5">
+ <synapse id="5" priority="2">
<action_set>
<rsc_op id="11" rsc_id="rsc2" operation="start"
operation_key="rsc2_start_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -61,7 +61,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="6">
+ <synapse id="6" priority="1">
<action_set>
<rsc_op id="5" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc1" class="heartbeat" type="apache"/>
@@ -70,7 +70,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="7">
+ <synapse id="7" priority="1">
<action_set>
<rsc_op id="9" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc1" class="heartbeat" type="apache"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rsc_dep7.exp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- rsc_dep7.exp 30 Sep 2005 13:01:20 -0000 1.15
+++ rsc_dep7.exp 17 Feb 2006 13:22:58 -0000 1.16
@@ -1,5 +1,5 @@
<transition_graph global_timeout="60s" transition_id="0">
- <synapse id="0">
+ <synapse id="0" priority="3">
<action_set>
<rsc_op id="3" rsc_id="rsc3" operation="monitor"
operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc3" class="heartbeat" type="apache"/>
@@ -8,7 +8,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="1">
+ <synapse id="1" priority="3">
<action_set>
<rsc_op id="7" rsc_id="rsc3" operation="monitor"
operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc3" class="heartbeat" type="apache"/>
@@ -17,7 +17,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="2">
+ <synapse id="2" priority="3">
<action_set>
<rsc_op id="10" rsc_id="rsc3" operation="start"
operation_key="rsc3_start_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc3" class="heartbeat" type="apache"/>
@@ -30,7 +30,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="3">
+ <synapse id="3" priority="2">
<action_set>
<rsc_op id="4" rsc_id="rsc2" operation="monitor"
operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -39,7 +39,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="4">
+ <synapse id="4" priority="2">
<action_set>
<rsc_op id="8" rsc_id="rsc2" operation="monitor"
operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -48,7 +48,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="5">
+ <synapse id="5" priority="2">
<action_set>
<rsc_op id="11" rsc_id="rsc2" operation="start"
operation_key="rsc2_start_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -61,7 +61,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="6">
+ <synapse id="6" priority="1">
<action_set>
<rsc_op id="5" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc1" class="heartbeat" type="apache"/>
@@ -70,7 +70,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="7">
+ <synapse id="7" priority="1">
<action_set>
<rsc_op id="9" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc1" class="heartbeat" type="apache"/>
@@ -79,7 +79,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="8">
+ <synapse id="8" priority="1">
<action_set>
<rsc_op id="12" rsc_id="rsc1" operation="start"
operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc1" class="heartbeat" type="apache"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rsc_dep8.exp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- rsc_dep8.exp 30 Sep 2005 13:01:20 -0000 1.10
+++ rsc_dep8.exp 17 Feb 2006 13:22:58 -0000 1.11
@@ -1,5 +1,5 @@
<transition_graph global_timeout="60s" transition_id="0">
- <synapse id="0">
+ <synapse id="0" priority="2">
<action_set>
<rsc_op id="3" rsc_id="rsc2" operation="monitor"
operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -8,7 +8,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="1">
+ <synapse id="1" priority="2">
<action_set>
<rsc_op id="7" rsc_id="rsc2" operation="monitor"
operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -17,7 +17,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="2">
+ <synapse id="2" priority="2">
<action_set>
<rsc_op id="10" rsc_id="rsc2" operation="start"
operation_key="rsc2_start_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -30,7 +30,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="3">
+ <synapse id="3" priority="2">
<action_set>
<rsc_op id="4" rsc_id="rsc4" operation="monitor"
operation_key="rsc4_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc4" class="heartbeat" type="apache"/>
@@ -39,7 +39,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="4">
+ <synapse id="4" priority="1">
<action_set>
<rsc_op id="8" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc1" class="heartbeat" type="apache"/>
@@ -48,7 +48,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="5">
+ <synapse id="5" priority="1">
<action_set>
<rsc_op id="5" rsc_id="rsc3" operation="monitor"
operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc3" class="heartbeat" type="apache"/>
@@ -57,7 +57,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="6">
+ <synapse id="6" priority="1">
<action_set>
<rsc_op id="9" rsc_id="rsc3" operation="monitor"
operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc3" class="heartbeat" type="apache"/>
@@ -66,7 +66,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="7">
+ <synapse id="7" priority="1">
<action_set>
<rsc_op id="15" rsc_id="rsc3" operation="start"
operation_key="rsc3_start_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc3" class="heartbeat" type="apache"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/simple11.exp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- simple11.exp 30 Sep 2005 13:01:20 -0000 1.19
+++ simple11.exp 17 Feb 2006 13:22:58 -0000 1.20
@@ -1,5 +1,5 @@
<transition_graph global_timeout="60s" transition_id="0">
- <synapse id="0">
+ <synapse id="0" priority="3">
<action_set>
<rsc_op id="3" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc1" class="heartbeat" type="apache"/>
@@ -8,7 +8,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="1">
+ <synapse id="1" priority="3">
<action_set>
<rsc_op id="6" rsc_id="rsc1" operation="monitor"
operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc1" class="heartbeat" type="apache"/>
@@ -17,7 +17,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="2">
+ <synapse id="2" priority="3">
<action_set>
<rsc_op id="8" rsc_id="rsc1" operation="start"
operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc1" class="heartbeat" type="apache"/>
@@ -30,7 +30,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="3">
+ <synapse id="3" priority="2">
<action_set>
<rsc_op id="4" rsc_id="rsc2" operation="monitor"
operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -39,7 +39,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="4">
+ <synapse id="4" priority="2">
<action_set>
<rsc_op id="7" rsc_id="rsc2" operation="monitor"
operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="node2">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -48,7 +48,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="5">
+ <synapse id="5" priority="2">
<action_set>
<rsc_op id="9" rsc_id="rsc2" operation="start"
operation_key="rsc2_start_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc2" class="heartbeat" type="apache"/>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/simple6.exp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- simple6.exp 19 Oct 2005 08:30:01 -0000 1.23
+++ simple6.exp 17 Feb 2006 13:22:58 -0000 1.24
@@ -1,5 +1,5 @@
<transition_graph global_timeout="60s" transition_id="0">
- <synapse id="0">
+ <synapse id="0" priority="2">
<action_set>
<rsc_op id="3" rsc_id="rsc2" operation="monitor"
operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -8,7 +8,7 @@
</action_set>
<inputs/>
</synapse>
- <synapse id="1">
+ <synapse id="1" priority="2">
<action_set>
<rsc_op id="4" rsc_id="rsc2" operation="start"
operation_key="rsc2_start_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc2" class="heartbeat" type="apache"/>
@@ -21,7 +21,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="2">
+ <synapse id="2" priority="1">
<action_set>
<rsc_op id="5" rsc_id="rsc1" operation="stop"
operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1">
<primitive id="rsc1" class="heartbeat" type="apache"/>
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 27, Issue 74
********************************************
