Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
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
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Thu, 27 Jul 2006 04:01:17 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
829.dot 829.exp master-7.dot master-7.exp master-8.dot
master-8.exp rec-node-11.dot rec-node-11.exp rec-node-13.dot
rec-node-13.exp rec-node-4.dot rec-node-4.exp rec-node-6.dot
rec-node-6.exp rec-node-7.dot rec-node-7.exp rec-rsc-5.dot
rec-rsc-5.exp
Log Message:
STONITH events need to inputs to start events (not stops)
Making them inputs to stops leaves us open to graph loops when resources
with "stop before" ordering dependancies fail (ie. groups)
Graph loops prevent us from making progress
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/829.dot,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- 829.dot 18 Jul 2006 06:19:33 -0000 1.18
+++ 829.dot 27 Jul 2006 10:01:15 -0000 1.19
@@ -48,9 +48,9 @@
"child_DoFencing:0_monitor_0 c001n01" -> "probe_complete c001n01" [ style =
bold]
"child_DoFencing:1_monitor_0 c001n01" -> "probe_complete c001n01" [ style =
bold]
"child_DoFencing:3_monitor_0 c001n01" -> "probe_complete c001n01" [ style =
bold]
-"stonith c001n02" -> "rsc_c001n02_stop_0 c001n02" [ style = bold]
"probe_complete" -> "rsc_c001n02_start_0 c001n03" [ style = bold]
"rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n03" [ style = bold]
+"stonith c001n02" -> "rsc_c001n02_start_0 c001n03" [ style = bold]
"rsc_c001n02_start_0 c001n03" -> "rsc_c001n02_monitor_5000 c001n03" [ style =
bold]
"DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n02" [ style = bold]
"child_DoFencing:0_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = bold]
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/829.exp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- 829.exp 18 Jul 2006 06:19:33 -0000 1.28
+++ 829.exp 27 Jul 2006 10:01:15 -0000 1.29
@@ -68,11 +68,7 @@
<attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</pseudo_event>
</action_set>
- <inputs>
- <trigger>
- <crm_event id="51" operation="stonith" operation_key="stonith"
on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
- </trigger>
- </inputs>
+ <inputs/>
</synapse>
<synapse id="8">
<action_set>
@@ -88,6 +84,9 @@
<trigger>
<pseudo_event id="33" operation="stop"
operation_key="rsc_c001n02_stop_0"/>
</trigger>
+ <trigger>
+ <crm_event id="51" operation="stonith" operation_key="stonith"
on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+ </trigger>
</inputs>
</synapse>
<synapse id="9">
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-7.dot,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- master-7.dot 18 Jul 2006 06:19:33 -0000 1.7
+++ master-7.dot 27 Jul 2006 10:01:15 -0000 1.8
@@ -66,8 +66,8 @@
"ocf_msdummy:4_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
"ocf_msdummy:5_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
"ocf_msdummy:6_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
-"stonith c001n01" -> "DcIPaddr_stop_0 c001n01" [ style = bold]
"DcIPaddr_stop_0 c001n01" -> "DcIPaddr_start_0 c001n03" [ style = bold]
+"stonith c001n01" -> "DcIPaddr_start_0 c001n03" [ style = bold]
"DcIPaddr_start_0 c001n03" -> "DcIPaddr_monitor_5000 c001n03" [ style = bold]
"heartbeat_192.168.100.182_stop_0 c001n03" -> "ocf_192.168.100.181_stop_0
c001n03" [ style = bold]
"ocf_192.168.100.181_stop_0 c001n03" -> "ocf_192.168.100.181_start_0 c001n02"
[ style = bold]
@@ -89,8 +89,8 @@
"group-1_stop_0" -> "group-1_stopped_0" [ style = bold]
"lsb_dummy_stop_0 c001n02" -> "lsb_dummy_start_0 c001n08" [ style = bold]
"lsb_dummy_start_0 c001n08" -> "lsb_dummy_monitor_5000 c001n08" [ style = bold]
-"stonith c001n01" -> "rsc_c001n01_stop_0 c001n01" [ style = bold]
"rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n03" [ style = bold]
+"stonith c001n01" -> "rsc_c001n01_start_0 c001n03" [ style = bold]
"rsc_c001n01_start_0 c001n03" -> "rsc_c001n01_monitor_5000 c001n03" [ style =
bold]
"DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n01" [ style = bold]
"child_DoFencing:0_stop_0 c001n01" -> "DoFencing_stopped_0" [ style = bold]
@@ -99,9 +99,7 @@
"stonith c001n01" -> "ocf_msdummy:0_demote_0 c001n01" [ style = bold]
"ocf_msdummy:0_demote_0 c001n01" -> "ocf_msdummy:0_stop_0 c001n01" [ style =
bold]
"master_rsc_1_stop_0" -> "ocf_msdummy:0_stop_0 c001n01" [ style = bold]
-"stonith c001n01" -> "ocf_msdummy:0_stop_0 c001n01" [ style = bold]
"master_rsc_1_stop_0" -> "ocf_msdummy:4_stop_0 c001n01" [ style = bold]
-"stonith c001n01" -> "ocf_msdummy:4_stop_0 c001n01" [ style = bold]
"master_rsc_1_demote_0" -> "master_rsc_1_stop_0" [ style = bold]
"master_rsc_1_demoted_0" -> "master_rsc_1_stop_0" [ style = bold]
"ocf_msdummy:0_stop_0 c001n01" -> "master_rsc_1_stopped_0" [ style = bold]
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-7.exp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- master-7.exp 18 Jul 2006 06:19:33 -0000 1.12
+++ master-7.exp 27 Jul 2006 10:01:15 -0000 1.13
@@ -5,11 +5,7 @@
<attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</pseudo_event>
</action_set>
- <inputs>
- <trigger>
- <crm_event id="96" operation="stonith" operation_key="stonith"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
- </trigger>
- </inputs>
+ <inputs/>
</synapse>
<synapse id="1">
<action_set>
@@ -22,6 +18,9 @@
<trigger>
<pseudo_event id="34" operation="stop"
operation_key="DcIPaddr_stop_0"/>
</trigger>
+ <trigger>
+ <crm_event id="96" operation="stonith" operation_key="stonith"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ </trigger>
</inputs>
</synapse>
<synapse id="2">
@@ -257,11 +256,7 @@
<attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</pseudo_event>
</action_set>
- <inputs>
- <trigger>
- <crm_event id="96" operation="stonith" operation_key="stonith"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
- </trigger>
- </inputs>
+ <inputs/>
</synapse>
<synapse id="20">
<action_set>
@@ -274,6 +269,9 @@
<trigger>
<pseudo_event id="53" operation="stop"
operation_key="rsc_c001n01_stop_0"/>
</trigger>
+ <trigger>
+ <crm_event id="96" operation="stonith" operation_key="stonith"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ </trigger>
</inputs>
</synapse>
<synapse id="21">
@@ -442,9 +440,6 @@
<trigger>
<pseudo_event id="90" operation="stop"
operation_key="master_rsc_1_stop_0"/>
</trigger>
- <trigger>
- <crm_event id="96" operation="stonith" operation_key="stonith"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
- </trigger>
</inputs>
</synapse>
<synapse id="37" priority="1000000">
@@ -484,9 +479,6 @@
<trigger>
<pseudo_event id="90" operation="stop"
operation_key="master_rsc_1_stop_0"/>
</trigger>
- <trigger>
- <crm_event id="96" operation="stonith" operation_key="stonith"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
- </trigger>
</inputs>
</synapse>
<synapse id="41">
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-8.dot,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- master-8.dot 18 Jul 2006 06:19:33 -0000 1.7
+++ master-8.dot 27 Jul 2006 10:01:15 -0000 1.8
@@ -71,8 +71,8 @@
"ocf_msdummy:4_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
"ocf_msdummy:5_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
"ocf_msdummy:6_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
-"stonith c001n01" -> "DcIPaddr_stop_0 c001n01" [ style = bold]
"DcIPaddr_stop_0 c001n01" -> "DcIPaddr_start_0 c001n03" [ style = bold]
+"stonith c001n01" -> "DcIPaddr_start_0 c001n03" [ style = bold]
"DcIPaddr_start_0 c001n03" -> "DcIPaddr_monitor_5000 c001n03" [ style = bold]
"heartbeat_192.168.100.182_stop_0 c001n03" -> "ocf_192.168.100.181_stop_0
c001n03" [ style = bold]
"ocf_192.168.100.181_stop_0 c001n03" -> "ocf_192.168.100.181_start_0 c001n02"
[ style = bold]
@@ -94,17 +94,17 @@
"group-1_stop_0" -> "group-1_stopped_0" [ style = bold]
"lsb_dummy_stop_0 c001n02" -> "lsb_dummy_start_0 c001n08" [ style = bold]
"lsb_dummy_start_0 c001n08" -> "lsb_dummy_monitor_5000 c001n08" [ style = bold]
-"stonith c001n01" -> "rsc_c001n01_stop_0 c001n01" [ style = bold]
"rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n03" [ style = bold]
+"stonith c001n01" -> "rsc_c001n01_start_0 c001n03" [ style = bold]
"rsc_c001n01_start_0 c001n03" -> "rsc_c001n01_monitor_5000 c001n03" [ style =
bold]
"DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n01" [ style = bold]
"child_DoFencing:0_stop_0 c001n01" -> "DoFencing_stopped_0" [ style = bold]
"DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold]
"ocf_msdummy:0_demote_0 c001n01" -> "ocf_msdummy:0_stop_0 c001n01" [ style =
bold]
"master_rsc_1_stop_0" -> "ocf_msdummy:0_stop_0 c001n01" [ style = bold]
-"stonith c001n01" -> "ocf_msdummy:0_stop_0 c001n01" [ style = bold]
"ocf_msdummy:0_stop_0 c001n01" -> "ocf_msdummy:0_start_0 c001n03" [ style =
bold]
"master_rsc_1_start_0" -> "ocf_msdummy:0_start_0 c001n03" [ style = bold]
+"stonith c001n01" -> "ocf_msdummy:0_start_0 c001n03" [ style = bold]
"master_rsc_1_demote_0" -> "ocf_msdummy:0_demote_0 c001n01" [ style = bold]
"stonith c001n01" -> "ocf_msdummy:0_demote_0 c001n01" [ style = bold]
"ocf_msdummy:0_start_0 c001n03" -> "ocf_msdummy:0_monitor_5000 c001n03" [
style = bold]
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-8.exp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- master-8.exp 18 Jul 2006 06:19:33 -0000 1.13
+++ master-8.exp 27 Jul 2006 10:01:15 -0000 1.14
@@ -5,11 +5,7 @@
<attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</pseudo_event>
</action_set>
- <inputs>
- <trigger>
- <crm_event id="95" operation="stonith" operation_key="stonith"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
- </trigger>
- </inputs>
+ <inputs/>
</synapse>
<synapse id="1">
<action_set>
@@ -22,6 +18,9 @@
<trigger>
<pseudo_event id="34" operation="stop"
operation_key="DcIPaddr_stop_0"/>
</trigger>
+ <trigger>
+ <crm_event id="95" operation="stonith" operation_key="stonith"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ </trigger>
</inputs>
</synapse>
<synapse id="2">
@@ -257,11 +256,7 @@
<attributes crm_feature_set="1.0.6" CRM_meta_timeout="180000"/>
</pseudo_event>
</action_set>
- <inputs>
- <trigger>
- <crm_event id="95" operation="stonith" operation_key="stonith"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
- </trigger>
- </inputs>
+ <inputs/>
</synapse>
<synapse id="20">
<action_set>
@@ -274,6 +269,9 @@
<trigger>
<pseudo_event id="53" operation="stop"
operation_key="rsc_c001n01_stop_0"/>
</trigger>
+ <trigger>
+ <crm_event id="95" operation="stonith" operation_key="stonith"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ </trigger>
</inputs>
</synapse>
<synapse id="21">
@@ -373,9 +371,6 @@
<trigger>
<pseudo_event id="89" operation="stop"
operation_key="master_rsc_1_stop_0"/>
</trigger>
- <trigger>
- <crm_event id="95" operation="stonith" operation_key="stonith"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
- </trigger>
</inputs>
</synapse>
<synapse id="30">
@@ -392,6 +387,9 @@
<trigger>
<pseudo_event id="87" operation="start"
operation_key="master_rsc_1_start_0"/>
</trigger>
+ <trigger>
+ <crm_event id="95" operation="stonith" operation_key="stonith"
on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+ </trigger>
</inputs>
</synapse>
<synapse id="31">
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-11.dot,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- rec-node-11.dot 18 Jul 2006 06:16:01 -0000 1.5
+++ rec-node-11.dot 27 Jul 2006 10:01:15 -0000 1.6
@@ -14,15 +14,15 @@
"rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"stonith node1" [ style=bold color="green" fontcolor="black" ]
"rsc2_stop_0 node1" -> "rsc1_stop_0 node1" [ style = bold]
-"stonith node1" -> "rsc1_stop_0 node1" [ style = bold]
"probe_complete node2" -> "probe_complete" [ style = bold]
"rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
"rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold]
"rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold]
"group1_start_0" -> "rsc1_start_0 node2" [ style = bold]
-"stonith node1" -> "rsc2_stop_0 node1" [ style = bold]
+"stonith node1" -> "rsc1_start_0 node2" [ style = bold]
"rsc1_start_0 node2" -> "rsc2_start_0 node2" [ style = bold]
"rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold]
+"stonith node1" -> "rsc2_start_0 node2" [ style = bold]
"probe_complete" -> "group1_start_0" [ style = bold]
"rsc3_start_0 node2" -> "group1_start_0" [ style = bold]
"rsc2_start_0 node2" -> "group1_running_0" [ style = bold]
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-11.exp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- rec-node-11.exp 22 Jun 2006 16:23:31 -0000 1.12
+++ rec-node-11.exp 27 Jul 2006 10:01:15 -0000 1.13
@@ -39,9 +39,6 @@
<trigger>
<pseudo_event id="7" operation="stop" operation_key="rsc2_stop_0"/>
</trigger>
- <trigger>
- <crm_event id="15" operation="stonith" operation_key="stonith"
on_node="node1" on_node_uuid="uuid1"/>
- </trigger>
</inputs>
</synapse>
<synapse id="3" priority="1000000">
@@ -67,6 +64,9 @@
<trigger>
<pseudo_event id="9" operation="start"
operation_key="group1_start_0"/>
</trigger>
+ <trigger>
+ <crm_event id="15" operation="stonith" operation_key="stonith"
on_node="node1" on_node_uuid="uuid1"/>
+ </trigger>
</inputs>
</synapse>
<synapse id="5" priority="1000000">
@@ -84,11 +84,7 @@
<attributes crm_feature_set="1.0.6" CRM_meta_id="stop-2"
CRM_meta_on_fail="block" CRM_meta_timeout="60000" CRM_meta_name="stop"/>
</pseudo_event>
</action_set>
- <inputs>
- <trigger>
- <crm_event id="15" operation="stonith" operation_key="stonith"
on_node="node1" on_node_uuid="uuid1"/>
- </trigger>
- </inputs>
+ <inputs/>
</synapse>
<synapse id="7">
<action_set>
@@ -104,6 +100,9 @@
<trigger>
<pseudo_event id="7" operation="stop" operation_key="rsc2_stop_0"/>
</trigger>
+ <trigger>
+ <crm_event id="15" operation="stonith" operation_key="stonith"
on_node="node1" on_node_uuid="uuid1"/>
+ </trigger>
</inputs>
</synapse>
<synapse id="8">
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-13.dot,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- rec-node-13.dot 18 Jul 2006 06:16:01 -0000 1.2
+++ rec-node-13.dot 27 Jul 2006 10:01:15 -0000 1.3
@@ -6,7 +6,6 @@
"master_rsc_1_demote_0" [ style=bold color="green" fontcolor="orange" ]
"stonith c001n04" [ style=bold color="green" fontcolor="black" ]
"master_rsc_1_stop_0" -> "ocf_msdummy:6_stop_0 c001n04" [ style = bold]
-"stonith c001n04" -> "ocf_msdummy:6_stop_0 c001n04" [ style = bold]
"master_rsc_1_demote_0" -> "master_rsc_1_stop_0" [ style = bold]
"ocf_msdummy:6_stop_0 c001n04" -> "master_rsc_1_stopped_0" [ style = bold]
"master_rsc_1_stop_0" -> "master_rsc_1_stopped_0" [ style = bold]
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-13.exp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- rec-node-13.exp 3 Jul 2006 11:50:49 -0000 1.3
+++ rec-node-13.exp 27 Jul 2006 10:01:15 -0000 1.4
@@ -9,9 +9,6 @@
<trigger>
<pseudo_event id="74" operation="stop"
operation_key="master_rsc_1_stop_0"/>
</trigger>
- <trigger>
- <crm_event id="80" operation="stonith" operation_key="stonith"
on_node="c001n04" on_node_uuid="9e080e6d-7a25-4dac-be89-f6f4f128623d"/>
- </trigger>
</inputs>
</synapse>
<synapse id="1">
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-4.dot,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- rec-node-4.dot 24 May 2006 20:50:30 -0000 1.7
+++ rec-node-4.dot 27 Jul 2006 10:01:15 -0000 1.8
@@ -9,13 +9,13 @@
"rsc2_stop_0 node1" [ style=bold color="green" fontcolor="orange" ]
"rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"stonith node1" [ style=bold color="green" fontcolor="black" ]
-"stonith node1" -> "rsc1_stop_0 node1" [ style = bold]
"probe_complete node2" -> "probe_complete" [ style = bold]
"rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
"rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold]
"rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold]
"probe_complete" -> "rsc1_start_0 node2" [ style = bold]
-"stonith node1" -> "rsc2_stop_0 node1" [ style = bold]
+"stonith node1" -> "rsc1_start_0 node2" [ style = bold]
"probe_complete" -> "rsc2_start_0 node2" [ style = bold]
"rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold]
+"stonith node1" -> "rsc2_start_0 node2" [ style = bold]
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-4.exp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- rec-node-4.exp 22 Jun 2006 16:23:31 -0000 1.25
+++ rec-node-4.exp 27 Jul 2006 10:01:16 -0000 1.26
@@ -5,11 +5,7 @@
<attributes crm_feature_set="1.0.6" CRM_meta_id="stop-1"
CRM_meta_on_fail="block" CRM_meta_timeout="60000" CRM_meta_name="stop"/>
</pseudo_event>
</action_set>
- <inputs>
- <trigger>
- <crm_event id="9" operation="stonith" operation_key="stonith"
on_node="node1" on_node_uuid="uuid1"/>
- </trigger>
- </inputs>
+ <inputs/>
</synapse>
<synapse id="1" priority="1000000">
<action_set>
@@ -34,6 +30,9 @@
<trigger>
<pseudo_event id="2" operation="probe_complete"
operation_key="probe_complete"/>
</trigger>
+ <trigger>
+ <crm_event id="9" operation="stonith" operation_key="stonith"
on_node="node1" on_node_uuid="uuid1"/>
+ </trigger>
</inputs>
</synapse>
<synapse id="3" priority="1000000">
@@ -51,11 +50,7 @@
<attributes crm_feature_set="1.0.6" CRM_meta_id="stop-2"
CRM_meta_on_fail="block" CRM_meta_timeout="60000" CRM_meta_name="stop"/>
</pseudo_event>
</action_set>
- <inputs>
- <trigger>
- <crm_event id="9" operation="stonith" operation_key="stonith"
on_node="node1" on_node_uuid="uuid1"/>
- </trigger>
- </inputs>
+ <inputs/>
</synapse>
<synapse id="5">
<action_set>
@@ -71,6 +66,9 @@
<trigger>
<pseudo_event id="7" operation="stop" operation_key="rsc2_stop_0"/>
</trigger>
+ <trigger>
+ <crm_event id="9" operation="stonith" operation_key="stonith"
on_node="node1" on_node_uuid="uuid1"/>
+ </trigger>
</inputs>
</synapse>
<synapse id="6">
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-6.dot,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- rec-node-6.dot 24 May 2006 20:50:30 -0000 1.7
+++ rec-node-6.dot 27 Jul 2006 10:01:16 -0000 1.8
@@ -9,13 +9,13 @@
"rsc2_stop_0 node1" [ style=bold color="green" fontcolor="orange" ]
"rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"stonith node1" [ style=bold color="green" fontcolor="black" ]
-"stonith node1" -> "rsc1_stop_0 node1" [ style = bold]
"probe_complete node2" -> "probe_complete" [ style = bold]
"rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
"rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold]
"rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold]
"probe_complete" -> "rsc1_start_0 node2" [ style = bold]
-"stonith node1" -> "rsc2_stop_0 node1" [ style = bold]
+"stonith node1" -> "rsc1_start_0 node2" [ style = bold]
"probe_complete" -> "rsc2_start_0 node2" [ style = bold]
"rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold]
+"stonith node1" -> "rsc2_start_0 node2" [ style = bold]
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-6.exp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- rec-node-6.exp 22 Jun 2006 16:23:31 -0000 1.25
+++ rec-node-6.exp 27 Jul 2006 10:01:16 -0000 1.26
@@ -5,11 +5,7 @@
<attributes crm_feature_set="1.0.6" CRM_meta_id="stop-1"
CRM_meta_on_fail="block" CRM_meta_timeout="60000" CRM_meta_name="stop"/>
</pseudo_event>
</action_set>
- <inputs>
- <trigger>
- <crm_event id="9" operation="stonith" operation_key="stonith"
on_node="node1" on_node_uuid="uuid1"/>
- </trigger>
- </inputs>
+ <inputs/>
</synapse>
<synapse id="1" priority="1000000">
<action_set>
@@ -34,6 +30,9 @@
<trigger>
<pseudo_event id="2" operation="probe_complete"
operation_key="probe_complete"/>
</trigger>
+ <trigger>
+ <crm_event id="9" operation="stonith" operation_key="stonith"
on_node="node1" on_node_uuid="uuid1"/>
+ </trigger>
</inputs>
</synapse>
<synapse id="3" priority="1000000">
@@ -51,11 +50,7 @@
<attributes crm_feature_set="1.0.6" CRM_meta_id="stop-2"
CRM_meta_on_fail="block" CRM_meta_timeout="60000" CRM_meta_name="stop"/>
</pseudo_event>
</action_set>
- <inputs>
- <trigger>
- <crm_event id="9" operation="stonith" operation_key="stonith"
on_node="node1" on_node_uuid="uuid1"/>
- </trigger>
- </inputs>
+ <inputs/>
</synapse>
<synapse id="5">
<action_set>
@@ -71,6 +66,9 @@
<trigger>
<pseudo_event id="7" operation="stop" operation_key="rsc2_stop_0"/>
</trigger>
+ <trigger>
+ <crm_event id="9" operation="stonith" operation_key="stonith"
on_node="node1" on_node_uuid="uuid1"/>
+ </trigger>
</inputs>
</synapse>
<synapse id="6">
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-7.dot,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- rec-node-7.dot 24 May 2006 20:50:30 -0000 1.7
+++ rec-node-7.dot 27 Jul 2006 10:01:16 -0000 1.8
@@ -9,13 +9,13 @@
"rsc2_stop_0 node1" [ style=bold color="green" fontcolor="orange" ]
"rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ]
"stonith node1" [ style=bold color="green" fontcolor="black" ]
-"stonith node1" -> "rsc1_stop_0 node1" [ style = bold]
"probe_complete node2" -> "probe_complete" [ style = bold]
"rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
"rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold]
"rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold]
"probe_complete" -> "rsc1_start_0 node2" [ style = bold]
-"stonith node1" -> "rsc2_stop_0 node1" [ style = bold]
+"stonith node1" -> "rsc1_start_0 node2" [ style = bold]
"probe_complete" -> "rsc2_start_0 node2" [ style = bold]
"rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold]
+"stonith node1" -> "rsc2_start_0 node2" [ style = bold]
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-7.exp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- rec-node-7.exp 22 Jun 2006 16:23:31 -0000 1.25
+++ rec-node-7.exp 27 Jul 2006 10:01:16 -0000 1.26
@@ -5,11 +5,7 @@
<attributes crm_feature_set="1.0.6" CRM_meta_id="stop-1"
CRM_meta_on_fail="block" CRM_meta_timeout="60000" CRM_meta_name="stop"/>
</pseudo_event>
</action_set>
- <inputs>
- <trigger>
- <crm_event id="9" operation="stonith" operation_key="stonith"
on_node="node1" on_node_uuid="uuid1"/>
- </trigger>
- </inputs>
+ <inputs/>
</synapse>
<synapse id="1" priority="1000000">
<action_set>
@@ -34,6 +30,9 @@
<trigger>
<pseudo_event id="2" operation="probe_complete"
operation_key="probe_complete"/>
</trigger>
+ <trigger>
+ <crm_event id="9" operation="stonith" operation_key="stonith"
on_node="node1" on_node_uuid="uuid1"/>
+ </trigger>
</inputs>
</synapse>
<synapse id="3" priority="1000000">
@@ -51,11 +50,7 @@
<attributes crm_feature_set="1.0.6" CRM_meta_id="stop-2"
CRM_meta_on_fail="block" CRM_meta_timeout="60000" CRM_meta_name="stop"/>
</pseudo_event>
</action_set>
- <inputs>
- <trigger>
- <crm_event id="9" operation="stonith" operation_key="stonith"
on_node="node1" on_node_uuid="uuid1"/>
- </trigger>
- </inputs>
+ <inputs/>
</synapse>
<synapse id="5">
<action_set>
@@ -71,6 +66,9 @@
<trigger>
<pseudo_event id="7" operation="stop" operation_key="rsc2_stop_0"/>
</trigger>
+ <trigger>
+ <crm_event id="9" operation="stonith" operation_key="stonith"
on_node="node1" on_node_uuid="uuid1"/>
+ </trigger>
</inputs>
</synapse>
<synapse id="6">
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-rsc-5.dot,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- rec-rsc-5.dot 24 May 2006 20:50:30 -0000 1.9
+++ rec-rsc-5.dot 27 Jul 2006 10:01:16 -0000 1.10
@@ -9,12 +9,12 @@
"rsc2_stop_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc2_start_0 node1" [ style=bold color="green" fontcolor="black" ]
"stonith node2" [ style=bold color="green" fontcolor="black" ]
-"stonith node2" -> "rsc1_stop_0 node2" [ style = bold]
"probe_complete node1" -> "probe_complete" [ style = bold]
"rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold]
"rsc2_monitor_0 node1" -> "probe_complete node1" [ style = bold]
"rsc1_stop_0 node2" -> "rsc1_start_0 node1" [ style = bold]
"probe_complete" -> "rsc1_start_0 node1" [ style = bold]
+"stonith node2" -> "rsc1_start_0 node1" [ style = bold]
"probe_complete" -> "rsc2_start_0 node1" [ style = bold]
"rsc2_stop_0 node2" -> "rsc2_start_0 node1" [ style = bold]
"rsc2_stop_0 node2" -> "stonith node2" [ style = bold]
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-rsc-5.exp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- rec-rsc-5.exp 22 Jun 2006 16:23:31 -0000 1.27
+++ rec-rsc-5.exp 27 Jul 2006 10:01:16 -0000 1.28
@@ -5,11 +5,7 @@
<attributes crm_feature_set="1.0.6" CRM_meta_id="stop-1"
CRM_meta_on_fail="fence" CRM_meta_timeout="60000" CRM_meta_name="stop"/>
</pseudo_event>
</action_set>
- <inputs>
- <trigger>
- <crm_event id="9" operation="stonith" operation_key="stonith"
on_node="node2" on_node_uuid="uuid2"/>
- </trigger>
- </inputs>
+ <inputs/>
</synapse>
<synapse id="1" priority="1000000">
<action_set>
@@ -34,6 +30,9 @@
<trigger>
<pseudo_event id="2" operation="probe_complete"
operation_key="probe_complete"/>
</trigger>
+ <trigger>
+ <crm_event id="9" operation="stonith" operation_key="stonith"
on_node="node2" on_node_uuid="uuid2"/>
+ </trigger>
</inputs>
</synapse>
<synapse id="3" priority="1000000">
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 32, Issue 68
********************************************
