Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP3:GA
pacemaker.8397
pacemaker-pengine-improved-logging-of-reasons-f...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File pacemaker-pengine-improved-logging-of-reasons-for-stop-restart-actions-tests.patch of Package pacemaker.8397
commit 1fa28f088e04a58f5241461230e50357f281cab0 Author: Andrew Beekhof <andrew@beekhof.net> Date: Thu Nov 2 13:40:26 2017 +1100 Test: PE: Improved logging of reasons for stop/restart actions Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/11-a-then-bm-b-move-a-clone-starting.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/11-a-then-bm-b-move-a-clone-starting.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/11-a-then-bm-b-move-a-clone-starting.dot @@ -12,7 +12,6 @@ "myclone-clone_stopped_0" -> "myclone-clone_start_0" [ style = bold] "myclone-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] "myclone_monitor_0 f20node2" -> "myclone-clone_start_0" [ style = bold] -"myclone_monitor_0 f20node2" -> "myclone_stop_0 f20node1" [ style = bold] "myclone_monitor_0 f20node2" [ style=bold color="green" fontcolor="black"] "myclone_start_0 f20node2" -> "myclone-clone_running_0" [ style = bold] "myclone_start_0 f20node2" [ style=bold color="green" fontcolor="black"] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/11-a-then-bm-b-move-a-clone-starting.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/11-a-then-bm-b-move-a-clone-starting.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/11-a-then-bm-b-move-a-clone-starting.exp @@ -24,9 +24,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="2" operation="monitor" operation_key="myclone_monitor_0" internal_operation_key="myclone:0_monitor_0" on_node="f20node2" on_node_uuid="2"/> - </trigger> - <trigger> <pseudo_event id="7" operation="stop" operation_key="myclone-clone_stop_0"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/594.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/594.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/594.dot @@ -1,6 +1,5 @@ digraph "g" { "DcIPaddr_monitor_0 hadev1" -> "DcIPaddr_start_0 hadev1" [ style = bold] -"DcIPaddr_monitor_0 hadev1" -> "DcIPaddr_stop_0 hadev2" [ style = bold] "DcIPaddr_monitor_0 hadev1" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_5000 hadev1" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_start_0 hadev1" -> "DcIPaddr_monitor_5000 hadev1" [ style = bold] @@ -26,7 +25,6 @@ digraph "g" { "child_DoFencing:2_stop_0 hadev1" [ style=bold color="green" fontcolor="black" ] "do_shutdown hadev2" [ style=bold color="green" fontcolor="black" ] "rsc_hadev2_monitor_0 hadev1" -> "rsc_hadev2_start_0 hadev1" [ style = bold] -"rsc_hadev2_monitor_0 hadev1" -> "rsc_hadev2_stop_0 hadev2" [ style = bold] "rsc_hadev2_monitor_0 hadev1" [ style=bold color="green" fontcolor="black" ] "rsc_hadev2_monitor_5000 hadev1" [ style=bold color="green" fontcolor="black" ] "rsc_hadev2_start_0 hadev1" -> "rsc_hadev2_monitor_5000 hadev1" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/594.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/594.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/594.exp @@ -38,11 +38,7 @@ <attributes CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_timeout="20000" ip="127.0.0.10"/> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="9" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="3"> <action_set> @@ -101,11 +97,7 @@ <attributes CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_timeout="20000" ip="127.0.0.22"/> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="10" operation="monitor" operation_key="rsc_hadev2_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="8"> <action_set> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/594.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/594.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/594.summary @@ -21,23 +21,23 @@ Transition Summary: * Stop child_DoFencing:2 (hadev1) Executing cluster transition: + * Resource action: DcIPaddr stop on hadev2 * Resource action: DcIPaddr monitor on hadev1 * Resource action: rsc_hadev3 monitor on hadev2 + * Resource action: rsc_hadev2 stop on hadev2 * Resource action: rsc_hadev2 monitor on hadev1 * Resource action: child_DoFencing:0 monitor on hadev1 * Resource action: child_DoFencing:2 monitor on hadev2 * Pseudo action: DoFencing_stop_0 * Fencing hadev3 (reboot) * Pseudo action: stonith_complete - * Resource action: DcIPaddr stop on hadev2 - * Resource action: rsc_hadev2 stop on hadev2 + * Resource action: DcIPaddr start on hadev1 + * Resource action: rsc_hadev2 start on hadev1 * Resource action: child_DoFencing:0 stop on hadev2 * Resource action: child_DoFencing:2 stop on hadev1 * Pseudo action: DoFencing_stopped_0 * Cluster action: do_shutdown on hadev2 * Pseudo action: all_stopped - * Resource action: DcIPaddr start on hadev1 - * Resource action: rsc_hadev2 start on hadev1 * Resource action: DcIPaddr monitor=5000 on hadev1 * Resource action: rsc_hadev2 monitor=5000 on hadev1 Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/662.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/662.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/662.dot @@ -22,13 +22,10 @@ "child_DoFencing:3_monitor_0 c001n04" [ style=bold color="green" fontcolor="black" ] "do_shutdown c001n02" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n03" -> "rsc_c001n02_start_0 c001n03" [ style = bold] -"rsc_c001n02_monitor_0 c001n03" -> "rsc_c001n02_stop_0 c001n02" [ style = bold] "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n04" -> "rsc_c001n02_start_0 c001n03" [ style = bold] -"rsc_c001n02_monitor_0 c001n04" -> "rsc_c001n02_stop_0 c001n02" [ style = bold] "rsc_c001n02_monitor_0 c001n04" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n09" -> "rsc_c001n02_start_0 c001n03" [ style = bold] -"rsc_c001n02_monitor_0 c001n09" -> "rsc_c001n02_stop_0 c001n02" [ style = bold] "rsc_c001n02_monitor_0 c001n09" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_start_0 c001n03" -> "rsc_c001n02_monitor_5000 c001n03" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/662.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/662.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/662.exp @@ -95,17 +95,7 @@ <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000" ip="127.0.0.12"/> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="18" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> - </trigger> - <trigger> - <rsc_op id="24" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/> - </trigger> - <trigger> - <rsc_op id="29" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="9"> <action_set> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/662.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/662.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/662.summary @@ -25,6 +25,7 @@ Executing cluster transition: * Resource action: rsc_c001n09 monitor on c001n04 * Resource action: rsc_c001n09 monitor on c001n03 * Resource action: rsc_c001n09 monitor on c001n02 + * Resource action: rsc_c001n02 stop on c001n02 * Resource action: rsc_c001n02 monitor on c001n09 * Resource action: rsc_c001n02 monitor on c001n04 * Resource action: rsc_c001n02 monitor on c001n03 @@ -43,12 +44,11 @@ Executing cluster transition: * Resource action: child_DoFencing:3 monitor on c001n03 * Resource action: child_DoFencing:3 monitor on c001n02 * Pseudo action: DoFencing_stop_0 - * Resource action: rsc_c001n02 stop on c001n02 + * Resource action: rsc_c001n02 start on c001n03 * Resource action: child_DoFencing:0 stop on c001n02 * Pseudo action: DoFencing_stopped_0 * Cluster action: do_shutdown on c001n02 * Pseudo action: all_stopped - * Resource action: rsc_c001n02 start on c001n03 * Resource action: rsc_c001n02 monitor=5000 on c001n03 Revised cluster status: Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/696.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/696.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/696.dot @@ -32,10 +32,8 @@ "child_DoFencing:2_start_0 hadev1" -> "child_DoFencing:2_monitor_5000 hadev1" [ style = bold] "child_DoFencing:2_start_0 hadev1" [ style=bold color="green" fontcolor="black" ] "rsc_hadev1_monitor_0 hadev1" -> "rsc_hadev1_start_0 hadev1" [ style = bold] -"rsc_hadev1_monitor_0 hadev1" -> "rsc_hadev1_stop_0 hadev3" [ style = bold] "rsc_hadev1_monitor_0 hadev1" [ style=bold color="green" fontcolor="black" ] "rsc_hadev1_monitor_0 hadev2" -> "rsc_hadev1_start_0 hadev1" [ style = bold] -"rsc_hadev1_monitor_0 hadev2" -> "rsc_hadev1_stop_0 hadev3" [ style = bold] "rsc_hadev1_monitor_0 hadev2" [ style=bold color="green" fontcolor="black" ] "rsc_hadev1_monitor_5000 hadev1" [ style=bold color="green" fontcolor="black" ] "rsc_hadev1_start_0 hadev1" -> "rsc_hadev1_monitor_5000 hadev1" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/696.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/696.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/696.exp @@ -85,14 +85,7 @@ <attributes CRM_meta_on_node="hadev3" CRM_meta_on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669" CRM_meta_timeout="20000" ip="10.0.0.11"/> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="3" operation="monitor" operation_key="rsc_hadev1_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/> - </trigger> - <trigger> - <rsc_op id="9" operation="monitor" operation_key="rsc_hadev1_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="7"> <action_set> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/696.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/696.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/696.summary @@ -18,6 +18,7 @@ Transition Summary: Executing cluster transition: * Resource action: DcIPaddr monitor on hadev3 * Resource action: DcIPaddr monitor on hadev1 + * Resource action: rsc_hadev1 stop on hadev3 * Resource action: rsc_hadev1 monitor on hadev2 * Resource action: rsc_hadev1 monitor on hadev1 * Resource action: rsc_hadev2 monitor on hadev3 @@ -35,17 +36,16 @@ Executing cluster transition: * Resource action: child_DoFencing:2 monitor on hadev2 * Resource action: child_DoFencing:2 monitor on hadev1 * Pseudo action: DoFencing_start_0 + * Pseudo action: all_stopped * Resource action: DcIPaddr start on hadev2 - * Resource action: rsc_hadev1 stop on hadev3 + * Resource action: rsc_hadev1 start on hadev1 * Resource action: rsc_hadev2 start on hadev2 * Resource action: child_DoFencing:2 start on hadev1 * Pseudo action: DoFencing_running_0 - * Pseudo action: all_stopped * Resource action: DcIPaddr monitor=5000 on hadev2 - * Resource action: rsc_hadev1 start on hadev1 + * Resource action: rsc_hadev1 monitor=5000 on hadev1 * Resource action: rsc_hadev2 monitor=5000 on hadev2 * Resource action: child_DoFencing:2 monitor=5000 on hadev1 - * Resource action: rsc_hadev1 monitor=5000 on hadev1 Revised cluster status: Online: [ hadev1 hadev2 hadev3 ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/726.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/726.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/726.dot @@ -54,13 +54,10 @@ "child_DoFencing:3_start_0 sgi2" -> "child_DoFencing:3_monitor_5000 sgi2" [ style = bold] "child_DoFencing:3_start_0 sgi2" [ style=bold color="green" fontcolor="black" ] "rsc_ibm1_monitor_0 ibm1" -> "rsc_ibm1_start_0 ibm1" [ style = bold] -"rsc_ibm1_monitor_0 ibm1" -> "rsc_ibm1_stop_0 test03" [ style = bold] "rsc_ibm1_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] "rsc_ibm1_monitor_0 sgi2" -> "rsc_ibm1_start_0 ibm1" [ style = bold] -"rsc_ibm1_monitor_0 sgi2" -> "rsc_ibm1_stop_0 test03" [ style = bold] "rsc_ibm1_monitor_0 sgi2" [ style=bold color="green" fontcolor="black" ] "rsc_ibm1_monitor_0 test02" -> "rsc_ibm1_start_0 ibm1" [ style = bold] -"rsc_ibm1_monitor_0 test02" -> "rsc_ibm1_stop_0 test03" [ style = bold] "rsc_ibm1_monitor_0 test02" [ style=bold color="green" fontcolor="black" ] "rsc_ibm1_monitor_5000 ibm1" [ style=bold color="green" fontcolor="black" ] "rsc_ibm1_start_0 ibm1" -> "rsc_ibm1_monitor_5000 ibm1" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/726.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/726.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/726.exp @@ -148,17 +148,7 @@ <attributes CRM_meta_on_node="test03" CRM_meta_on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a" CRM_meta_timeout="20000" ip="127.0.0.12"/> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="4" operation="monitor" operation_key="rsc_ibm1_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/> - </trigger> - <trigger> - <rsc_op id="13" operation="monitor" operation_key="rsc_ibm1_monitor_0" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8"/> - </trigger> - <trigger> - <rsc_op id="22" operation="monitor" operation_key="rsc_ibm1_monitor_0" on_node="test02" on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="13"> <action_set> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/726.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/726.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/726.summary @@ -29,6 +29,7 @@ Executing cluster transition: * Resource action: rsc_sgi2 monitor on test02 * Resource action: rsc_sgi2 monitor on sgi2 * Resource action: rsc_sgi2 monitor on ibm1 + * Resource action: rsc_ibm1 stop on test03 * Resource action: rsc_ibm1 monitor on test02 * Resource action: rsc_ibm1 monitor on sgi2 * Resource action: rsc_ibm1 monitor on ibm1 @@ -54,23 +55,22 @@ Executing cluster transition: * Resource action: child_DoFencing:3 monitor on sgi2 * Resource action: child_DoFencing:3 monitor on ibm1 * Pseudo action: DoFencing_start_0 + * Pseudo action: all_stopped * Resource action: rsc_sgi2 start on sgi2 - * Resource action: rsc_ibm1 stop on test03 + * Resource action: rsc_ibm1 start on ibm1 * Resource action: rsc_test02 start on test02 * Resource action: child_DoFencing:0 start on test02 * Resource action: child_DoFencing:1 start on test03 * Resource action: child_DoFencing:2 start on ibm1 * Resource action: child_DoFencing:3 start on sgi2 * Pseudo action: DoFencing_running_0 - * Pseudo action: all_stopped * Resource action: rsc_sgi2 monitor=5000 on sgi2 - * Resource action: rsc_ibm1 start on ibm1 + * Resource action: rsc_ibm1 monitor=5000 on ibm1 * Resource action: rsc_test02 monitor=5000 on test02 * Resource action: child_DoFencing:0 monitor=5000 on test02 * Resource action: child_DoFencing:1 monitor=5000 on test03 * Resource action: child_DoFencing:2 monitor=5000 on ibm1 * Resource action: child_DoFencing:3 monitor=5000 on sgi2 - * Resource action: rsc_ibm1 monitor=5000 on ibm1 Revised cluster status: Online: [ ibm1 sgi2 test02 test03 ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/764.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/764.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/764.dot @@ -1,6 +1,5 @@ digraph "g" { "DcIPaddr_monitor_0 posic041" -> "DcIPaddr_start_0 posic043" [ style = dashed] -"DcIPaddr_monitor_0 posic041" -> "DcIPaddr_stop_0 posic043" [ style = bold] "DcIPaddr_monitor_0 posic041" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_5000 posic043" [ style=dashed color="red" fontcolor="black"] "DcIPaddr_start_0 posic043" -> "DcIPaddr_monitor_5000 posic043" [ style = dashed] @@ -15,7 +14,6 @@ "child_DoFencing:2_monitor_0 posic041" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 posic041" [ style=bold color="green" fontcolor="black" ] "rsc_posic041_monitor_0 posic043" -> "rsc_posic041_start_0 posic041" [ style = dashed] -"rsc_posic041_monitor_0 posic043" -> "rsc_posic041_stop_0 posic041" [ style = bold] "rsc_posic041_monitor_0 posic043" [ style=bold color="green" fontcolor="black" ] "rsc_posic041_monitor_5000 posic041" [ style=dashed color="red" fontcolor="black"] "rsc_posic041_start_0 posic041" -> "rsc_posic041_monitor_5000 posic041" [ style = dashed] @@ -24,7 +22,6 @@ "rsc_posic041_stop_0 posic041" -> "rsc_posic041_start_0 posic041" [ style = dashed] "rsc_posic041_stop_0 posic041" [ style=bold color="green" fontcolor="black" ] "rsc_posic042_monitor_0 posic043" -> "rsc_posic042_start_0 posic041" [ style = dashed] -"rsc_posic042_monitor_0 posic043" -> "rsc_posic042_stop_0 posic041" [ style = bold] "rsc_posic042_monitor_0 posic043" [ style=bold color="green" fontcolor="black" ] "rsc_posic042_monitor_5000 posic041" [ style=dashed color="red" fontcolor="black"] "rsc_posic042_start_0 posic041" -> "rsc_posic042_monitor_5000 posic041" [ style = dashed] @@ -33,7 +30,6 @@ "rsc_posic042_stop_0 posic041" -> "rsc_posic042_start_0 posic041" [ style = dashed] "rsc_posic042_stop_0 posic041" [ style=bold color="green" fontcolor="black" ] "rsc_posic043_monitor_0 posic041" -> "rsc_posic043_start_0 posic043" [ style = dashed] -"rsc_posic043_monitor_0 posic041" -> "rsc_posic043_stop_0 posic043" [ style = bold] "rsc_posic043_monitor_0 posic041" [ style=bold color="green" fontcolor="black" ] "rsc_posic043_monitor_5000 posic043" [ style=dashed color="red" fontcolor="black"] "rsc_posic043_start_0 posic043" -> "rsc_posic043_monitor_5000 posic043" [ style = dashed] @@ -42,7 +38,6 @@ "rsc_posic043_stop_0 posic043" -> "rsc_posic043_start_0 posic043" [ style = dashed] "rsc_posic043_stop_0 posic043" [ style=bold color="green" fontcolor="black" ] "rsc_posic044_monitor_0 posic043" -> "rsc_posic044_start_0 posic041" [ style = dashed] -"rsc_posic044_monitor_0 posic043" -> "rsc_posic044_stop_0 posic041" [ style = bold] "rsc_posic044_monitor_0 posic043" [ style=bold color="green" fontcolor="black" ] "rsc_posic044_monitor_5000 posic041" [ style=dashed color="red" fontcolor="black"] "rsc_posic044_start_0 posic041" -> "rsc_posic044_monitor_5000 posic041" [ style = dashed] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/764.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/764.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/764.exp @@ -6,11 +6,7 @@ <attributes CRM_meta_on_node="posic043" CRM_meta_on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596" CRM_meta_timeout="20000" ip="127.0.0.10"/> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="5" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="posic041" on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="1"> <action_set> @@ -28,11 +24,7 @@ <attributes CRM_meta_on_node="posic041" CRM_meta_on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad" CRM_meta_timeout="20000" ip="127.0.0.11"/> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="9" operation="monitor" operation_key="rsc_posic041_monitor_0" on_node="posic043" on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="3"> <action_set> @@ -50,11 +42,7 @@ <attributes CRM_meta_on_node="posic041" CRM_meta_on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad" CRM_meta_timeout="20000" ip="127.0.0.12"/> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="10" operation="monitor" operation_key="rsc_posic042_monitor_0" on_node="posic043" on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="5"> <action_set> @@ -72,11 +60,7 @@ <attributes CRM_meta_on_node="posic043" CRM_meta_on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596" CRM_meta_timeout="20000" ip="127.0.0.13"/> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="6" operation="monitor" operation_key="rsc_posic043_monitor_0" on_node="posic041" on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="7"> <action_set> @@ -94,11 +78,7 @@ <attributes CRM_meta_on_node="posic041" CRM_meta_on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad" CRM_meta_timeout="20000" ip="127.0.0.14"/> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="11" operation="monitor" operation_key="rsc_posic044_monitor_0" on_node="posic043" on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="9"> <action_set> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/764.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/764.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/764.summary @@ -22,21 +22,21 @@ Transition Summary: * Stop rsc_posic044 (Started posic041) Executing cluster transition: + * Resource action: DcIPaddr stop on posic043 * Resource action: DcIPaddr monitor on posic041 + * Resource action: rsc_posic041 stop on posic041 * Resource action: rsc_posic041 monitor on posic043 + * Resource action: rsc_posic042 stop on posic041 * Resource action: rsc_posic042 monitor on posic043 + * Resource action: rsc_posic043 stop on posic043 * Resource action: rsc_posic043 monitor on posic041 + * Resource action: rsc_posic044 stop on posic041 * Resource action: rsc_posic044 monitor on posic043 * Resource action: child_DoFencing:0 monitor=5000 on posic043 * Resource action: child_DoFencing:1 monitor=5000 on posic041 * Resource action: child_DoFencing:1 monitor on posic043 * Resource action: child_DoFencing:2 monitor on posic041 * Resource action: child_DoFencing:3 monitor on posic041 - * Resource action: DcIPaddr stop on posic043 - * Resource action: rsc_posic041 stop on posic041 - * Resource action: rsc_posic042 stop on posic041 - * Resource action: rsc_posic043 stop on posic043 - * Resource action: rsc_posic044 stop on posic041 * Pseudo action: all_stopped Revised cluster status: Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/797.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/797.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/797.dot @@ -2,7 +2,6 @@ "DcIPaddr_delete_0 c001n03" -> "DcIPaddr_start_0 c001n03" [ style = dashed] "DcIPaddr_delete_0 c001n03" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_0 c001n01" -> "DcIPaddr_start_0 c001n03" [ style = dashed] -"DcIPaddr_monitor_0 c001n01" -> "DcIPaddr_stop_0 c001n03" [ style = bold] "DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_0 c001n02" -> "DcIPaddr_start_0 c001n03" [ style = dashed] "DcIPaddr_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] @@ -51,7 +50,6 @@ "child_DoFencing:3_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "do_shutdown c001n02" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_monitor_0 c001n03" -> "rsc_c001n01_start_0 c001n01" [ style = dashed] -"rsc_c001n01_monitor_0 c001n03" -> "rsc_c001n01_stop_0 c001n01" [ style = bold] "rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_monitor_5000 c001n01" [ style=dashed color="red" fontcolor="black"] "rsc_c001n01_start_0 c001n01" -> "rsc_c001n01_monitor_5000 c001n01" [ style = dashed] @@ -60,10 +58,8 @@ "rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n01" [ style = dashed] "rsc_c001n01_stop_0 c001n01" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n01" -> "rsc_c001n02_start_0 c001n01" [ style = dashed] -"rsc_c001n02_monitor_0 c001n01" -> "rsc_c001n02_stop_0 c001n02" [ style = bold] "rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n03" -> "rsc_c001n02_start_0 c001n01" [ style = dashed] -"rsc_c001n02_monitor_0 c001n03" -> "rsc_c001n02_stop_0 c001n02" [ style = bold] "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_5000 c001n01" [ style=dashed color="red" fontcolor="black" ] "rsc_c001n02_start_0 c001n01" -> "rsc_c001n02_monitor_5000 c001n01" [ style = dashed] @@ -73,7 +69,6 @@ "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n01" [ style = dashed] "rsc_c001n02_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_monitor_0 c001n01" -> "rsc_c001n03_start_0 c001n03" [ style = dashed] -"rsc_c001n03_monitor_0 c001n01" -> "rsc_c001n03_stop_0 c001n03" [ style = bold] "rsc_c001n03_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_monitor_0 c001n02" -> "rsc_c001n03_start_0 c001n03" [ style = dashed] "rsc_c001n03_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] @@ -84,10 +79,8 @@ "rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = dashed] "rsc_c001n03_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_monitor_0 c001n01" -> "rsc_c001n08_start_0 c001n01" [ style = dashed] -"rsc_c001n08_monitor_0 c001n01" -> "rsc_c001n08_stop_0 c001n02" [ style = bold] "rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_monitor_0 c001n03" -> "rsc_c001n08_start_0 c001n01" [ style = dashed] -"rsc_c001n08_monitor_0 c001n03" -> "rsc_c001n08_stop_0 c001n02" [ style = bold] "rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_monitor_5000 c001n01" [ style=dashed color="red" fontcolor="black" ] "rsc_c001n08_start_0 c001n01" -> "rsc_c001n08_monitor_5000 c001n01" [ style = dashed] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/797.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/797.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/797.exp @@ -37,11 +37,7 @@ <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000" ip="127.0.0.10"/> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="12" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="4"> <action_set> @@ -50,14 +46,7 @@ <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000" ip="127.0.0.11"/> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="13" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> - </trigger> - <trigger> - <rsc_op id="21" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="5"> <action_set> @@ -84,14 +73,7 @@ <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000" ip="127.0.0.12"/> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="14" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> - </trigger> - <trigger> - <rsc_op id="22" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="8"> <action_set> @@ -118,11 +100,7 @@ <attributes CRM_meta_on_node="c001n03" CRM_meta_on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193" CRM_meta_timeout="20000" ip="127.0.0.13"/> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="15" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="11"> <action_set> @@ -149,11 +127,7 @@ <attributes CRM_meta_on_node="c001n01" CRM_meta_on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3" CRM_meta_timeout="20000" ip="127.0.0.14"/> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="23" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="14"> <action_set> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/797.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/797.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/797.summary @@ -28,12 +28,16 @@ Executing cluster transition: * Resource action: DcIPaddr monitor on c001n02 * Resource action: DcIPaddr monitor on c001n01 * Resource action: DcIPaddr stop on c001n03 + * Resource action: rsc_c001n08 stop on c001n02 * Resource action: rsc_c001n08 monitor on c001n03 * Resource action: rsc_c001n08 monitor on c001n01 + * Resource action: rsc_c001n02 stop on c001n02 * Resource action: rsc_c001n02 monitor on c001n03 * Resource action: rsc_c001n02 monitor on c001n01 + * Resource action: rsc_c001n03 stop on c001n03 * Resource action: rsc_c001n03 monitor on c001n02 * Resource action: rsc_c001n03 monitor on c001n01 + * Resource action: rsc_c001n01 stop on c001n01 * Resource action: rsc_c001n01 monitor on c001n03 * Resource action: child_DoFencing:2 monitor on c001n01 * Resource action: child_DoFencing:3 monitor on c001n03 @@ -41,10 +45,6 @@ Executing cluster transition: * Resource action: child_DoFencing:3 monitor on c001n01 * Pseudo action: DoFencing_stop_0 * Resource action: DcIPaddr delete on c001n03 - * Resource action: rsc_c001n08 stop on c001n02 - * Resource action: rsc_c001n02 stop on c001n02 - * Resource action: rsc_c001n03 stop on c001n03 - * Resource action: rsc_c001n01 stop on c001n01 * Resource action: child_DoFencing:0 stop on c001n03 * Resource action: child_DoFencing:0 stop on c001n01 * Resource action: child_DoFencing:1 stop on c001n02 Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/829.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/829.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/829.dot @@ -18,13 +18,10 @@ digraph "g" { "rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n01" -> "rsc_c001n02_start_0 c001n01" [ style = bold] -"rsc_c001n02_monitor_0 c001n01" -> "rsc_c001n02_stop_0 c001n02" [ style = bold] "rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n03" -> "rsc_c001n02_start_0 c001n01" [ style = bold] -"rsc_c001n02_monitor_0 c001n03" -> "rsc_c001n02_stop_0 c001n02" [ style = bold] "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n08" -> "rsc_c001n02_start_0 c001n01" [ style = bold] -"rsc_c001n02_monitor_0 c001n08" -> "rsc_c001n02_stop_0 c001n02" [ style = bold] "rsc_c001n02_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_5000 c001n01" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_start_0 c001n01" -> "rsc_c001n02_monitor_5000 c001n01" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/829.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/829.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/829.exp @@ -81,15 +81,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="11" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> - </trigger> - <trigger> - <rsc_op id="18" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> - </trigger> - <trigger> - <rsc_op id="22" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> - </trigger> - <trigger> <crm_event id="49" operation="stonith" operation_key="stonith-c001n02-reboot" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/bug-n-387749.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/bug-n-387749.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/bug-n-387749.dot @@ -43,7 +43,6 @@ digraph "g" { "group_nfs_stopped_0" -> "group_nfs_start_0" [ style = bold] "group_nfs_stopped_0" [ style=bold color="green" fontcolor="orange" ] "resource_ipaddr1_single_monitor_0 power720-1" -> "resource_ipaddr1_single_start_0 power720-1" [ style = bold] -"resource_ipaddr1_single_monitor_0 power720-1" -> "resource_ipaddr1_single_stop_0 power720-2" [ style = bold] "resource_ipaddr1_single_monitor_0 power720-1" [ style=bold color="green" fontcolor="black" ] "resource_ipaddr1_single_monitor_5000 power720-1" [ style=bold color="green" fontcolor="black" ] "resource_ipaddr1_single_start_0 power720-1" -> "group_nfs_running_0" [ style = bold] @@ -55,7 +54,6 @@ digraph "g" { "resource_ipaddr1_single_stop_0 power720-2" -> "resource_ipaddr1_single_start_0 power720-1" [ style = bold] "resource_ipaddr1_single_stop_0 power720-2" [ style=bold color="green" fontcolor="black" ] "resource_nfsserver_single_monitor_0 power720-1" -> "resource_nfsserver_single_start_0 power720-1" [ style = bold] -"resource_nfsserver_single_monitor_0 power720-1" -> "resource_nfsserver_single_stop_0 power720-2" [ style = bold] "resource_nfsserver_single_monitor_0 power720-1" [ style=bold color="green" fontcolor="black" ] "resource_nfsserver_single_monitor_15000 power720-1" [ style=bold color="green" fontcolor="black" ] "resource_nfsserver_single_start_0 power720-1" -> "group_nfs_running_0" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/bug-n-387749.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/bug-n-387749.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/bug-n-387749.exp @@ -270,9 +270,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="7" operation="monitor" operation_key="resource_ipaddr1_single_monitor_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3"/> - </trigger> - <trigger> <rsc_op id="27" operation="stop" operation_key="resource_nfsserver_single_stop_0" on_node="power720-2" on_node_uuid="1a1ecd04-01a0-43bf-9392-11b89f7d6f10"/> </trigger> <trigger> @@ -333,9 +330,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="8" operation="monitor" operation_key="resource_nfsserver_single_monitor_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3"/> - </trigger> - <trigger> <pseudo_event id="32" operation="stop" operation_key="group_nfs_stop_0"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/bug-n-387749.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/bug-n-387749.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/bug-n-387749.summary @@ -23,17 +23,17 @@ Executing cluster transition: * Pseudo action: export_home_ocfs2_clone_set_pre_notify_start_0 * Pseudo action: group_nfs_stop_0 * Resource action: resource_ipaddr1_single monitor on power720-1 + * Resource action: resource_nfsserver_single stop on power720-2 * Resource action: resource_nfsserver_single monitor on power720-1 * Resource action: export_home_ocfs2:1 notify on power720-2 * Pseudo action: export_home_ocfs2_clone_set_confirmed-pre_notify_start_0 * Pseudo action: export_home_ocfs2_clone_set_start_0 - * Resource action: resource_nfsserver_single stop on power720-2 - * Resource action: export_home_ocfs2:0 start on power720-1 - * Pseudo action: export_home_ocfs2_clone_set_running_0 * Resource action: resource_ipaddr1_single stop on power720-2 * Pseudo action: all_stopped - * Pseudo action: export_home_ocfs2_clone_set_post_notify_running_0 + * Resource action: export_home_ocfs2:0 start on power720-1 + * Pseudo action: export_home_ocfs2_clone_set_running_0 * Pseudo action: group_nfs_stopped_0 + * Pseudo action: export_home_ocfs2_clone_set_post_notify_running_0 * Resource action: export_home_ocfs2:0 notify on power720-1 * Resource action: export_home_ocfs2:1 notify on power720-2 * Pseudo action: export_home_ocfs2_clone_set_confirmed-post_notify_running_0 Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/group5.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/group5.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/group5.dot @@ -1,7 +1,6 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_rsc1_monitor_0 node2" -> "child_rsc1_start_0 node2" [ style = bold] -"child_rsc1_monitor_0 node2" -> "child_rsc1_stop_0 node1" [ style = bold] "child_rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1_start_0 node2" -> "child_rsc2_start_0 node2" [ style = bold] "child_rsc1_start_0 node2" -> "rsc2_running_0" [ style = bold] @@ -11,7 +10,6 @@ "child_rsc1_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2_monitor_0 node2" -> "child_rsc2_start_0 node2" [ style = bold] -"child_rsc2_monitor_0 node2" -> "child_rsc2_stop_0 node1" [ style = bold] "child_rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2_start_0 node2" -> "child_rsc3_start_0 node2" [ style = bold] "child_rsc2_start_0 node2" -> "rsc2_running_0" [ style = bold] @@ -22,7 +20,6 @@ "child_rsc2_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc3_monitor_0 node2" -> "child_rsc3_start_0 node2" [ style = bold] -"child_rsc3_monitor_0 node2" -> "child_rsc3_stop_0 node1" [ style = bold] "child_rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc3_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ] @@ -32,7 +29,6 @@ "child_rsc3_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = bold] -"rsc1_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node2" -> "rsc2_start_0" [ style = bold] "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ] @@ -55,7 +51,6 @@ "rsc2_stopped_0" -> "rsc2_start_0" [ style = bold] "rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc3_monitor_0 node2" -> "rsc3_start_0 node2" [ style = bold] -"rsc3_monitor_0 node2" -> "rsc3_stop_0 node1" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_stop_0 node1" -> "all_stopped" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/group5.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/group5.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/group5.exp @@ -24,9 +24,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="2" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <pseudo_event id="18" operation="stopped" operation_key="rsc2_stopped_0"/> </trigger> </inputs> @@ -137,9 +134,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="3" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <rsc_op id="11" operation="stop" operation_key="child_rsc2_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -187,9 +181,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="4" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <rsc_op id="13" operation="stop" operation_key="child_rsc3_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -237,9 +228,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="5" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <pseudo_event id="17" operation="stop" operation_key="rsc2_stop_0"/> </trigger> </inputs> @@ -279,11 +267,7 @@ <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="6" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="18"> <action_set> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/group5.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/group5.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/group5.summary @@ -21,8 +21,8 @@ Executing cluster transition: * Resource action: child_rsc1 monitor on node2 * Resource action: child_rsc2 monitor on node2 * Resource action: child_rsc3 monitor on node2 - * Resource action: rsc3 monitor on node2 * Resource action: rsc3 stop on node1 + * Resource action: rsc3 monitor on node2 * Pseudo action: rsc2_stop_0 * Resource action: child_rsc3 stop on node1 * Resource action: child_rsc2 stop on node1 Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/group6.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/group6.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/group6.dot @@ -1,7 +1,6 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_rsc1_monitor_0 node2" -> "child_rsc1_start_0 node2" [ style = bold] -"child_rsc1_monitor_0 node2" -> "child_rsc1_stop_0 node1" [ style = bold] "child_rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1_start_0 node2" -> "child_rsc2_start_0 node2" [ style = bold] "child_rsc1_start_0 node2" -> "rsc1_running_0" [ style = bold] @@ -11,7 +10,6 @@ "child_rsc1_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2_monitor_0 node2" -> "child_rsc2_start_0 node2" [ style = bold] -"child_rsc2_monitor_0 node2" -> "child_rsc2_stop_0 node1" [ style = bold] "child_rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2_start_0 node2" -> "child_rsc3_start_0 node2" [ style = bold] "child_rsc2_start_0 node2" -> "rsc1_running_0" [ style = bold] @@ -22,7 +20,6 @@ "child_rsc2_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc3_monitor_0 node2" -> "child_rsc3_start_0 node2" [ style = bold] -"child_rsc3_monitor_0 node2" -> "child_rsc3_stop_0 node1" [ style = bold] "child_rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc3_start_0 node2" -> "rsc1_running_0" [ style = bold] "child_rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ] @@ -32,7 +29,6 @@ "child_rsc3_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc4_monitor_0 node2" -> "child_rsc4_start_0 node2" [ style = bold] -"child_rsc4_monitor_0 node2" -> "child_rsc4_stop_0 node1" [ style = bold] "child_rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc4_start_0 node2" -> "child_rsc5_start_0 node2" [ style = bold] "child_rsc4_start_0 node2" -> "rsc2_running_0" [ style = bold] @@ -42,7 +38,6 @@ "child_rsc4_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc5_monitor_0 node2" -> "child_rsc5_start_0 node2" [ style = bold] -"child_rsc5_monitor_0 node2" -> "child_rsc5_stop_0 node1" [ style = bold] "child_rsc5_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc5_start_0 node2" -> "child_rsc6_start_0 node2" [ style = bold] "child_rsc5_start_0 node2" -> "rsc2_running_0" [ style = bold] @@ -53,7 +48,6 @@ "child_rsc5_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc5_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc6_monitor_0 node2" -> "child_rsc6_start_0 node2" [ style = bold] -"child_rsc6_monitor_0 node2" -> "child_rsc6_stop_0 node1" [ style = bold] "child_rsc6_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc6_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc6_start_0 node2" [ style=bold color="green" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/group6.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/group6.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/group6.exp @@ -93,9 +93,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="2" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <rsc_op id="10" operation="stop" operation_key="child_rsc2_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -143,9 +140,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="3" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <rsc_op id="12" operation="stop" operation_key="child_rsc3_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -193,9 +187,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="4" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <pseudo_event id="16" operation="stop" operation_key="rsc1_stop_0"/> </trigger> </inputs> @@ -302,9 +293,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="5" operation="monitor" operation_key="child_rsc4_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <rsc_op id="20" operation="stop" operation_key="child_rsc5_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -352,9 +340,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="6" operation="monitor" operation_key="child_rsc5_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <rsc_op id="22" operation="stop" operation_key="child_rsc6_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -402,9 +387,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="7" operation="monitor" operation_key="child_rsc6_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <pseudo_event id="26" operation="stop" operation_key="rsc2_stop_0"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/group6.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/group6.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/group6.summary @@ -26,8 +26,8 @@ Executing cluster transition: * Pseudo action: rsc2_stop_0 * Resource action: child_rsc4 monitor on node2 * Resource action: child_rsc5 monitor on node2 - * Resource action: child_rsc6 monitor on node2 * Resource action: child_rsc6 stop on node1 + * Resource action: child_rsc6 monitor on node2 * Resource action: child_rsc5 stop on node1 * Resource action: child_rsc4 stop on node1 * Pseudo action: rsc2_stopped_0 Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/group9.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/group9.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/group9.dot @@ -37,7 +37,6 @@ "rsc4_stop_0 node1" -> "rsc4_start_0 node1" [ style = bold] "rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc5_monitor_0 node2" -> "rsc5_start_0 node1" [ style = bold] -"rsc5_monitor_0 node2" -> "rsc5_stop_0 node1" [ style = bold] "rsc5_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc5_start_0 node1" -> "foo_running_0" [ style = bold] "rsc5_start_0 node1" [ style=bold color="green" fontcolor="black" ] @@ -47,7 +46,6 @@ "rsc5_stop_0 node1" -> "rsc5_start_0 node1" [ style = bold] "rsc5_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc6_monitor_0 node2" -> "rsc6_start_0 node2" [ style = bold] -"rsc6_monitor_0 node2" -> "rsc6_stop_0 node1" [ style = bold] "rsc6_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc6_start_0 node2" -> "bar_running_0" [ style = bold] "rsc6_start_0 node2" -> "rsc7_start_0 node2" [ style = bold] @@ -67,7 +65,6 @@ "rsc7_stop_0 node1" -> "rsc7_start_0 node2" [ style = bold] "rsc7_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc8_monitor_0 node2" -> "rsc8_start_0 node2" [ style = bold] -"rsc8_monitor_0 node2" -> "rsc8_stop_0 node1" [ style = bold] "rsc8_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc8_start_0 node2" -> "bar_running_0" [ style = bold] "rsc8_start_0 node2" [ style=bold color="green" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/group9.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/group9.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/group9.exp @@ -157,9 +157,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="8" operation="monitor" operation_key="rsc5_monitor_0" on_node="node2" on_node_uuid="node2"/> - </trigger> - <trigger> <pseudo_event id="23" operation="stop" operation_key="foo_stop_0"/> </trigger> </inputs> @@ -266,9 +263,6 @@ <rsc_op id="2" operation="stop" operation_key="rsc7_stop_0" on_node="node1" on_node_uuid="node1"/> </trigger> <trigger> - <rsc_op id="9" operation="monitor" operation_key="rsc6_monitor_0" on_node="node2" on_node_uuid="node2"/> - </trigger> - <trigger> <pseudo_event id="32" operation="stop" operation_key="bar_stop_0"/> </trigger> </inputs> @@ -360,9 +354,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="11" operation="monitor" operation_key="rsc8_monitor_0" on_node="node2" on_node_uuid="node2"/> - </trigger> - <trigger> <pseudo_event id="32" operation="stop" operation_key="bar_stop_0"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/group9.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/group9.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/group9.summary @@ -26,13 +26,13 @@ Executing cluster transition: * Pseudo action: foo_stop_0 * Resource action: rsc3 monitor on node2 * Resource action: rsc4 monitor on node2 + * Resource action: rsc5 stop on node1 * Resource action: rsc5 monitor on node2 * Pseudo action: bar_stop_0 * Resource action: rsc6 monitor on node2 * Resource action: rsc7 monitor on node2 - * Resource action: rsc8 monitor on node2 - * Resource action: rsc5 stop on node1 * Resource action: rsc8 stop on node1 + * Resource action: rsc8 monitor on node2 * Resource action: rsc4 stop on node1 * Resource action: rsc7 stop on node1 * Pseudo action: foo_stopped_0 Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/guest-node-host-dies.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/guest-node-host-dies.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/guest-node-host-dies.dot @@ -67,13 +67,10 @@ digraph "g" { "lxc-ms_stop_0 lxc2" -> "lxc-ms_start_0 lxc2" [ style = bold] "lxc-ms_stop_0 lxc2" [ style=bold color="green" fontcolor="orange"] "lxc1_monitor_0 rhel7-3" -> "lxc1_start_0 rhel7-2" [ style = bold] -"lxc1_monitor_0 rhel7-3" -> "lxc1_stop_0 rhel7-1" [ style = bold] "lxc1_monitor_0 rhel7-3" [ style=bold color="green" fontcolor="black"] "lxc1_monitor_0 rhel7-4" -> "lxc1_start_0 rhel7-2" [ style = bold] -"lxc1_monitor_0 rhel7-4" -> "lxc1_stop_0 rhel7-1" [ style = bold] "lxc1_monitor_0 rhel7-4" [ style=bold color="green" fontcolor="black"] "lxc1_monitor_0 rhel7-5" -> "lxc1_start_0 rhel7-2" [ style = bold] -"lxc1_monitor_0 rhel7-5" -> "lxc1_stop_0 rhel7-1" [ style = bold] "lxc1_monitor_0 rhel7-5" [ style=bold color="green" fontcolor="black"] "lxc1_monitor_30000 rhel7-2" [ style=bold color="green" fontcolor="black"] "lxc1_start_0 rhel7-2" -> "lxc-ms_promote_0 lxc1" [ style = bold] @@ -85,13 +82,10 @@ digraph "g" { "lxc1_stop_0 rhel7-1" -> "lxc1_start_0 rhel7-2" [ style = bold] "lxc1_stop_0 rhel7-1" [ style=bold color="green" fontcolor="orange"] "lxc2_monitor_0 rhel7-2" -> "lxc2_start_0 rhel7-3" [ style = bold] -"lxc2_monitor_0 rhel7-2" -> "lxc2_stop_0 rhel7-1" [ style = bold] "lxc2_monitor_0 rhel7-2" [ style=bold color="green" fontcolor="black"] "lxc2_monitor_0 rhel7-4" -> "lxc2_start_0 rhel7-3" [ style = bold] -"lxc2_monitor_0 rhel7-4" -> "lxc2_stop_0 rhel7-1" [ style = bold] "lxc2_monitor_0 rhel7-4" [ style=bold color="green" fontcolor="black"] "lxc2_monitor_0 rhel7-5" -> "lxc2_start_0 rhel7-3" [ style = bold] -"lxc2_monitor_0 rhel7-5" -> "lxc2_stop_0 rhel7-1" [ style = bold] "lxc2_monitor_0 rhel7-5" [ style=bold color="green" fontcolor="black"] "lxc2_monitor_30000 rhel7-3" [ style=bold color="green" fontcolor="black"] "lxc2_start_0 rhel7-3" -> "lxc-ms_monitor_10000 lxc2" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/guest-node-host-dies.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/guest-node-host-dies.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/guest-node-host-dies.exp @@ -453,15 +453,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="5" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-3" on_node_uuid="4"/> - </trigger> - <trigger> - <rsc_op id="6" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-4" on_node_uuid="5"/> - </trigger> - <trigger> - <rsc_op id="8" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-5" on_node_uuid="3"/> - </trigger> - <trigger> <crm_event id="42" operation="stonith" operation_key="stonith-rhel7-1-reboot" on_node="rhel7-1" on_node_uuid="1"/> </trigger> </inputs> @@ -542,15 +533,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="4" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-2" on_node_uuid="2"/> - </trigger> - <trigger> - <rsc_op id="7" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-4" on_node_uuid="5"/> - </trigger> - <trigger> - <rsc_op id="9" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-5" on_node_uuid="3"/> - </trigger> - <trigger> <crm_event id="42" operation="stonith" operation_key="stonith-rhel7-1-reboot" on_node="rhel7-1" on_node_uuid="1"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/inc2.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/inc2.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/inc2.dot @@ -4,7 +4,6 @@ "child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_monitor_0 node2" -> "rsc1_start_0" [ style = bold] "child_rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] -"child_rsc1:2_monitor_0 node2" -> "child_rsc1:2_stop_0 node1" [ style = bold] "child_rsc1:2_monitor_0 node2" -> "rsc1_start_0" [ style = bold] "child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_start_0 node2" -> "rsc1_running_0" [ style = bold] @@ -13,7 +12,6 @@ "child_rsc1:2_stop_0 node1" -> "child_rsc1:2_start_0 node2" [ style = bold] "child_rsc1:2_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"child_rsc1:3_monitor_0 node2" -> "child_rsc1:3_stop_0 node1" [ style = bold] "child_rsc1:3_monitor_0 node2" -> "rsc1_start_0" [ style = bold] "child_rsc1:3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_start_0 node2" -> "rsc1_running_0" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/inc2.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/inc2.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/inc2.exp @@ -42,9 +42,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="4" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <pseudo_event id="18" operation="stop" operation_key="rsc1_stop_0"/> </trigger> </inputs> @@ -83,9 +80,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="5" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <pseudo_event id="18" operation="stop" operation_key="rsc1_stop_0"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/inc3.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/inc3.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/inc3.dot @@ -4,7 +4,6 @@ "child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_monitor_0 node2" -> "rsc1_start_0" [ style = bold] "child_rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] -"child_rsc1:2_monitor_0 node2" -> "child_rsc1:2_stop_0 node1" [ style = bold] "child_rsc1:2_monitor_0 node2" -> "rsc1_start_0" [ style = bold] "child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_start_0 node2" -> "rsc1_running_0" [ style = bold] @@ -13,7 +12,6 @@ "child_rsc1:2_stop_0 node1" -> "child_rsc1:2_start_0 node2" [ style = bold] "child_rsc1:2_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"child_rsc1:3_monitor_0 node2" -> "child_rsc1:3_stop_0 node1" [ style = bold] "child_rsc1:3_monitor_0 node2" -> "rsc1_start_0" [ style = bold] "child_rsc1:3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_start_0 node2" -> "rsc1_running_0" [ style = bold] @@ -33,7 +31,6 @@ "child_rsc2:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:2_monitor_0 node1" -> "rsc2_start_0" [ style = bold] "child_rsc2:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] -"child_rsc2:3_monitor_0 node1" -> "child_rsc2:3_stop_0 node2" [ style = bold] "child_rsc2:3_monitor_0 node1" -> "rsc2_start_0" [ style = bold] "child_rsc2:3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:3_start_0 node1" -> "rsc2_running_0" [ style = bold] @@ -42,7 +39,6 @@ "child_rsc2:3_stop_0 node2" -> "child_rsc2:3_start_0 node1" [ style = bold] "child_rsc2:3_stop_0 node2" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:3_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"child_rsc2:4_monitor_0 node1" -> "child_rsc2:4_stop_0 node2" [ style = bold] "child_rsc2:4_monitor_0 node1" -> "rsc2_start_0" [ style = bold] "child_rsc2:4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:4_start_0 node1" -> "rsc2_running_0" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/inc3.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/inc3.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/inc3.exp @@ -42,9 +42,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="9" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <pseudo_event id="23" operation="stop" operation_key="rsc1_stop_0"/> </trigger> </inputs> @@ -83,9 +80,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="10" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <pseudo_event id="23" operation="stop" operation_key="rsc1_stop_0"/> </trigger> </inputs> @@ -251,9 +245,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="5" operation="monitor" operation_key="child_rsc2:3_monitor_0" on_node="node1" on_node_uuid="uuid1"/> - </trigger> - <trigger> <pseudo_event id="37" operation="stop" operation_key="rsc2_stop_0"/> </trigger> </inputs> @@ -292,9 +283,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="6" operation="monitor" operation_key="child_rsc2:4_monitor_0" on_node="node1" on_node_uuid="uuid1"/> - </trigger> - <trigger> <pseudo_event id="37" operation="stop" operation_key="rsc2_stop_0"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/inc4.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/inc4.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/inc4.dot @@ -4,7 +4,6 @@ "child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_monitor_0 node2" -> "rsc1_start_0" [ style = bold] "child_rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] -"child_rsc1:2_monitor_0 node2" -> "child_rsc1:2_stop_0 node1" [ style = bold] "child_rsc1:2_monitor_0 node2" -> "rsc1_start_0" [ style = bold] "child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_start_0 node2" -> "child_rsc1:3_start_0 node2" [ style = bold] @@ -14,7 +13,6 @@ "child_rsc1:2_stop_0 node1" -> "child_rsc1:2_start_0 node2" [ style = bold] "child_rsc1:2_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"child_rsc1:3_monitor_0 node2" -> "child_rsc1:3_stop_0 node1" [ style = bold] "child_rsc1:3_monitor_0 node2" -> "rsc1_start_0" [ style = bold] "child_rsc1:3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_start_0 node2" -> "rsc1_running_0" [ style = bold] @@ -36,7 +34,6 @@ "child_rsc2:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:2_monitor_0 node1" -> "rsc2_start_0" [ style = bold] "child_rsc2:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] -"child_rsc2:3_monitor_0 node1" -> "child_rsc2:3_stop_0 node2" [ style = bold] "child_rsc2:3_monitor_0 node1" -> "rsc2_start_0" [ style = bold] "child_rsc2:3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:3_start_0 node1" -> "child_rsc2:4_start_0 node1" [ style = bold] @@ -46,7 +43,6 @@ "child_rsc2:3_stop_0 node2" -> "child_rsc2:3_start_0 node1" [ style = bold] "child_rsc2:3_stop_0 node2" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:3_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"child_rsc2:4_monitor_0 node1" -> "child_rsc2:4_stop_0 node2" [ style = bold] "child_rsc2:4_monitor_0 node1" -> "rsc2_start_0" [ style = bold] "child_rsc2:4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:4_start_0 node1" -> "rsc2_running_0" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/inc4.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/inc4.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/inc4.exp @@ -42,9 +42,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="9" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <rsc_op id="18" operation="stop" operation_key="child_rsc1:3_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -89,9 +86,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="10" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <rsc_op id="20" operation="stop" operation_key="child_rsc1:4_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -260,9 +254,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="5" operation="monitor" operation_key="child_rsc2:3_monitor_0" on_node="node1" on_node_uuid="uuid1"/> - </trigger> - <trigger> <rsc_op id="33" operation="stop" operation_key="child_rsc2:4_stop_0" on_node="node2" on_node_uuid="uuid2"/> </trigger> <trigger> @@ -307,9 +298,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="6" operation="monitor" operation_key="child_rsc2:4_monitor_0" on_node="node1" on_node_uuid="uuid1"/> - </trigger> - <trigger> <pseudo_event id="37" operation="stop" operation_key="rsc2_stop_0"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/inc5.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/inc5.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/inc5.dot @@ -6,7 +6,6 @@ "child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2:0_monitor_0 node2" -> "rsc2_start_0" [ style = bold] "child_rsc2:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] -"child_rsc2:1_monitor_0 node2" -> "child_rsc2:1_stop_0 node1" [ style = bold] "child_rsc2:1_monitor_0 node2" -> "rsc2_start_0" [ style = bold] "child_rsc2:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2:1_start_0 node2" -> "rsc2_running_0" [ style = bold] @@ -25,7 +24,6 @@ "child_rsc3:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc4:0_monitor_0 node2" -> "rsc4_start_0" [ style = bold] "child_rsc4:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] -"child_rsc4:1_monitor_0 node2" -> "child_rsc4:1_stop_0 node1" [ style = bold] "child_rsc4:1_monitor_0 node2" -> "rsc4_start_0" [ style = bold] "child_rsc4:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc4:1_start_0 node2" -> "rsc4_running_0" [ style = bold] @@ -40,7 +38,6 @@ "child_rsc4:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc5:0_monitor_0 node1" -> "rsc5_start_0" [ style = bold] "child_rsc5:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] -"child_rsc5:1_monitor_0 node1" -> "child_rsc5:1_stop_0 node2" [ style = bold] "child_rsc5:1_monitor_0 node1" -> "rsc5_start_0" [ style = bold] "child_rsc5:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc5:1_start_0 node1" -> "rsc5_running_0" [ style = bold] @@ -59,7 +56,6 @@ "child_rsc6:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc7:0_monitor_0 node1" -> "rsc7_start_0" [ style = bold] "child_rsc7:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] -"child_rsc7:1_monitor_0 node1" -> "child_rsc7:1_stop_0 node2" [ style = bold] "child_rsc7:1_monitor_0 node1" -> "rsc7_start_0" [ style = bold] "child_rsc7:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc7:1_start_0 node1" -> "rsc7_running_0" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/inc5.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/inc5.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/inc5.exp @@ -69,9 +69,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="21" operation="monitor" operation_key="child_rsc2:1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <pseudo_event id="48" operation="stop" operation_key="rsc2_stop_0"/> </trigger> </inputs> @@ -235,9 +232,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="26" operation="monitor" operation_key="child_rsc4:1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <pseudo_event id="64" operation="stop" operation_key="rsc4_stop_0"/> </trigger> </inputs> @@ -365,9 +359,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="9" operation="monitor" operation_key="child_rsc5:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> - </trigger> - <trigger> <pseudo_event id="72" operation="stop" operation_key="rsc5_stop_0"/> </trigger> </inputs> @@ -531,9 +522,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="14" operation="monitor" operation_key="child_rsc7:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> - </trigger> - <trigger> <pseudo_event id="88" operation="stop" operation_key="rsc7_stop_0"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/migrate-1.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/migrate-1.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/migrate-1.dot @@ -7,7 +7,6 @@ "rsc3_migrate_to_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc3_monitor_0 node2" -> "rsc3_migrate_to_0 node1" [ style = bold] "rsc3_monitor_0 node2" -> "rsc3_start_0 node2" [ style = bold] -"rsc3_monitor_0 node2" -> "rsc3_stop_0 node1" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_start_0 node2" [ style=bold color="green" fontcolor="orange" ] "rsc3_stop_0 node1" -> "all_stopped" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/migrate-1.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/migrate-1.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/migrate-1.exp @@ -52,9 +52,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="2" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2"/> - </trigger> - <trigger> <rsc_op id="6" operation="migrate_from" operation_key="rsc3_migrate_from_0" on_node="node2" on_node_uuid="node2"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/mon-rsc-2.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/mon-rsc-2.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/mon-rsc-2.dot @@ -1,7 +1,6 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node1" -> "rsc1_start_0 node1" [ style = bold] -"rsc1_monitor_0 node1" -> "rsc1_stop_0 node2" [ style = bold] "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_monitor_5000 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node1" -> "rsc1_monitor_5000 node1" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/mon-rsc-2.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/mon-rsc-2.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/mon-rsc-2.exp @@ -35,11 +35,7 @@ <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="2" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="3"> <action_set> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/mon-rsc-2.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/mon-rsc-2.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/mon-rsc-2.summary @@ -9,8 +9,8 @@ Transition Summary: * Move rsc1 (Started node2 -> node1) Executing cluster transition: - * Resource action: rsc1 monitor on node1 * Resource action: rsc1 stop on node2 + * Resource action: rsc1 monitor on node1 * Pseudo action: all_stopped * Resource action: rsc1 start on node1 * Resource action: rsc1 monitor=5000 on node1 Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/mon-rsc-4.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/mon-rsc-4.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/mon-rsc-4.dot @@ -1,7 +1,6 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node1" -> "rsc1_start_0 node1" [ style = bold] -"rsc1_monitor_0 node1" -> "rsc1_stop_0 node2" [ style = bold] "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_monitor_5000 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node1" -> "rsc1_monitor_5000 node1" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/mon-rsc-4.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/mon-rsc-4.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/mon-rsc-4.exp @@ -19,11 +19,7 @@ <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="2" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="2"> <action_set> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/mon-rsc-4.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/mon-rsc-4.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/mon-rsc-4.summary @@ -9,10 +9,10 @@ Transition Summary: * Move rsc1 (Started node2 -> node1) Executing cluster transition: - * Resource action: rsc1 monitor on node1 * Resource action: rsc1 stop on node2 - * Resource action: rsc1 start on node1 + * Resource action: rsc1 monitor on node1 * Pseudo action: all_stopped + * Resource action: rsc1 start on node1 * Resource action: rsc1 monitor=5000 on node1 Revised cluster status: Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/notify-3.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/notify-3.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/notify-3.dot @@ -10,7 +10,6 @@ "child_rsc1:0_pre_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_pre_notify_stop_0 node1" -> "rsc1_confirmed-pre_notify_stop_0" [ style = bold] "child_rsc1:0_pre_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"child_rsc1:1_monitor_0 node1" -> "child_rsc1:1_stop_0 node2" [ style = bold] "child_rsc1:1_monitor_0 node1" -> "rsc1_start_0" [ style = bold] "child_rsc1:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_running_0" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/notify-3.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/notify-3.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/notify-3.exp @@ -111,9 +111,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="2" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> - </trigger> - <trigger> <pseudo_event id="17" operation="stop" operation_key="rsc1_stop_0"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/novell-252693-2.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/novell-252693-2.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/novell-252693-2.dot @@ -108,7 +108,6 @@ "sles10_migrate_to_0 node2" [ style=bold color="green" fontcolor="black" ] "sles10_monitor_0 node1" -> "sles10_migrate_to_0 node2" [ style = bold] "sles10_monitor_0 node1" -> "sles10_start_0 node1" [ style = bold] -"sles10_monitor_0 node1" -> "sles10_stop_0 node2" [ style = bold] "sles10_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "sles10_monitor_10000 node1" [ style=bold color="green" fontcolor="black" ] "sles10_start_0 node1" -> "sles10_monitor_10000 node1" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/novell-252693-2.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/novell-252693-2.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/novell-252693-2.exp @@ -683,9 +683,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="12" operation="monitor" operation_key="sles10_monitor_0" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a"/> - </trigger> - <trigger> <rsc_op id="80" operation="migrate_from" operation_key="sles10_migrate_from_0" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/novell-252693-3.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/novell-252693-3.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/novell-252693-3.dot @@ -134,7 +134,6 @@ "sles10_migrate_to_0 node2" [ style=bold color="green" fontcolor="black"] "sles10_monitor_0 node1" -> "sles10_migrate_to_0 node2" [ style = bold] "sles10_monitor_0 node1" -> "sles10_start_0 node1" [ style = bold] -"sles10_monitor_0 node1" -> "sles10_stop_0 node2" [ style = bold] "sles10_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "sles10_monitor_10000 node1" [ style=bold color="green" fontcolor="black" ] "sles10_start_0 node1" -> "sles10_monitor_10000 node1" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/novell-252693-3.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/novell-252693-3.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/novell-252693-3.exp @@ -812,9 +812,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="13" operation="monitor" operation_key="sles10_monitor_0" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a"/> - </trigger> - <trigger> <rsc_op id="81" operation="migrate_from" operation_key="sles10_migrate_from_0" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/order3.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/order3.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/order3.dot @@ -1,7 +1,6 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = bold] -"rsc1_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ] @@ -9,7 +8,6 @@ "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] -"rsc2_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" -> "rsc3_start_0 node2" [ style = bold] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] @@ -19,7 +17,6 @@ "rsc2_stop_0 node1" -> "rsc4_stop_0 node1" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc3_monitor_0 node2" -> "rsc3_start_0 node2" [ style = bold] -"rsc3_monitor_0 node2" -> "rsc3_stop_0 node1" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_stop_0 node1" -> "all_stopped" [ style = bold] @@ -27,7 +24,6 @@ "rsc3_stop_0 node1" -> "rsc3_start_0 node2" [ style = bold] "rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc4_monitor_0 node2" -> "rsc4_start_0 node2" [ style = bold] -"rsc4_monitor_0 node2" -> "rsc4_stop_0 node1" [ style = bold] "rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_start_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/order3.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/order3.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/order3.exp @@ -24,9 +24,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="2" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <rsc_op id="8" operation="stop" operation_key="rsc2_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> </inputs> @@ -71,9 +68,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="3" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <rsc_op id="10" operation="stop" operation_key="rsc3_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> </inputs> @@ -113,11 +107,7 @@ <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="4" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="8"> <action_set> @@ -153,9 +143,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="5" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <rsc_op id="8" operation="stop" operation_key="rsc2_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/order3.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/order3.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/order3.summary @@ -16,9 +16,9 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 monitor on node2 * Resource action: rsc2 monitor on node2 + * Resource action: rsc3 stop on node1 * Resource action: rsc3 monitor on node2 * Resource action: rsc4 monitor on node2 - * Resource action: rsc3 stop on node1 * Resource action: rsc2 stop on node1 * Resource action: rsc4 stop on node1 * Resource action: rsc1 stop on node1 Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/order5.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/order5.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/order5.dot @@ -2,7 +2,6 @@ "all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] -"rsc2_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_stop_0 node1" -> "all_stopped" [ style = bold] @@ -10,7 +9,6 @@ "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_monitor_0 node2" -> "rsc4_start_0 node2" [ style = bold] -"rsc4_monitor_0 node2" -> "rsc4_stop_0 node1" [ style = bold] "rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_stop_0 node1" -> "all_stopped" [ style = bold] @@ -18,7 +16,6 @@ "rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc5_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc6_monitor_0 node1" -> "rsc6_start_0 node1" [ style = bold] -"rsc6_monitor_0 node1" -> "rsc6_stop_0 node2" [ style = bold] "rsc6_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc6_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc6_stop_0 node2" -> "all_stopped" [ style = bold] @@ -26,7 +23,6 @@ "rsc6_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc7_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc8_monitor_0 node1" -> "rsc8_start_0 node1" [ style = bold] -"rsc8_monitor_0 node1" -> "rsc8_stop_0 node2" [ style = bold] "rsc8_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc8_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc8_stop_0 node2" -> "all_stopped" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/order5.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/order5.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/order5.exp @@ -31,11 +31,7 @@ <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="7" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="3"> <action_set> @@ -78,11 +74,7 @@ <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="9" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="7"> <action_set> @@ -125,11 +117,7 @@ <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="3" operation="monitor" operation_key="rsc6_monitor_0" on_node="node1" on_node_uuid="uuid1"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="11"> <action_set> @@ -172,11 +160,7 @@ <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="5" operation="monitor" operation_key="rsc8_monitor_0" on_node="node1" on_node_uuid="uuid1"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="15"> <action_set> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/order5.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/order5.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/order5.summary @@ -19,17 +19,17 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 monitor on node2 + * Resource action: rsc2 stop on node1 * Resource action: rsc2 monitor on node2 * Resource action: rsc3 monitor on node2 + * Resource action: rsc4 stop on node1 * Resource action: rsc4 monitor on node2 * Resource action: rsc5 monitor on node1 + * Resource action: rsc6 stop on node2 * Resource action: rsc6 monitor on node1 * Resource action: rsc7 monitor on node1 - * Resource action: rsc8 monitor on node1 - * Resource action: rsc2 stop on node1 - * Resource action: rsc4 stop on node1 - * Resource action: rsc6 stop on node2 * Resource action: rsc8 stop on node2 + * Resource action: rsc8 monitor on node1 * Pseudo action: all_stopped * Resource action: rsc2 start on node2 * Resource action: rsc4 start on node2 Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/order6.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/order6.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/order6.dot @@ -2,7 +2,6 @@ "all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] -"rsc2_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_stop_0 node1" -> "all_stopped" [ style = bold] @@ -10,7 +9,6 @@ "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_monitor_0 node2" -> "rsc4_start_0 node2" [ style = bold] -"rsc4_monitor_0 node2" -> "rsc4_stop_0 node1" [ style = bold] "rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_stop_0 node1" -> "all_stopped" [ style = bold] @@ -18,7 +16,6 @@ "rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc5_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc6_monitor_0 node1" -> "rsc6_start_0 node1" [ style = bold] -"rsc6_monitor_0 node1" -> "rsc6_stop_0 node2" [ style = bold] "rsc6_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc6_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc6_stop_0 node2" -> "all_stopped" [ style = bold] @@ -26,7 +23,6 @@ "rsc6_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc7_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc8_monitor_0 node1" -> "rsc8_start_0 node1" [ style = bold] -"rsc8_monitor_0 node1" -> "rsc8_stop_0 node2" [ style = bold] "rsc8_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc8_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc8_stop_0 node2" -> "all_stopped" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/order6.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/order6.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/order6.exp @@ -31,11 +31,7 @@ <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="7" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="3"> <action_set> @@ -78,11 +74,7 @@ <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="9" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="7"> <action_set> @@ -125,11 +117,7 @@ <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="3" operation="monitor" operation_key="rsc6_monitor_0" on_node="node1" on_node_uuid="uuid1"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="11"> <action_set> @@ -172,11 +160,7 @@ <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="uuid2" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="5" operation="monitor" operation_key="rsc8_monitor_0" on_node="node1" on_node_uuid="uuid1"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="15"> <action_set> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/order6.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/order6.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/order6.summary @@ -19,17 +19,17 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 monitor on node2 + * Resource action: rsc2 stop on node1 * Resource action: rsc2 monitor on node2 * Resource action: rsc3 monitor on node2 + * Resource action: rsc4 stop on node1 * Resource action: rsc4 monitor on node2 * Resource action: rsc5 monitor on node1 + * Resource action: rsc6 stop on node2 * Resource action: rsc6 monitor on node1 * Resource action: rsc7 monitor on node1 - * Resource action: rsc8 monitor on node1 - * Resource action: rsc2 stop on node1 - * Resource action: rsc4 stop on node1 - * Resource action: rsc6 stop on node2 * Resource action: rsc8 stop on node2 + * Resource action: rsc8 monitor on node1 * Pseudo action: all_stopped * Resource action: rsc2 start on node2 * Resource action: rsc4 start on node2 Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/params-1.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/params-1.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/params-1.dot @@ -1,13 +1,10 @@ digraph "g" { "Cancel rsc_c001n02_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_0 c001n01" -> "DcIPaddr_start_0 c001n02" [ style = bold] -"DcIPaddr_monitor_0 c001n01" -> "DcIPaddr_stop_0 c001n02" [ style = bold] "DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_0 c001n03" -> "DcIPaddr_start_0 c001n02" [ style = bold] -"DcIPaddr_monitor_0 c001n03" -> "DcIPaddr_stop_0 c001n02" [ style = bold] "DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_0 c001n08" -> "DcIPaddr_start_0 c001n02" [ style = bold] -"DcIPaddr_monitor_0 c001n08" -> "DcIPaddr_stop_0 c001n02" [ style = bold] "DcIPaddr_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_start_0 c001n02" -> "DcIPaddr_monitor_5000 c001n02" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/params-1.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/params-1.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/params-1.exp @@ -6,17 +6,7 @@ <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000" ip="127.0.0.20"/> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="8" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> - </trigger> - <trigger> - <rsc_op id="15" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> - </trigger> - <trigger> - <rsc_op id="19" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="1"> <action_set> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/params-1.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/params-1.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/params-1.summary @@ -12,9 +12,12 @@ Transition Summary: * Restart DcIPaddr (Started c001n02) Executing cluster transition: + * Resource action: DcIPaddr stop on c001n02 * Resource action: DcIPaddr monitor on c001n08 * Resource action: DcIPaddr monitor on c001n03 * Resource action: DcIPaddr monitor on c001n01 + * Resource action: DcIPaddr start on c001n02 + * Resource action: DcIPaddr monitor=5000 on c001n02 * Resource action: rsc_c001n08 monitor on c001n03 * Resource action: rsc_c001n08 monitor on c001n02 * Resource action: rsc_c001n08 monitor on c001n01 @@ -30,9 +33,6 @@ Executing cluster transition: * Resource action: rsc_c001n01 monitor on c001n08 * Resource action: rsc_c001n01 monitor on c001n03 * Resource action: rsc_c001n01 monitor on c001n02 - * Resource action: DcIPaddr stop on c001n02 - * Resource action: DcIPaddr start on c001n02 - * Resource action: DcIPaddr monitor=5000 on c001n02 * Pseudo action: all_stopped Revised cluster status: Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/params-2.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/params-2.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/params-2.dot @@ -11,7 +11,6 @@ "rsc2_monitor_0 node1" -> "rsc2_start_0 node2" [ style = bold] "rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_monitor_0 node3" -> "rsc2_start_0 node2" [ style = bold] -"rsc2_monitor_0 node3" -> "rsc2_stop_0 node2" [ style = bold] "rsc2_monitor_0 node3" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_stop_0 node2" -> "all_stopped" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/params-2.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/params-2.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/params-2.exp @@ -86,11 +86,7 @@ <attributes CRM_meta_on_node="node2" CRM_meta_on_node_uuid="node2" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="11" operation="monitor" operation_key="rsc2_monitor_0" on_node="node3" on_node_uuid="node3"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="8"> <action_set> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/params-5.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/params-5.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/params-5.dot @@ -1,13 +1,10 @@ digraph "g" { "Cancel rsc_c001n02_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black"] "DcIPaddr_monitor_0 c001n01" -> "DcIPaddr_start_0 c001n02" [ style = bold] -"DcIPaddr_monitor_0 c001n01" -> "DcIPaddr_stop_0 c001n02" [ style = bold] "DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black"] "DcIPaddr_monitor_0 c001n03" -> "DcIPaddr_start_0 c001n02" [ style = bold] -"DcIPaddr_monitor_0 c001n03" -> "DcIPaddr_stop_0 c001n02" [ style = bold] "DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black"] "DcIPaddr_monitor_0 c001n08" -> "DcIPaddr_start_0 c001n02" [ style = bold] -"DcIPaddr_monitor_0 c001n08" -> "DcIPaddr_stop_0 c001n02" [ style = bold] "DcIPaddr_monitor_0 c001n08" [ style=bold color="green" fontcolor="black"] "DcIPaddr_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black"] "DcIPaddr_start_0 c001n02" -> "DcIPaddr_monitor_5000 c001n02" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/params-5.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/params-5.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/params-5.exp @@ -6,17 +6,7 @@ <attributes CRM_meta_on_node="c001n02" CRM_meta_on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f" CRM_meta_timeout="20000" ip="127.0.0.20"/> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="8" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> - </trigger> - <trigger> - <rsc_op id="15" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> - </trigger> - <trigger> - <rsc_op id="19" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="1"> <action_set> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/params-5.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/params-5.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/params-5.summary @@ -12,9 +12,12 @@ Transition Summary: * Restart DcIPaddr (Started c001n02) Executing cluster transition: + * Resource action: DcIPaddr stop on c001n02 * Resource action: DcIPaddr monitor on c001n08 * Resource action: DcIPaddr monitor on c001n03 * Resource action: DcIPaddr monitor on c001n01 + * Resource action: DcIPaddr start on c001n02 + * Resource action: DcIPaddr monitor=5000 on c001n02 * Resource action: rsc_c001n08 monitor on c001n03 * Resource action: rsc_c001n08 monitor on c001n02 * Resource action: rsc_c001n08 monitor on c001n01 @@ -30,9 +33,6 @@ Executing cluster transition: * Resource action: rsc_c001n01 monitor on c001n08 * Resource action: rsc_c001n01 monitor on c001n03 * Resource action: rsc_c001n01 monitor on c001n02 - * Resource action: DcIPaddr stop on c001n02 - * Resource action: DcIPaddr start on c001n02 - * Resource action: DcIPaddr monitor=5000 on c001n02 * Pseudo action: all_stopped Revised cluster status: Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/quorum-1.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/quorum-1.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/quorum-1.dot @@ -2,7 +2,6 @@ "all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] -"rsc2_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_stop_0 node1" -> "all_stopped" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/quorum-1.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/quorum-1.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/quorum-1.exp @@ -31,11 +31,7 @@ <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="3"> <action_set> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/quorum-1.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/quorum-1.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/quorum-1.summary @@ -12,13 +12,13 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 monitor on node2 + * Resource action: rsc2 stop on node1 * Resource action: rsc2 monitor on node2 * Resource action: rsc3 monitor on node2 * Resource action: rsc3 monitor on node1 - * Resource action: rsc2 stop on node1 - * Resource action: rsc3 start on node1 * Pseudo action: all_stopped * Resource action: rsc2 start on node2 + * Resource action: rsc3 start on node1 Revised cluster status: Online: [ node1 node2 ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/quorum-2.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/quorum-2.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/quorum-2.dot @@ -2,7 +2,6 @@ "all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] -"rsc2_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_stop_0 node1" -> "all_stopped" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/quorum-2.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/quorum-2.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/quorum-2.exp @@ -31,11 +31,7 @@ <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="3"> <action_set> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/quorum-2.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/quorum-2.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/quorum-2.summary @@ -12,10 +12,10 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 monitor on node2 + * Resource action: rsc2 stop on node1 * Resource action: rsc2 monitor on node2 * Resource action: rsc3 monitor on node2 * Resource action: rsc3 monitor on node1 - * Resource action: rsc2 stop on node1 * Pseudo action: all_stopped * Resource action: rsc2 start on node2 Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/quorum-3.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/quorum-3.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/quorum-3.dot @@ -1,14 +1,12 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" -> "rsc1_start_0 node1" [ style = dashed] -"rsc1_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node1" [ style=dashed color="red" fontcolor="black" ] "rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "rsc1_start_0 node1" [ style = dashed] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = dashed] -"rsc2_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=dashed color="red" fontcolor="black" ] "rsc2_stop_0 node1" -> "all_stopped" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/quorum-3.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/quorum-3.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/quorum-3.exp @@ -6,11 +6,7 @@ <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="1"> <action_set> @@ -28,11 +24,7 @@ <attributes CRM_meta_name="stop" CRM_meta_on_fail="block" CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="3"> <action_set> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/quorum-3.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/quorum-3.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/quorum-3.summary @@ -12,12 +12,12 @@ Transition Summary: * Start rsc3 (node1 - blocked) Executing cluster transition: + * Resource action: rsc1 stop on node1 * Resource action: rsc1 monitor on node2 + * Resource action: rsc2 stop on node1 * Resource action: rsc2 monitor on node2 * Resource action: rsc3 monitor on node2 * Resource action: rsc3 monitor on node1 - * Resource action: rsc1 stop on node1 - * Resource action: rsc2 stop on node1 * Pseudo action: all_stopped Revised cluster status: Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-10.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rec-node-10.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-10.dot @@ -1,14 +1,12 @@ digraph "g" { "all_stopped" [ style=dashed color="red" fontcolor="orange" ] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = dashed] -"rsc1_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = dashed] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node2" [ style=dashed color="red" fontcolor="black" ] "rsc1_stop_0 node1" -> "all_stopped" [ style = dashed] "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = dashed] "rsc1_stop_0 node1" [ style=dashed color="red" fontcolor="black" ] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = dashed] -"rsc2_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = dashed] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=dashed color="red" fontcolor="black" ] "rsc2_stop_0 node1" -> "all_stopped" [ style = dashed] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-11.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rec-node-11.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-11.dot @@ -14,7 +14,6 @@ digraph "g" { "group1_stopped_0" -> "rsc3_stop_0 node2" [ style = bold] "group1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = bold] -"rsc1_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node2" -> "group1_running_0" [ style = bold] "rsc1_start_0 node2" -> "rsc2_start_0 node2" [ style = bold] @@ -24,7 +23,6 @@ digraph "g" { "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="orange" ] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] -"rsc2_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" -> "group1_running_0" [ style = bold] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-11.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rec-node-11.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-11.exp @@ -117,9 +117,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <pseudo_event id="8" operation="stop" operation_key="rsc2_stop_0"/> </trigger> <trigger> @@ -172,9 +169,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <pseudo_event id="12" operation="stop" operation_key="group1_stop_0"/> </trigger> <trigger> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-4.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rec-node-4.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-4.dot @@ -2,14 +2,12 @@ digraph "g" { "all_stopped" -> "stonith-1_start_0 node2" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = bold] -"rsc1_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="orange" ] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] -"rsc2_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_stop_0 node1" -> "all_stopped" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-4.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rec-node-4.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-4.exp @@ -51,9 +51,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <crm_event id="11" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/> </trigger> </inputs> @@ -94,9 +91,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <crm_event id="11" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-6.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rec-node-6.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-6.dot @@ -2,14 +2,12 @@ digraph "g" { "all_stopped" -> "stonith-1_start_0 node2" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = bold] -"rsc1_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="orange" ] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] -"rsc2_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_stop_0 node1" -> "all_stopped" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-6.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rec-node-6.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-6.exp @@ -51,9 +51,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <crm_event id="11" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/> </trigger> </inputs> @@ -94,9 +91,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <crm_event id="11" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-7.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rec-node-7.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-7.dot @@ -2,14 +2,12 @@ digraph "g" { "all_stopped" -> "stonith-1_start_0 node2" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = bold] -"rsc1_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="orange" ] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] -"rsc2_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_stop_0 node1" -> "all_stopped" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-7.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rec-node-7.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-7.exp @@ -51,9 +51,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <crm_event id="11" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/> </trigger> </inputs> @@ -94,9 +91,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> - </trigger> - <trigger> <crm_event id="11" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="uuid1"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-8.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rec-node-8.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-8.dot @@ -1,14 +1,12 @@ digraph "g" { "all_stopped" [ style=dashed color="red" fontcolor="orange" ] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = dashed] -"rsc1_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = dashed] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node2" [ style=dashed color="red" fontcolor="black" ] "rsc1_stop_0 node1" -> "all_stopped" [ style = dashed] "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = dashed] "rsc1_stop_0 node1" [ style=dashed color="red" fontcolor="black" ] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = dashed] -"rsc2_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = dashed] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=dashed color="red" fontcolor="black" ] "rsc2_stop_0 node1" -> "all_stopped" [ style = dashed] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-rsc-5.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rec-rsc-5.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-rsc-5.dot @@ -8,7 +8,6 @@ digraph "g" { "rsc1_stop_0 node2" -> "rsc1_start_0 node1" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="orange" ] "rsc2_monitor_0 node1" -> "rsc2_start_0 node1" [ style = bold] -"rsc2_monitor_0 node1" -> "rsc2_stop_0 node2" [ style = bold] "rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_stop_0 node2" -> "all_stopped" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-rsc-5.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rec-rsc-5.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-rsc-5.exp @@ -91,9 +91,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="uuid1"/> - </trigger> - <trigger> <crm_event id="11" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="uuid2"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-startup-probes.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/remote-startup-probes.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-startup-probes.dot @@ -1,6 +1,5 @@ digraph "g" { "FAKE1_monitor_0 remote1" -> "FAKE1_start_0 18node2" [ style = bold] -"FAKE1_monitor_0 remote1" -> "FAKE1_stop_0 18builder" [ style = bold] "FAKE1_monitor_0 remote1" [ style=bold color="green" fontcolor="black"] "FAKE1_monitor_60000 18node2" [ style=bold color="green" fontcolor="black"] "FAKE1_start_0 18node2" -> "FAKE1_monitor_60000 18node2" [ style = bold] @@ -9,7 +8,6 @@ "FAKE1_stop_0 18builder" -> "all_stopped" [ style = bold] "FAKE1_stop_0 18builder" [ style=bold color="green" fontcolor="black"] "FAKE2_monitor_0 remote1" -> "FAKE2_start_0 remote1" [ style = bold] -"FAKE2_monitor_0 remote1" -> "FAKE2_stop_0 18node2" [ style = bold] "FAKE2_monitor_0 remote1" [ style=bold color="green" fontcolor="black"] "FAKE2_monitor_60000 remote1" [ style=bold color="green" fontcolor="black"] "FAKE2_start_0 remote1" -> "FAKE2_monitor_60000 remote1" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-startup-probes.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/remote-startup-probes.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-startup-probes.exp @@ -57,11 +57,7 @@ <attributes CRM_meta_on_node="18builder" CRM_meta_on_node_uuid="5" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="7" operation="monitor" operation_key="FAKE1_monitor_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="5"> <action_set> @@ -118,11 +114,7 @@ <attributes CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="8" operation="monitor" operation_key="FAKE2_monitor_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="9"> <action_set> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-startup-probes.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/remote-startup-probes.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-startup-probes.summary @@ -17,14 +17,14 @@ Transition Summary: Executing cluster transition: * Resource action: remote1 start on 18builder + * Resource action: FAKE1 stop on 18builder * Resource action: FAKE1 monitor on remote1 + * Resource action: FAKE2 stop on 18node2 * Resource action: FAKE2 monitor on remote1 * Resource action: FAKE3 monitor on remote1 * Resource action: FAKE4 monitor on remote1 - * Resource action: remote1 monitor=60000 on 18builder - * Resource action: FAKE1 stop on 18builder - * Resource action: FAKE2 stop on 18node2 * Pseudo action: all_stopped + * Resource action: remote1 monitor=60000 on 18builder * Resource action: FAKE1 start on 18node2 * Resource action: FAKE2 start on remote1 * Resource action: FAKE1 monitor=60000 on 18node2 Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc-discovery-per-node.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rsc-discovery-per-node.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc-discovery-per-node.dot @@ -13,10 +13,8 @@ "FAKE1_start_0 18node2" -> "FAKE1_monitor_60000 18node2" [ style = bold] "FAKE1_start_0 18node2" [ style=bold color="green" fontcolor="black"] "FAKE2_monitor_0 18node3" -> "FAKE2_start_0 18node3" [ style = bold] -"FAKE2_monitor_0 18node3" -> "FAKE2_stop_0 18node2" [ style = bold] "FAKE2_monitor_0 18node3" [ style=bold color="green" fontcolor="black"] "FAKE2_monitor_0 18node4" -> "FAKE2_start_0 18node3" [ style = bold] -"FAKE2_monitor_0 18node4" -> "FAKE2_stop_0 18node2" [ style = bold] "FAKE2_monitor_0 18node4" [ style=bold color="green" fontcolor="black"] "FAKE2_monitor_60000 18node3" [ style=bold color="green" fontcolor="black"] "FAKE2_start_0 18node3" -> "FAKE2_monitor_60000 18node3" [ style = bold] @@ -25,10 +23,8 @@ "FAKE2_stop_0 18node2" -> "all_stopped" [ style = bold] "FAKE2_stop_0 18node2" [ style=bold color="green" fontcolor="black"] "FAKE3_monitor_0 18node3" -> "FAKE3_start_0 18node4" [ style = bold] -"FAKE3_monitor_0 18node3" -> "FAKE3_stop_0 18builder" [ style = bold] "FAKE3_monitor_0 18node3" [ style=bold color="green" fontcolor="black"] "FAKE3_monitor_0 18node4" -> "FAKE3_start_0 18node4" [ style = bold] -"FAKE3_monitor_0 18node4" -> "FAKE3_stop_0 18builder" [ style = bold] "FAKE3_monitor_0 18node4" [ style=bold color="green" fontcolor="black"] "FAKE3_monitor_60000 18node4" [ style=bold color="green" fontcolor="black"] "FAKE3_start_0 18node4" -> "FAKE3_monitor_60000 18node4" [ style = bold] @@ -37,10 +33,8 @@ "FAKE3_stop_0 18builder" -> "all_stopped" [ style = bold] "FAKE3_stop_0 18builder" [ style=bold color="green" fontcolor="black"] "FAKE4_monitor_0 18node3" -> "FAKE4_start_0 remote1" [ style = bold] -"FAKE4_monitor_0 18node3" -> "FAKE4_stop_0 18node1" [ style = bold] "FAKE4_monitor_0 18node3" [ style=bold color="green" fontcolor="black"] "FAKE4_monitor_0 18node4" -> "FAKE4_start_0 remote1" [ style = bold] -"FAKE4_monitor_0 18node4" -> "FAKE4_stop_0 18node1" [ style = bold] "FAKE4_monitor_0 18node4" [ style=bold color="green" fontcolor="black"] "FAKE4_monitor_60000 remote1" [ style=bold color="green" fontcolor="black"] "FAKE4_start_0 remote1" -> "FAKE4_monitor_60000 remote1" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc-discovery-per-node.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rsc-discovery-per-node.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc-discovery-per-node.exp @@ -186,14 +186,7 @@ <attributes CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="21" operation="monitor" operation_key="FAKE2_monitor_0" on_node="18node3" on_node_uuid="3"/> - </trigger> - <trigger> - <rsc_op id="30" operation="monitor" operation_key="FAKE2_monitor_0" on_node="18node4" on_node_uuid="4"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="16"> <action_set> @@ -252,14 +245,7 @@ <attributes CRM_meta_on_node="18builder" CRM_meta_on_node_uuid="5" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="22" operation="monitor" operation_key="FAKE3_monitor_0" on_node="18node3" on_node_uuid="3"/> - </trigger> - <trigger> - <rsc_op id="31" operation="monitor" operation_key="FAKE3_monitor_0" on_node="18node4" on_node_uuid="4"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="21"> <action_set> @@ -324,14 +310,7 @@ <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="23" operation="monitor" operation_key="FAKE4_monitor_0" on_node="18node3" on_node_uuid="3"/> - </trigger> - <trigger> - <rsc_op id="32" operation="monitor" operation_key="FAKE4_monitor_0" on_node="18node4" on_node_uuid="4"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="26"> <action_set> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc-discovery-per-node.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rsc-discovery-per-node.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc-discovery-per-node.summary @@ -45,10 +45,13 @@ Executing cluster transition: * Resource action: FAKE1 monitor on 18node2 * Resource action: FAKE1 monitor on 18node1 * Resource action: FAKE1 monitor on 18builder + * Resource action: FAKE2 stop on 18node2 * Resource action: FAKE2 monitor on 18node4 * Resource action: FAKE2 monitor on 18node3 + * Resource action: FAKE3 stop on 18builder * Resource action: FAKE3 monitor on 18node4 * Resource action: FAKE3 monitor on 18node3 + * Resource action: FAKE4 stop on 18node1 * Resource action: FAKE4 monitor on 18node4 * Resource action: FAKE4 monitor on 18node3 * Resource action: FAKE5 monitor on 18node4 @@ -68,11 +71,12 @@ Executing cluster transition: * Resource action: FAKECLONE2:3 monitor on 18node4 * Resource action: FAKECLONE2:5 monitor on 18builder * Pseudo action: FAKECLONE2-clone_start_0 + * Pseudo action: all_stopped * Resource action: remote1 start on 18builder * Resource action: FAKE1 start on 18node2 - * Resource action: FAKE2 stop on 18node2 - * Resource action: FAKE3 stop on 18builder - * Resource action: FAKE4 stop on 18node1 + * Resource action: FAKE2 start on 18node3 + * Resource action: FAKE3 start on 18node4 + * Resource action: FAKE4 start on remote1 * Resource action: FAKE5 start on 18builder * Resource action: FAKECLONE1:0 start on 18node1 * Resource action: FAKECLONE1:1 start on 18node2 @@ -88,12 +92,11 @@ Executing cluster transition: * Resource action: FAKECLONE2:4 start on remote1 * Resource action: FAKECLONE2:5 start on 18builder * Pseudo action: FAKECLONE2-clone_running_0 - * Pseudo action: all_stopped * Resource action: remote1 monitor=60000 on 18builder * Resource action: FAKE1 monitor=60000 on 18node2 - * Resource action: FAKE2 start on 18node3 - * Resource action: FAKE3 start on 18node4 - * Resource action: FAKE4 start on remote1 + * Resource action: FAKE2 monitor=60000 on 18node3 + * Resource action: FAKE3 monitor=60000 on 18node4 + * Resource action: FAKE4 monitor=60000 on remote1 * Resource action: FAKE5 monitor=60000 on 18builder * Resource action: FAKECLONE1:0 monitor=60000 on 18node1 * Resource action: FAKECLONE1:1 monitor=60000 on 18node2 @@ -107,9 +110,6 @@ Executing cluster transition: * Resource action: FAKECLONE2:3 monitor=60000 on 18node4 * Resource action: FAKECLONE2:4 monitor=60000 on remote1 * Resource action: FAKECLONE2:5 monitor=60000 on 18builder - * Resource action: FAKE2 monitor=60000 on 18node3 - * Resource action: FAKE3 monitor=60000 on 18node4 - * Resource action: FAKE4 monitor=60000 on remote1 Revised cluster status: Online: [ 18builder 18node1 18node2 18node3 18node4 ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc-sets-clone-1.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rsc-sets-clone-1.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc-sets-clone-1.dot @@ -62,7 +62,6 @@ digraph "g" { "stonithsys2_start_0 sys3" -> "stonithsys2_monitor_15000 sys3" [ style = bold] "stonithsys2_start_0 sys3" [ style=bold color="green" fontcolor="black" ] "stonithsys3_monitor_0 sys3" -> "stonithsys3_start_0 sys2" [ style = bold] -"stonithsys3_monitor_0 sys3" -> "stonithsys3_stop_0 sys2" [ style = bold] "stonithsys3_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] "stonithsys3_monitor_15000 sys2" [ style=bold color="green" fontcolor="black" ] "stonithsys3_start_0 sys2" -> "stonithsys3_monitor_15000 sys2" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc-sets-clone-1.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rsc-sets-clone-1.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc-sets-clone-1.exp @@ -42,11 +42,7 @@ <attributes CRM_meta_on_node="sys2" CRM_meta_on_node_uuid="sys2" CRM_meta_timeout="20000" hostname="sys3" interface="lan" ipaddr="192.168.1.222" passwd="****" userid="admin"/> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="15" operation="monitor" operation_key="stonithsys3_monitor_0" on_node="sys3" on_node_uuid="sys3"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="5"> <action_set> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc-sets-clone-1.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rsc-sets-clone-1.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc-sets-clone-1.summary @@ -32,7 +32,10 @@ Executing cluster transition: * Resource action: vm2 monitor on sys3 * Resource action: vm3 monitor on sys3 * Resource action: vm4 monitor on sys3 + * Resource action: stonithsys3 stop on sys2 * Resource action: stonithsys3 monitor on sys3 + * Resource action: stonithsys3 start on sys2 + * Resource action: stonithsys3 monitor=15000 on sys2 * Resource action: controld:1 monitor on sys3 * Resource action: clvmd:1 monitor on sys3 * Resource action: o2cb:1 monitor on sys3 @@ -46,9 +49,7 @@ Executing cluster transition: * Resource action: stonithsys2 monitor on sys3 * Pseudo action: load_stopped_sys3 * Pseudo action: load_stopped_sys2 - * Resource action: stonithsys3 stop on sys2 - * Resource action: stonithsys3 start on sys2 - * Resource action: stonithsys3 monitor=15000 on sys2 + * Pseudo action: all_stopped * Pseudo action: basegrp:1_start_0 * Resource action: controld:1 start on sys3 * Resource action: clvmd:1 start on sys3 @@ -59,7 +60,6 @@ Executing cluster transition: * Resource action: vg2:1 start on sys3 * Resource action: fs2:1 start on sys3 * Resource action: stonithsys2 start on sys3 - * Pseudo action: all_stopped * Pseudo action: basegrp:1_running_0 * Resource action: controld:1 monitor=10000 on sys3 * Resource action: iscsi1:1 monitor=120000 on sys3 Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc_dep4.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rsc_dep4.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc_dep4.dot @@ -12,7 +12,6 @@ "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_monitor_0 node2" -> "rsc4_start_0 node2" [ style = bold] -"rsc4_monitor_0 node2" -> "rsc4_stop_0 node1" [ style = bold] "rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_stop_0 node1" -> "all_stopped" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc_dep4.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rsc_dep4.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc_dep4.exp @@ -56,11 +56,7 @@ <attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000" priority="2.0"/> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="5" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="node2"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="5" priority="2"> <action_set> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc_dep4.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rsc_dep4.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc_dep4.summary @@ -15,15 +15,15 @@ Transition Summary: Executing cluster transition: * Resource action: rsc2 monitor on node2 * Resource action: rsc2 monitor on node1 + * Resource action: rsc4 stop on node1 * Resource action: rsc4 monitor on node2 * Resource action: rsc1 monitor on node2 * Resource action: rsc3 monitor on node2 * Resource action: rsc3 monitor on node1 - * Resource action: rsc2 start on node1 - * Resource action: rsc4 stop on node1 - * Resource action: rsc3 start on node2 * Pseudo action: all_stopped + * Resource action: rsc2 start on node1 * Resource action: rsc4 start on node2 + * Resource action: rsc3 start on node2 Revised cluster status: Online: [ node1 node2 ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/unfence-definition.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/unfence-definition.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/unfence-definition.dot @@ -60,7 +60,6 @@ digraph "g" { "fencing_delete_0 virt-1" -> "fencing_start_0 virt-1" [ style = bold] "fencing_delete_0 virt-1" [ style=bold color="green" fontcolor="black"] "fencing_monitor_0 virt-3" -> "fencing_start_0 virt-1" [ style = bold] -"fencing_monitor_0 virt-3" -> "fencing_stop_0 virt-1" [ style = bold] "fencing_monitor_0 virt-3" [ style=bold color="green" fontcolor="black"] "fencing_start_0 virt-1" [ style=bold color="green" fontcolor="black"] "fencing_stop_0 virt-1" -> "all_stopped" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/unfence-definition.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/unfence-definition.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/unfence-definition.exp @@ -54,11 +54,7 @@ <attributes CRM_meta_on_node="virt-1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="9" operation="monitor" operation_key="fencing_monitor_0" on_node="virt-3" on_node_uuid="3"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="4"> <action_set> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/unfence-parameters.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/unfence-parameters.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/unfence-parameters.dot @@ -58,7 +58,6 @@ digraph "g" { "dlm_stop_0 virt-1" -> "stonith 'on' virt-1" [ style = bold] "dlm_stop_0 virt-1" [ style=bold color="green" fontcolor="black"] "fencing_monitor_0 virt-3" -> "fencing_start_0 virt-1" [ style = bold] -"fencing_monitor_0 virt-3" -> "fencing_stop_0 virt-1" [ style = bold] "fencing_monitor_0 virt-3" [ style=bold color="green" fontcolor="black"] "fencing_start_0 virt-1" [ style=bold color="green" fontcolor="black"] "fencing_stop_0 virt-1" -> "all_stopped" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/unfence-parameters.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/unfence-parameters.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/unfence-parameters.exp @@ -6,11 +6,7 @@ <attributes CRM_meta_on_node="virt-1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs> - <trigger> - <rsc_op id="8" operation="monitor" operation_key="fencing_monitor_0" on_node="virt-3" on_node_uuid="3"/> - </trigger> - </inputs> + <inputs/> </synapse> <synapse id="1" priority="1000000"> <action_set> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/unfence-parameters.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/unfence-parameters.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/unfence-parameters.summary @@ -23,6 +23,7 @@ Transition Summary: * Start clvmd:2 (virt-3) Executing cluster transition: + * Resource action: fencing stop on virt-1 * Resource action: dlm monitor on virt-3 * Resource action: clvmd monitor on virt-2 * Resource action: clvmd monitor on virt-3 @@ -33,7 +34,6 @@ Executing cluster transition: * Resource action: fencing monitor on virt-3 * Resource action: clvmd stop on virt-1 * Pseudo action: clvmd-clone_stopped_0 - * Resource action: fencing stop on virt-1 * Pseudo action: dlm-clone_stop_0 * Resource action: dlm stop on virt-1 * Pseudo action: dlm-clone_stopped_0 Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-migrate1.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-migrate1.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-migrate1.dot @@ -27,7 +27,6 @@ "rhel7-node1_migrate_to_0 rhel7-node2" [ style=bold color="green" fontcolor="black"] "rhel7-node1_monitor_0 rhel7-node3" -> "rhel7-node1_migrate_to_0 rhel7-node2" [ style = bold] "rhel7-node1_monitor_0 rhel7-node3" -> "rhel7-node1_start_0 rhel7-node3" [ style = bold] -"rhel7-node1_monitor_0 rhel7-node3" -> "rhel7-node1_stop_0 rhel7-node2" [ style = bold] "rhel7-node1_monitor_0 rhel7-node3" [ style=bold color="green" fontcolor="black"] "rhel7-node1_monitor_30000 rhel7-node3" [ style=bold color="green" fontcolor="black"] "rhel7-node1_start_0 rhel7-node3" -> "rhel7-node1_monitor_30000 rhel7-node3" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-migrate1.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-migrate1.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-migrate1.exp @@ -207,9 +207,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="12" operation="monitor" operation_key="rhel7-node1_monitor_0" on_node="rhel7-node3" on_node_uuid="3"/> - </trigger> - <trigger> <rsc_op id="40" operation="migrate_from" operation_key="rhel7-node1_migrate_from_0" on_node="rhel7-node3" on_node_uuid="3"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-ms-ordering-move.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-ms-ordering-move.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-ms-ordering-move.dot @@ -44,16 +44,12 @@ digraph "g" { "lxc-ms_stop_0 lxc1" -> "lxc1_stop_0 rhel7-1" [ style = bold] "lxc-ms_stop_0 lxc1" [ style=bold color="green" fontcolor="black"] "lxc1_monitor_0 rhel7-2" -> "lxc1_start_0 rhel7-2" [ style = bold] -"lxc1_monitor_0 rhel7-2" -> "lxc1_stop_0 rhel7-1" [ style = bold] "lxc1_monitor_0 rhel7-2" [ style=bold color="green" fontcolor="black"] "lxc1_monitor_0 rhel7-3" -> "lxc1_start_0 rhel7-2" [ style = bold] -"lxc1_monitor_0 rhel7-3" -> "lxc1_stop_0 rhel7-1" [ style = bold] "lxc1_monitor_0 rhel7-3" [ style=bold color="green" fontcolor="black"] "lxc1_monitor_0 rhel7-4" -> "lxc1_start_0 rhel7-2" [ style = bold] -"lxc1_monitor_0 rhel7-4" -> "lxc1_stop_0 rhel7-1" [ style = bold] "lxc1_monitor_0 rhel7-4" [ style=bold color="green" fontcolor="black"] "lxc1_monitor_0 rhel7-5" -> "lxc1_start_0 rhel7-2" [ style = bold] -"lxc1_monitor_0 rhel7-5" -> "lxc1_stop_0 rhel7-1" [ style = bold] "lxc1_monitor_0 rhel7-5" [ style=bold color="green" fontcolor="black"] "lxc1_monitor_30000 rhel7-2" [ style=bold color="green" fontcolor="black"] "lxc1_start_0 rhel7-2" -> "lxc-ms_promote_0 lxc1" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-ms-ordering-move.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-ms-ordering-move.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-ms-ordering-move.exp @@ -264,18 +264,6 @@ </action_set> <inputs> <trigger> - <rsc_op id="26" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-2" on_node_uuid="2"/> - </trigger> - <trigger> - <rsc_op id="28" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-3" on_node_uuid="4"/> - </trigger> - <trigger> - <rsc_op id="30" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-4" on_node_uuid="5"/> - </trigger> - <trigger> - <rsc_op id="32" operation="monitor" operation_key="lxc1_monitor_0" on_node="rhel7-5" on_node_uuid="3"/> - </trigger> - <trigger> <rsc_op id="103" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms:0_demote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="rhel7-1"/> </trigger> <trigger> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/unfence-definition.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/unfence-definition.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/unfence-definition.summary @@ -23,6 +23,7 @@ Transition Summary: * Start clvmd:2 (virt-3) Executing cluster transition: + * Resource action: fencing stop on virt-1 * Resource action: dlm monitor on virt-3 * Resource action: clvmd monitor on virt-2 * Resource action: clvmd monitor on virt-3 @@ -31,10 +32,9 @@ Executing cluster transition: * Pseudo action: stonith_complete * Fencing virt-3 (on) * Resource action: fencing monitor on virt-3 - * Resource action: fencing stop on virt-1 + * Resource action: fencing delete on virt-1 * Resource action: clvmd stop on virt-1 * Pseudo action: clvmd-clone_stopped_0 - * Resource action: fencing delete on virt-1 * Pseudo action: dlm-clone_stop_0 * Resource action: dlm stop on virt-1 * Pseudo action: dlm-clone_stopped_0
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
