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) 2. Linux-HA CVS: crm by andrew from (linux-ha-cvs@lists.linux-ha.org) ---------------------------------------------------------------------- Message: 1 Date: Wed, 24 May 2006 14:49:28 -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 Modified Files: graph.c Log Message: Marking the resource failed was not necessary and may have unexpected consequences - so revert that part of the patch =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/graph.c,v retrieving revision 1.92 retrieving revision 1.93 diff -u -3 -r1.92 -r1.93 --- graph.c 24 May 2006 20:45:57 -0000 1.92 +++ graph.c 24 May 2006 20:49:28 -0000 1.93 @@ -1,4 +1,4 @@ -/* $Id: graph.c,v 1.92 2006/05/24 20:45:57 andrew Exp $ */ +/* $Id: graph.c,v 1.93 2006/05/24 20:49:28 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> * @@ -257,7 +257,6 @@ /* the stop would never complete and is * now implied by the stonith operation */ - rsc->failed = TRUE; action->pseudo = TRUE; action->runnable = TRUE; if(action->optional) { ------------------------------ Message: 2 Date: Wed, 24 May 2006 14:50:31 -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-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: Update the testcases - stonith ordering on stops (instead of starts) - more pseudo ops marked runnable when their children are =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/829.dot,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- 829.dot 15 May 2006 09:40:54 -0000 1.14 +++ 829.dot 24 May 2006 20:50:30 -0000 1.15 @@ -42,8 +42,8 @@ "child_DoFencing:3_start_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ] "DoFencing_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "DoFencing_running_0" [ style="dashed" color="blue" fontcolor="orange" ] -"DoFencing_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] -"DoFencing_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ] +"DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] +"DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "stonith c001n02" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_start_0 c001n08" -> "rsc_c001n08_monitor_5000 c001n08" [ style = dashed] "DcIPaddr_start_0 c001n08" -> "DcIPaddr_monitor_5000 c001n08" [ style = dashed] @@ -70,15 +70,16 @@ "DcIPaddr_stop_0 c001n08" -> "DcIPaddr_start_0 c001n08" [ style = dashed] "probe_complete" -> "rsc_c001n08_start_0 c001n08" [ style = dashed] "rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_start_0 c001n08" [ style = dashed] +"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] "probe_complete" -> "rsc_c001n03_start_0 c001n03" [ style = dashed] "rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = dashed] "probe_complete" -> "rsc_c001n01_start_0 c001n01" [ style = dashed] "rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n01" [ style = dashed] -"DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n02" [ style = dashed] +"DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n02" [ style = bold] +"stonith c001n02" -> "child_DoFencing:0_stop_0 c001n02" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:1_stop_0 c001n03" [ style = dashed] "child_DoFencing:1_stop_0 c001n03" -> "child_DoFencing:1_start_0 c001n03" [ style = dashed] "DoFencing_start_0" -> "child_DoFencing:1_start_0 c001n03" [ style = dashed] @@ -94,10 +95,10 @@ "child_DoFencing:1_start_0 c001n03" -> "DoFencing_running_0" [ style = dashed] "child_DoFencing:2_start_0 c001n01" -> "DoFencing_running_0" [ style = dashed] "child_DoFencing:3_start_0 c001n08" -> "DoFencing_running_0" [ style = dashed] -"DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = dashed] -"child_DoFencing:0_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = dashed] +"child_DoFencing:0_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:1_stop_0 c001n03" -> "DoFencing_stopped_0" [ style = dashed] "child_DoFencing:2_stop_0 c001n01" -> "DoFencing_stopped_0" [ style = dashed] "child_DoFencing:3_stop_0 c001n08" -> "DoFencing_stopped_0" [ style = dashed] +"DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold] "DoFencing_running_0" -> "stonith c001n02" [ style = dashed] } =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/829.exp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- 829.exp 23 May 2006 09:57:52 -0000 1.22 +++ 829.exp 24 May 2006 20:50:30 -0000 1.23 @@ -68,7 +68,11 @@ <attributes crm_feature_set="1.0.6" ip="127.0.0.12"/> </pseudo_event> </action_set> - <inputs/> + <inputs> + <trigger> + <crm_event id="45" operation="stonith" operation_key="stonith" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + </inputs> </synapse> <synapse id="8"> <action_set> @@ -84,9 +88,6 @@ <trigger> <pseudo_event id="27" operation="stop" operation_key="rsc_c001n02_stop_0"/> </trigger> - <trigger> - <crm_event id="45" operation="stonith" operation_key="stonith" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> - </trigger> </inputs> </synapse> <synapse id="9"> @@ -144,10 +145,40 @@ <attributes crm_feature_set="1.0.6" hostlist="c001n08 c001n02 c001n03 c001n01 " CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/> </pseudo_event> </action_set> - <inputs/> + <inputs> + <trigger> + <pseudo_event id="43" operation="stop" operation_key="DoFencing_stop_0"/> + </trigger> + <trigger> + <crm_event id="45" operation="stonith" operation_key="stonith" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + </inputs> </synapse> <synapse id="15"> <action_set> + <pseudo_event id="43" operation="stop" operation_key="DoFencing_stop_0"> + <attributes crm_feature_set="1.0.6" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/> + </pseudo_event> + </action_set> + <inputs/> + </synapse> + <synapse id="16" priority="1000000"> + <action_set> + <pseudo_event id="44" operation="stopped" operation_key="DoFencing_stopped_0"> + <attributes crm_feature_set="1.0.6" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/> + </pseudo_event> + </action_set> + <inputs> + <trigger> + <pseudo_event id="34" operation="stop" operation_key="child_DoFencing:0_stop_0"/> + </trigger> + <trigger> + <pseudo_event id="43" operation="stop" operation_key="DoFencing_stop_0"/> + </trigger> + </inputs> + </synapse> + <synapse id="17"> + <action_set> <pseudo_event id="8" operation="probe_complete" operation_key="probe_complete"> <attributes crm_feature_set="1.0.6"/> </pseudo_event> @@ -164,7 +195,7 @@ </trigger> </inputs> </synapse> - <synapse id="16"> + <synapse id="18"> <action_set> <rsc_op id="9" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"> <attributes crm_feature_set="1.0.6" CRM_meta_op_no_wait="true"/> @@ -182,7 +213,7 @@ </trigger> </inputs> </synapse> - <synapse id="17"> + <synapse id="19"> <action_set> <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"> <attributes crm_feature_set="1.0.6" CRM_meta_op_no_wait="true"/> @@ -203,7 +234,7 @@ </trigger> </inputs> </synapse> - <synapse id="18"> + <synapse id="20"> <action_set> <rsc_op id="18" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"> <attributes crm_feature_set="1.0.6" CRM_meta_op_no_wait="true"/> @@ -224,7 +255,7 @@ </trigger> </inputs> </synapse> - <synapse id="19"> + <synapse id="21"> <action_set> <crm_event id="45" operation="stonith" operation_key="stonith" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"> <attributes crm_feature_set="1.0.6" CRM_meta_on_node="c001n02" CRM_meta_stonith_action="reboot" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-7.dot,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- master-7.dot 15 May 2006 09:40:55 -0000 1.3 +++ master-7.dot 24 May 2006 20:50:30 -0000 1.4 @@ -57,8 +57,8 @@ "child_DoFencing:3_start_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ] "DoFencing_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "DoFencing_running_0" [ style="dashed" color="blue" fontcolor="orange" ] -"DoFencing_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] -"DoFencing_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ] +"DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] +"DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "ocf_msdummy:1_stop_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ] "ocf_msdummy:1_start_0 c001n03" [ style="dashed" color="blue" fontcolor="black" ] "ocf_msdummy:2_stop_0 c001n02" [ style="dashed" color="blue" fontcolor="black" ] @@ -76,8 +76,8 @@ "ocf_msdummy:4_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ] "master_rsc_1_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "master_rsc_1_running_0" [ style="dashed" color="blue" fontcolor="orange" ] -"master_rsc_1_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] -"master_rsc_1_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ] +"master_rsc_1_stop_0" [ style=bold color="green" fontcolor="orange" ] +"master_rsc_1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "master_rsc_1_promote_0" [ style="dashed" color="blue" fontcolor="orange" ] "master_rsc_1_promoted_0" [ style="dashed" color="blue" fontcolor="orange" ] "master_rsc_1_demote_0" [ style=bold color="green" fontcolor="orange" ] @@ -98,8 +98,8 @@ "probe_complete c001n03" -> "probe_complete" [ style = dashed] "probe_complete c001n02" -> "probe_complete" [ style = dashed] "probe_complete c001n08" -> "probe_complete" [ style = dashed] +"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] @@ -121,13 +121,14 @@ "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] "rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_start_0 c001n08" [ style = dashed] "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n02" [ style = dashed] "rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = dashed] -"DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n01" [ style = dashed] +"DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n01" [ style = bold] +"stonith c001n01" -> "child_DoFencing:0_stop_0 c001n01" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:1_stop_0 c001n03" [ style = dashed] "child_DoFencing:1_stop_0 c001n03" -> "child_DoFencing:1_start_0 c001n03" [ style = dashed] "DoFencing_start_0" -> "child_DoFencing:1_start_0 c001n03" [ style = dashed] @@ -143,11 +144,11 @@ "child_DoFencing:1_start_0 c001n03" -> "DoFencing_running_0" [ style = dashed] "child_DoFencing:2_start_0 c001n02" -> "DoFencing_running_0" [ style = dashed] "child_DoFencing:3_start_0 c001n08" -> "DoFencing_running_0" [ style = dashed] -"DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = dashed] -"child_DoFencing:0_stop_0 c001n01" -> "DoFencing_stopped_0" [ style = dashed] +"child_DoFencing:0_stop_0 c001n01" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:1_stop_0 c001n03" -> "DoFencing_stopped_0" [ style = dashed] "child_DoFencing:2_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = dashed] "child_DoFencing:3_stop_0 c001n08" -> "DoFencing_stopped_0" [ style = dashed] +"DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold] "master_rsc_1_stop_0" -> "ocf_msdummy:1_stop_0 c001n03" [ style = dashed] "ocf_msdummy:1_stop_0 c001n03" -> "ocf_msdummy:1_start_0 c001n03" [ style = dashed] "master_rsc_1_start_0" -> "ocf_msdummy:1_start_0 c001n03" [ style = dashed] @@ -169,8 +170,10 @@ "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_demote_0 c001n01" -> "ocf_msdummy:0_stop_0 c001n01" [ style = bold] -"master_rsc_1_stop_0" -> "ocf_msdummy:0_stop_0 c001n01" [ style = dashed] -"master_rsc_1_stop_0" -> "ocf_msdummy:4_stop_0 c001n01" [ style = dashed] +"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_stop_0" -> "master_rsc_1_start_0" [ style = dashed] "master_rsc_1_stopped_0" -> "master_rsc_1_start_0" [ style = dashed] "master_rsc_1_demoted_0" -> "master_rsc_1_start_0" [ style = dashed] @@ -181,17 +184,17 @@ "ocf_msdummy:5_start_0 c001n03" -> "master_rsc_1_running_0" [ style = dashed] "ocf_msdummy:6_start_0 c001n02" -> "master_rsc_1_running_0" [ style = dashed] "ocf_msdummy:7_start_0 c001n08" -> "master_rsc_1_running_0" [ style = dashed] -"master_rsc_1_demote_0" -> "master_rsc_1_stop_0" [ style = dashed] -"master_rsc_1_demoted_0" -> "master_rsc_1_stop_0" [ style = dashed] -"master_rsc_1_stop_0" -> "master_rsc_1_stopped_0" [ style = dashed] +"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:1_stop_0 c001n03" -> "master_rsc_1_stopped_0" [ style = dashed] "ocf_msdummy:2_stop_0 c001n02" -> "master_rsc_1_stopped_0" [ style = dashed] "ocf_msdummy:3_stop_0 c001n08" -> "master_rsc_1_stopped_0" [ style = dashed] "ocf_msdummy:5_stop_0 c001n03" -> "master_rsc_1_stopped_0" [ style = dashed] "ocf_msdummy:6_stop_0 c001n02" -> "master_rsc_1_stopped_0" [ style = dashed] "ocf_msdummy:7_stop_0 c001n08" -> "master_rsc_1_stopped_0" [ style = dashed] -"ocf_msdummy:0_stop_0 c001n01" -> "master_rsc_1_stopped_0" [ style = dashed] -"ocf_msdummy:4_stop_0 c001n01" -> "master_rsc_1_stopped_0" [ style = dashed] +"ocf_msdummy:0_stop_0 c001n01" -> "master_rsc_1_stopped_0" [ style = bold] +"ocf_msdummy:4_stop_0 c001n01" -> "master_rsc_1_stopped_0" [ style = bold] +"master_rsc_1_stop_0" -> "master_rsc_1_stopped_0" [ style = bold] "master_rsc_1_start_0" -> "master_rsc_1_promote_0" [ style = dashed] "master_rsc_1_running_0" -> "master_rsc_1_promote_0" [ style = dashed] "ocf_msdummy:0_demote_0 c001n01" -> "master_rsc_1_demoted_0" [ style = bold] =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-7.exp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- master-7.exp 23 May 2006 09:57:53 -0000 1.7 +++ master-7.exp 24 May 2006 20:50:30 -0000 1.8 @@ -5,7 +5,11 @@ <attributes crm_feature_set="1.0.6" ip="192.168.100.180"/> </pseudo_event> </action_set> - <inputs/> + <inputs> + <trigger> + <crm_event id="83" operation="stonith" operation_key="stonith" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + </inputs> </synapse> <synapse id="1"> <action_set> @@ -18,9 +22,6 @@ <trigger> <pseudo_event id="21" operation="stop" operation_key="DcIPaddr_stop_0"/> </trigger> - <trigger> - <crm_event id="83" operation="stonith" operation_key="stonith" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> - </trigger> </inputs> </synapse> <synapse id="2"> @@ -256,7 +257,11 @@ <attributes crm_feature_set="1.0.6" ip="192.168.100.184"/> </pseudo_event> </action_set> - <inputs/> + <inputs> + <trigger> + <crm_event id="83" operation="stonith" operation_key="stonith" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + </inputs> </synapse> <synapse id="20"> <action_set> @@ -269,9 +274,6 @@ <trigger> <pseudo_event id="40" operation="stop" operation_key="rsc_c001n01_stop_0"/> </trigger> - <trigger> - <crm_event id="83" operation="stonith" operation_key="stonith" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> - </trigger> </inputs> </synapse> <synapse id="21"> @@ -293,10 +295,40 @@ <attributes crm_feature_set="1.0.6" hostlist="c001n01 c001n08 c001n02 c001n03 " CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/> </pseudo_event> </action_set> - <inputs/> + <inputs> + <trigger> + <pseudo_event id="58" operation="stop" operation_key="DoFencing_stop_0"/> + </trigger> + <trigger> + <crm_event id="83" operation="stonith" operation_key="stonith" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + </inputs> </synapse> <synapse id="23"> <action_set> + <pseudo_event id="58" operation="stop" operation_key="DoFencing_stop_0"> + <attributes crm_feature_set="1.0.6" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/> + </pseudo_event> + </action_set> + <inputs/> + </synapse> + <synapse id="24" priority="1000000"> + <action_set> + <pseudo_event id="59" operation="stopped" operation_key="DoFencing_stopped_0"> + <attributes crm_feature_set="1.0.6" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/> + </pseudo_event> + </action_set> + <inputs> + <trigger> + <pseudo_event id="49" operation="stop" operation_key="child_DoFencing:0_stop_0"/> + </trigger> + <trigger> + <pseudo_event id="58" operation="stop" operation_key="DoFencing_stop_0"/> + </trigger> + </inputs> + </synapse> + <synapse id="25"> + <action_set> <pseudo_event id="72" operation="demote" operation_key="ocf_msdummy:0_demote_0"> <attributes crm_feature_set="1.0.6" CRM_meta_role="Stopped" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_clone="0" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/> </pseudo_event> @@ -310,7 +342,7 @@ </trigger> </inputs> </synapse> - <synapse id="24"> + <synapse id="26"> <action_set> <pseudo_event id="73" operation="stop" operation_key="ocf_msdummy:0_stop_0"> <attributes crm_feature_set="1.0.6" CRM_meta_role="Stopped" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_clone="0" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/> @@ -320,17 +352,63 @@ <trigger> <pseudo_event id="72" operation="demote" operation_key="ocf_msdummy:0_demote_0"/> </trigger> + <trigger> + <pseudo_event id="77" operation="stop" operation_key="master_rsc_1_stop_0"/> + </trigger> + <trigger> + <crm_event id="83" operation="stonith" operation_key="stonith" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> </inputs> </synapse> - <synapse id="25"> + <synapse id="27"> <action_set> <pseudo_event id="74" operation="stop" operation_key="ocf_msdummy:4_stop_0"> <attributes crm_feature_set="1.0.6" CRM_meta_role="Stopped" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_clone="4" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/> </pseudo_event> </action_set> - <inputs/> + <inputs> + <trigger> + <pseudo_event id="77" operation="stop" operation_key="master_rsc_1_stop_0"/> + </trigger> + <trigger> + <crm_event id="83" operation="stonith" operation_key="stonith" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + </inputs> </synapse> - <synapse id="26"> + <synapse id="28"> + <action_set> + <pseudo_event id="77" operation="stop" operation_key="master_rsc_1_stop_0"> + <attributes crm_feature_set="1.0.6" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/> + </pseudo_event> + </action_set> + <inputs> + <trigger> + <pseudo_event id="81" operation="demote" operation_key="master_rsc_1_demote_0"/> + </trigger> + <trigger> + <pseudo_event id="82" operation="demoted" operation_key="master_rsc_1_demoted_0"/> + </trigger> + </inputs> + </synapse> + <synapse id="29" priority="1000000"> + <action_set> + <pseudo_event id="78" operation="stopped" operation_key="master_rsc_1_stopped_0"> + <attributes crm_feature_set="1.0.6" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/> + </pseudo_event> + </action_set> + <inputs> + <trigger> + <pseudo_event id="73" operation="stop" operation_key="ocf_msdummy:0_stop_0"/> + </trigger> + <trigger> + <pseudo_event id="74" operation="stop" operation_key="ocf_msdummy:4_stop_0"/> + </trigger> + <trigger> + <pseudo_event id="77" operation="stop" operation_key="master_rsc_1_stop_0"/> + </trigger> + </inputs> + </synapse> + <synapse id="30"> <action_set> <pseudo_event id="81" operation="demote" operation_key="master_rsc_1_demote_0"> <attributes crm_feature_set="1.0.6" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/> @@ -338,7 +416,7 @@ </action_set> <inputs/> </synapse> - <synapse id="27" priority="1000000"> + <synapse id="31" priority="1000000"> <action_set> <pseudo_event id="82" operation="demoted" operation_key="master_rsc_1_demoted_0"> <attributes crm_feature_set="1.0.6" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/> @@ -353,7 +431,7 @@ </trigger> </inputs> </synapse> - <synapse id="28"> + <synapse id="32"> <action_set> <crm_event id="83" operation="stonith" operation_key="stonith" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"> <attributes crm_feature_set="1.0.6" CRM_meta_on_node="c001n01" CRM_meta_stonith_action="reboot" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-8.dot,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- master-8.dot 15 May 2006 09:40:55 -0000 1.3 +++ master-8.dot 24 May 2006 20:50:30 -0000 1.4 @@ -57,8 +57,8 @@ "child_DoFencing:3_start_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ] "DoFencing_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "DoFencing_running_0" [ style="dashed" color="blue" fontcolor="orange" ] -"DoFencing_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] -"DoFencing_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ] +"DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] +"DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "ocf_msdummy:0_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ] "ocf_msdummy:0_start_0 c001n03" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:0_demote_0 c001n01" [ style=bold color="green" fontcolor="orange" ] @@ -75,8 +75,8 @@ "ocf_msdummy:7_start_0 c001n08" [ style="dashed" color="blue" fontcolor="black" ] "master_rsc_1_start_0" [ style=bold color="green" fontcolor="orange" ] "master_rsc_1_running_0" [ style=bold color="green" fontcolor="orange" ] -"master_rsc_1_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] -"master_rsc_1_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ] +"master_rsc_1_stop_0" [ style=bold color="green" fontcolor="orange" ] +"master_rsc_1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "master_rsc_1_promote_0" [ style="dashed" color="blue" fontcolor="orange" ] "master_rsc_1_promoted_0" [ style="dashed" color="blue" fontcolor="orange" ] "master_rsc_1_demote_0" [ style=bold color="green" fontcolor="orange" ] @@ -97,8 +97,8 @@ "probe_complete c001n02" -> "probe_complete" [ style = dashed] "probe_complete c001n08" -> "probe_complete" [ style = dashed] "ocf_msdummy:4_monitor_0 c001n03" -> "probe_complete c001n03" [ 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] @@ -120,13 +120,14 @@ "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] "rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_start_0 c001n08" [ style = dashed] "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n02" [ style = dashed] "rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = dashed] -"DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n01" [ style = dashed] +"DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n01" [ style = bold] +"stonith c001n01" -> "child_DoFencing:0_stop_0 c001n01" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:1_stop_0 c001n03" [ style = dashed] "child_DoFencing:1_stop_0 c001n03" -> "child_DoFencing:1_start_0 c001n03" [ style = dashed] "DoFencing_start_0" -> "child_DoFencing:1_start_0 c001n03" [ style = dashed] @@ -142,16 +143,16 @@ "child_DoFencing:1_start_0 c001n03" -> "DoFencing_running_0" [ style = dashed] "child_DoFencing:2_start_0 c001n02" -> "DoFencing_running_0" [ style = dashed] "child_DoFencing:3_start_0 c001n08" -> "DoFencing_running_0" [ style = dashed] -"DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = dashed] -"child_DoFencing:0_stop_0 c001n01" -> "DoFencing_stopped_0" [ style = dashed] +"child_DoFencing:0_stop_0 c001n01" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:1_stop_0 c001n03" -> "DoFencing_stopped_0" [ style = dashed] "child_DoFencing:2_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = dashed] "child_DoFencing:3_stop_0 c001n08" -> "DoFencing_stopped_0" [ style = dashed] +"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 = dashed] +"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] @@ -171,8 +172,8 @@ "ocf_msdummy:7_stop_0 c001n08" -> "ocf_msdummy:7_start_0 c001n08" [ style = dashed] "master_rsc_1_start_0" -> "ocf_msdummy:7_start_0 c001n08" [ style = dashed] "probe_complete" -> "master_rsc_1_start_0" [ style = bold] -"master_rsc_1_stop_0" -> "master_rsc_1_start_0" [ style = dashed] -"master_rsc_1_stopped_0" -> "master_rsc_1_start_0" [ style = dashed] +"master_rsc_1_stop_0" -> "master_rsc_1_start_0" [ style = bold] +"master_rsc_1_stopped_0" -> "master_rsc_1_start_0" [ style = bold] "master_rsc_1_demoted_0" -> "master_rsc_1_start_0" [ style = bold] "ocf_msdummy:0_start_0 c001n03" -> "master_rsc_1_running_0" [ style = bold] "ocf_msdummy:1_start_0 c001n03" -> "master_rsc_1_running_0" [ style = dashed] @@ -181,15 +182,15 @@ "ocf_msdummy:6_start_0 c001n02" -> "master_rsc_1_running_0" [ style = dashed] "ocf_msdummy:7_start_0 c001n08" -> "master_rsc_1_running_0" [ style = dashed] "master_rsc_1_start_0" -> "master_rsc_1_running_0" [ style = bold] -"master_rsc_1_demote_0" -> "master_rsc_1_stop_0" [ style = dashed] -"master_rsc_1_demoted_0" -> "master_rsc_1_stop_0" [ style = dashed] -"master_rsc_1_stop_0" -> "master_rsc_1_stopped_0" [ style = dashed] -"ocf_msdummy:0_stop_0 c001n01" -> "master_rsc_1_stopped_0" [ style = dashed] +"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] "ocf_msdummy:1_stop_0 c001n03" -> "master_rsc_1_stopped_0" [ style = dashed] "ocf_msdummy:2_stop_0 c001n02" -> "master_rsc_1_stopped_0" [ style = dashed] "ocf_msdummy:3_stop_0 c001n08" -> "master_rsc_1_stopped_0" [ style = dashed] "ocf_msdummy:6_stop_0 c001n02" -> "master_rsc_1_stopped_0" [ style = dashed] "ocf_msdummy:7_stop_0 c001n08" -> "master_rsc_1_stopped_0" [ style = dashed] +"master_rsc_1_stop_0" -> "master_rsc_1_stopped_0" [ style = bold] "master_rsc_1_start_0" -> "master_rsc_1_promote_0" [ style = dashed] "master_rsc_1_running_0" -> "master_rsc_1_promote_0" [ style = dashed] "ocf_msdummy:0_demote_0 c001n01" -> "master_rsc_1_demoted_0" [ style = bold] =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-8.exp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- master-8.exp 23 May 2006 09:57:53 -0000 1.7 +++ master-8.exp 24 May 2006 20:50:30 -0000 1.8 @@ -5,7 +5,11 @@ <attributes crm_feature_set="1.0.6" ip="192.168.100.180"/> </pseudo_event> </action_set> - <inputs/> + <inputs> + <trigger> + <crm_event id="82" operation="stonith" operation_key="stonith" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + </inputs> </synapse> <synapse id="1"> <action_set> @@ -18,9 +22,6 @@ <trigger> <pseudo_event id="21" operation="stop" operation_key="DcIPaddr_stop_0"/> </trigger> - <trigger> - <crm_event id="82" operation="stonith" operation_key="stonith" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> - </trigger> </inputs> </synapse> <synapse id="2"> @@ -256,7 +257,11 @@ <attributes crm_feature_set="1.0.6" ip="192.168.100.184"/> </pseudo_event> </action_set> - <inputs/> + <inputs> + <trigger> + <crm_event id="82" operation="stonith" operation_key="stonith" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + </inputs> </synapse> <synapse id="20"> <action_set> @@ -269,9 +274,6 @@ <trigger> <pseudo_event id="40" operation="stop" operation_key="rsc_c001n01_stop_0"/> </trigger> - <trigger> - <crm_event id="82" operation="stonith" operation_key="stonith" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> - </trigger> </inputs> </synapse> <synapse id="21"> @@ -293,10 +295,40 @@ <attributes crm_feature_set="1.0.6" hostlist="c001n01 c001n08 c001n02 c001n03 " CRM_meta_clone="0" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/> </pseudo_event> </action_set> - <inputs/> + <inputs> + <trigger> + <pseudo_event id="58" operation="stop" operation_key="DoFencing_stop_0"/> + </trigger> + <trigger> + <crm_event id="82" operation="stonith" operation_key="stonith" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + </inputs> </synapse> <synapse id="23"> <action_set> + <pseudo_event id="58" operation="stop" operation_key="DoFencing_stop_0"> + <attributes crm_feature_set="1.0.6" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/> + </pseudo_event> + </action_set> + <inputs/> + </synapse> + <synapse id="24" priority="1000000"> + <action_set> + <pseudo_event id="59" operation="stopped" operation_key="DoFencing_stopped_0"> + <attributes crm_feature_set="1.0.6" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1"/> + </pseudo_event> + </action_set> + <inputs> + <trigger> + <pseudo_event id="49" operation="stop" operation_key="child_DoFencing:0_stop_0"/> + </trigger> + <trigger> + <pseudo_event id="58" operation="stop" operation_key="DoFencing_stop_0"/> + </trigger> + </inputs> + </synapse> + <synapse id="25"> + <action_set> <pseudo_event id="60" operation="stop" operation_key="ocf_msdummy:0_stop_0"> <attributes crm_feature_set="1.0.6" CRM_meta_role="Slave" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_clone="0" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/> </pseudo_event> @@ -305,9 +337,15 @@ <trigger> <pseudo_event id="62" operation="demote" operation_key="ocf_msdummy:0_demote_0"/> </trigger> + <trigger> + <pseudo_event id="76" operation="stop" operation_key="master_rsc_1_stop_0"/> + </trigger> + <trigger> + <crm_event id="82" operation="stonith" operation_key="stonith" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> </inputs> </synapse> - <synapse id="24"> + <synapse id="26"> <action_set> <rsc_op id="61" operation="start" operation_key="ocf_msdummy:0_start_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"> <primitive id="ocf_msdummy:0" long-id="master_rsc_1:ocf_msdummy:0" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/> @@ -321,12 +359,9 @@ <trigger> <pseudo_event id="74" operation="start" operation_key="master_rsc_1_start_0"/> </trigger> - <trigger> - <crm_event id="82" operation="stonith" operation_key="stonith" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> - </trigger> </inputs> </synapse> - <synapse id="25"> + <synapse id="27"> <action_set> <pseudo_event id="62" operation="demote" operation_key="ocf_msdummy:0_demote_0"> <attributes crm_feature_set="1.0.6" CRM_meta_role="Slave" logfile="/var/log/cts_ocfdummy.log" CRM_meta_stateful="true" CRM_meta_clone="0" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/> @@ -341,7 +376,7 @@ </trigger> </inputs> </synapse> - <synapse id="26"> + <synapse id="28"> <action_set> <rsc_op id="63" operation="monitor" operation_key="ocf_msdummy:0_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"> <primitive id="ocf_msdummy:0" long-id="master_rsc_1:ocf_msdummy:0" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/> @@ -354,7 +389,7 @@ </trigger> </inputs> </synapse> - <synapse id="27"> + <synapse id="29"> <action_set> <rsc_op id="18" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"> <primitive id="ocf_msdummy:4" long-id="master_rsc_1:ocf_msdummy:4" class="ocf" provider="heartbeat" type="/usr/lib/heartbeat/cts/OCFMSDummy"/> @@ -363,7 +398,7 @@ </action_set> <inputs/> </synapse> - <synapse id="28"> + <synapse id="30"> <action_set> <pseudo_event id="74" operation="start" operation_key="master_rsc_1_start_0"> <attributes crm_feature_set="1.0.6" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/> @@ -374,11 +409,17 @@ <pseudo_event id="16" operation="probe_complete" operation_key="probe_complete"/> </trigger> <trigger> + <pseudo_event id="76" operation="stop" operation_key="master_rsc_1_stop_0"/> + </trigger> + <trigger> + <pseudo_event id="77" operation="stopped" operation_key="master_rsc_1_stopped_0"/> + </trigger> + <trigger> <pseudo_event id="81" operation="demoted" operation_key="master_rsc_1_demoted_0"/> </trigger> </inputs> </synapse> - <synapse id="29" priority="1000000"> + <synapse id="31" priority="1000000"> <action_set> <pseudo_event id="75" operation="running" operation_key="master_rsc_1_running_0"> <attributes crm_feature_set="1.0.6" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/> @@ -393,7 +434,37 @@ </trigger> </inputs> </synapse> - <synapse id="30"> + <synapse id="32"> + <action_set> + <pseudo_event id="76" operation="stop" operation_key="master_rsc_1_stop_0"> + <attributes crm_feature_set="1.0.6" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/> + </pseudo_event> + </action_set> + <inputs> + <trigger> + <pseudo_event id="80" operation="demote" operation_key="master_rsc_1_demote_0"/> + </trigger> + <trigger> + <pseudo_event id="81" operation="demoted" operation_key="master_rsc_1_demoted_0"/> + </trigger> + </inputs> + </synapse> + <synapse id="33" priority="1000000"> + <action_set> + <pseudo_event id="77" operation="stopped" operation_key="master_rsc_1_stopped_0"> + <attributes crm_feature_set="1.0.6" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/> + </pseudo_event> + </action_set> + <inputs> + <trigger> + <pseudo_event id="60" operation="stop" operation_key="ocf_msdummy:0_stop_0"/> + </trigger> + <trigger> + <pseudo_event id="76" operation="stop" operation_key="master_rsc_1_stop_0"/> + </trigger> + </inputs> + </synapse> + <synapse id="34"> <action_set> <pseudo_event id="80" operation="demote" operation_key="master_rsc_1_demote_0"> <attributes crm_feature_set="1.0.6" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/> @@ -401,7 +472,7 @@ </action_set> <inputs/> </synapse> - <synapse id="31" priority="1000000"> + <synapse id="35" priority="1000000"> <action_set> <pseudo_event id="81" operation="demoted" operation_key="master_rsc_1_demoted_0"> <attributes crm_feature_set="1.0.6" CRM_meta_clone_max="8" CRM_meta_clone_node_max="2" CRM_meta_master_max="4" CRM_meta_master_node_max="1"/> @@ -416,7 +487,7 @@ </trigger> </inputs> </synapse> - <synapse id="32"> + <synapse id="36"> <action_set> <pseudo_event id="16" operation="probe_complete" operation_key="probe_complete"> <attributes crm_feature_set="1.0.6"/> @@ -428,7 +499,7 @@ </trigger> </inputs> </synapse> - <synapse id="33"> + <synapse id="37"> <action_set> <rsc_op id="17" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"> <attributes crm_feature_set="1.0.6" CRM_meta_op_no_wait="true"/> @@ -440,7 +511,7 @@ </trigger> </inputs> </synapse> - <synapse id="34"> + <synapse id="38"> <action_set> <crm_event id="82" operation="stonith" operation_key="stonith" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"> <attributes crm_feature_set="1.0.6" CRM_meta_on_node="c001n01" CRM_meta_stonith_action="reboot" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-11.dot,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- rec-node-11.dot 5 May 2006 13:08:55 -0000 1.3 +++ rec-node-11.dot 24 May 2006 20:50:30 -0000 1.4 @@ -16,16 +16,16 @@ "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" -> "rsc1_start_0 node2" [ style = bold] "group1_stop_0" -> "rsc2_stop_0 node1" [ style = dashed] +"stonith node1" -> "rsc2_stop_0 node1" [ 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] "group1_stop_0" -> "group1_start_0" [ style = dashed] "group1_stopped_0" -> "group1_start_0" [ style = dashed] =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-11.exp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- rec-node-11.exp 23 May 2006 09:57:54 -0000 1.8 +++ rec-node-11.exp 24 May 2006 20:50:30 -0000 1.9 @@ -39,6 +39,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="3"> @@ -64,9 +67,6 @@ <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"> @@ -84,7 +84,11 @@ <attributes crm_feature_set="1.0.6"/> </pseudo_event> </action_set> - <inputs/> + <inputs> + <trigger> + <crm_event id="15" operation="stonith" operation_key="stonith" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + </inputs> </synapse> <synapse id="7"> <action_set> @@ -100,9 +104,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="8"> =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/rec-node-4.dot,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- rec-node-4.dot 5 Oct 2005 19:04:02 -0000 1.6 +++ rec-node-4.dot 24 May 2006 20:50:30 -0000 1.7 @@ -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" -> "rsc1_start_0 node2" [ style = bold] +"stonith node1" -> "rsc2_stop_0 node1" [ 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.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- rec-node-4.exp 23 May 2006 09:57:54 -0000 1.21 +++ rec-node-4.exp 24 May 2006 20:50:30 -0000 1.22 @@ -5,7 +5,11 @@ <attributes crm_feature_set="1.0.6"/> </pseudo_event> </action_set> - <inputs/> + <inputs> + <trigger> + <crm_event id="9" operation="stonith" operation_key="stonith" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + </inputs> </synapse> <synapse id="1"> <action_set> @@ -30,9 +34,6 @@ <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"> @@ -50,7 +51,11 @@ <attributes crm_feature_set="1.0.6"/> </pseudo_event> </action_set> - <inputs/> + <inputs> + <trigger> + <crm_event id="9" operation="stonith" operation_key="stonith" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + </inputs> </synapse> <synapse id="5"> <action_set> @@ -66,9 +71,6 @@ <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.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- rec-node-6.dot 5 Oct 2005 19:04:02 -0000 1.6 +++ rec-node-6.dot 24 May 2006 20:50:30 -0000 1.7 @@ -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" -> "rsc1_start_0 node2" [ style = bold] +"stonith node1" -> "rsc2_stop_0 node1" [ 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.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- rec-node-6.exp 23 May 2006 09:57:54 -0000 1.21 +++ rec-node-6.exp 24 May 2006 20:50:30 -0000 1.22 @@ -5,7 +5,11 @@ <attributes crm_feature_set="1.0.6"/> </pseudo_event> </action_set> - <inputs/> + <inputs> + <trigger> + <crm_event id="9" operation="stonith" operation_key="stonith" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + </inputs> </synapse> <synapse id="1"> <action_set> @@ -30,9 +34,6 @@ <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"> @@ -50,7 +51,11 @@ <attributes crm_feature_set="1.0.6"/> </pseudo_event> </action_set> - <inputs/> + <inputs> + <trigger> + <crm_event id="9" operation="stonith" operation_key="stonith" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + </inputs> </synapse> <synapse id="5"> <action_set> @@ -66,9 +71,6 @@ <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.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- rec-node-7.dot 5 Oct 2005 19:04:02 -0000 1.6 +++ rec-node-7.dot 24 May 2006 20:50:30 -0000 1.7 @@ -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" -> "rsc1_start_0 node2" [ style = bold] +"stonith node1" -> "rsc2_stop_0 node1" [ 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.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- rec-node-7.exp 23 May 2006 09:57:54 -0000 1.21 +++ rec-node-7.exp 24 May 2006 20:50:30 -0000 1.22 @@ -5,7 +5,11 @@ <attributes crm_feature_set="1.0.6"/> </pseudo_event> </action_set> - <inputs/> + <inputs> + <trigger> + <crm_event id="9" operation="stonith" operation_key="stonith" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + </inputs> </synapse> <synapse id="1"> <action_set> @@ -30,9 +34,6 @@ <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"> @@ -50,7 +51,11 @@ <attributes crm_feature_set="1.0.6"/> </pseudo_event> </action_set> - <inputs/> + <inputs> + <trigger> + <crm_event id="9" operation="stonith" operation_key="stonith" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + </inputs> </synapse> <synapse id="5"> <action_set> @@ -66,9 +71,6 @@ <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.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- rec-rsc-5.dot 19 Oct 2005 08:30:01 -0000 1.8 +++ rec-rsc-5.dot 24 May 2006 20:50:30 -0000 1.9 @@ -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.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- rec-rsc-5.exp 23 May 2006 09:57:54 -0000 1.23 +++ rec-rsc-5.exp 24 May 2006 20:50:30 -0000 1.24 @@ -5,7 +5,11 @@ <attributes crm_feature_set="1.0.6"/> </pseudo_event> </action_set> - <inputs/> + <inputs> + <trigger> + <crm_event id="9" operation="stonith" operation_key="stonith" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + </inputs> </synapse> <synapse id="1"> <action_set> @@ -30,9 +34,6 @@ <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"> ------------------------------ _______________________________________________ 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 30, Issue 79 ********************************************