Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP2:Update
pacemaker.13547
bsc#1117934-0002-Test-scheduler-cl-5301-respect...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File bsc#1117934-0002-Test-scheduler-cl-5301-respect-order-constraints-whe-1.1.patch of Package pacemaker.13547
From 62c73cf7c115d79aa72b8533ee8a820c90d2618b Mon Sep 17 00:00:00 2001 From: "Gao,Yan" <ygao@suse.com> Date: Fri, 1 Mar 2019 16:34:23 +0100 Subject: [PATCH 2/3] Test: scheduler: cl#5301 - respect order constraints when relevant resources are being probed (update tests) --- .../11-a-then-bm-b-move-a-clone-starting.dot | 1 + .../11-a-then-bm-b-move-a-clone-starting.exp | 3 ++ pengine/test10/594.dot | 2 + pengine/test10/594.exp | 6 +++ pengine/test10/662.dot | 9 ++++ pengine/test10/662.exp | 27 ++++++++++++ pengine/test10/797.dot | 4 ++ pengine/test10/797.exp | 12 ++++++ pengine/test10/829.dot | 6 +++ pengine/test10/829.exp | 18 ++++++++ pengine/test10/bug-cl-5247.dot | 3 ++ pengine/test10/bug-cl-5247.exp | 9 ++++ pengine/test10/bug-lf-2435.dot | 1 + pengine/test10/bug-lf-2435.exp | 3 ++ pengine/test10/bug-n-387749.dot | 3 ++ pengine/test10/bug-n-387749.exp | 9 ++++ pengine/test10/bug-rh-1097457.dot | 8 ++++ pengine/test10/bug-rh-1097457.exp | 24 +++++++++++ pengine/test10/bundle-replicas-change.dot | 2 + pengine/test10/bundle-replicas-change.exp | 6 +++ pengine/test10/clone-no-shuffle.dot | 2 + pengine/test10/clone-no-shuffle.exp | 6 +++ pengine/test10/group5.dot | 6 +++ pengine/test10/group5.exp | 18 ++++++++ pengine/test10/group6.dot | 10 +++++ pengine/test10/group6.exp | 30 ++++++++++++++ pengine/test10/group9.dot | 9 ++++ pengine/test10/group9.exp | 27 ++++++++++++ pengine/test10/inc2.dot | 5 +++ pengine/test10/inc2.exp | 15 +++++++ pengine/test10/inc3.dot | 10 +++++ pengine/test10/inc3.exp | 30 ++++++++++++++ pengine/test10/inc4.dot | 13 ++++++ pengine/test10/inc4.exp | 39 ++++++++++++++++++ pengine/test10/inc5.dot | 16 ++++++++ pengine/test10/inc5.exp | 48 ++++++++++++++++++++++ pengine/test10/master-7.dot | 13 ++++++ pengine/test10/master-7.exp | 39 ++++++++++++++++++ pengine/test10/master-8.dot | 14 +++++++ pengine/test10/master-8.exp | 42 +++++++++++++++++++ pengine/test10/master-9.dot | 5 +++ pengine/test10/master-9.exp | 15 +++++++ pengine/test10/notify-0.dot | 1 + pengine/test10/notify-0.exp | 3 ++ pengine/test10/notify-1.dot | 1 + pengine/test10/notify-1.exp | 3 ++ pengine/test10/notify-2.dot | 1 + pengine/test10/notify-2.exp | 3 ++ pengine/test10/notify-3.dot | 5 +++ pengine/test10/notify-3.exp | 15 +++++++ pengine/test10/novell-252693-3.dot | 2 + pengine/test10/novell-252693-3.exp | 6 +++ pengine/test10/order3.dot | 3 ++ pengine/test10/order3.exp | 9 ++++ pengine/test10/rec-node-11.dot | 3 ++ pengine/test10/rec-node-11.exp | 9 ++++ pengine/test10/reload-becomes-restart.dot | 1 + pengine/test10/reload-becomes-restart.exp | 3 ++ pengine/test10/remote-connection-unrecoverable.dot | 2 + pengine/test10/remote-connection-unrecoverable.exp | 6 +++ pengine/test10/rsc_dep1.dot | 2 + pengine/test10/rsc_dep1.exp | 6 +++ pengine/test10/rsc_dep5.dot | 4 ++ pengine/test10/rsc_dep5.exp | 12 ++++++ pengine/test10/unfence-definition.dot | 4 ++ pengine/test10/unfence-definition.exp | 12 ++++++ pengine/test10/unfence-parameters.dot | 4 ++ pengine/test10/unfence-parameters.exp | 12 ++++++ pengine/test10/unrunnable-1.dot | 3 ++ pengine/test10/unrunnable-1.exp | 9 ++++ pengine/test10/whitebox-imply-stop-on-fence.dot | 6 +++ pengine/test10/whitebox-imply-stop-on-fence.exp | 18 ++++++++ pengine/test10/whitebox-migrate1.dot | 1 + pengine/test10/whitebox-migrate1.exp | 6 ++- pengine/test10/whitebox-migrate1.summary | 6 +-- pengine/test10/whitebox-move.dot | 1 + pengine/test10/whitebox-move.exp | 3 ++ pengine/test10/whitebox-ms-ordering.dot | 3 ++ pengine/test10/whitebox-ms-ordering.exp | 9 ++++ pengine/test10/whitebox-orphaned.dot | 1 + pengine/test10/whitebox-orphaned.exp | 3 ++ pengine/test10/whitebox-stop.dot | 1 + pengine/test10/whitebox-stop.exp | 3 ++ 83 files changed, 769 insertions(+), 4 deletions(-) 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 @@ -11,7 +11,9 @@ "myclone-clone_stop_0" [ style=bold color="green" fontcolor="orange"] "myclone-clone_stopped_0" -> "myclone-clone_start_0" [ style = bold] "myclone-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] +"myclone_monitor_0 f20node2" -> "all_stopped" [ style = bold] "myclone_monitor_0 f20node2" -> "myclone-clone_start_0" [ style = bold] +"myclone_monitor_0 f20node2" -> "myclone-clone_stopped_0" [ 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 @@ -45,6 +45,9 @@ </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> <rsc_op id="3" operation="stop" operation_key="myclone_stop_0" internal_operation_key="myclone:0_stop_0" on_node="f20node1" on_node_uuid="1"/> </trigger> <trigger> @@ -127,6 +130,9 @@ </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> <rsc_op id="3" operation="stop" operation_key="myclone_stop_0" internal_operation_key="myclone:0_stop_0" on_node="f20node1" on_node_uuid="1"/> </trigger> <trigger> 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,8 +2,10 @@ "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" -> "all_stopped" [ 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" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black"] "DcIPaddr_start_0 c001n03" -> "DcIPaddr_monitor_5000 c001n03" [ style = dashed] @@ -41,14 +43,23 @@ "child_DoFencing:1_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "child_DoFencing:1_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 c001n01" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:2_monitor_0 c001n01" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:2_monitor_0 c001n01" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 c001n01" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:3_monitor_0 c001n01" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:3_monitor_0 c001n01" -> "all_stopped" [ style = bold] "child_DoFencing:3_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 c001n02" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:3_monitor_0 c001n02" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:3_monitor_0 c001n02" -> "all_stopped" [ style = bold] "child_DoFencing:3_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 c001n03" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:3_monitor_0 c001n03" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:3_monitor_0 c001n03" -> "all_stopped" [ style = bold] "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" -> "all_stopped" [ style = bold] "rsc_c001n01_monitor_0 c001n03" -> "rsc_c001n01_start_0 c001n01" [ style = dashed] "rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_monitor_5000 c001n01" [ style=dashed color="red" fontcolor="black"] @@ -57,8 +68,10 @@ "rsc_c001n01_stop_0 c001n01" -> "all_stopped" [ style = bold] "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" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n01" -> "rsc_c001n02_start_0 c001n01" [ style = dashed] "rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n03" -> "rsc_c001n02_start_0 c001n01" [ style = dashed] "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_5000 c001n01" [ style=dashed color="red" fontcolor="black" ] @@ -68,8 +81,10 @@ "rsc_c001n02_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "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" -> "all_stopped" [ style = bold] "rsc_c001n03_monitor_0 c001n01" -> "rsc_c001n03_start_0 c001n03" [ style = dashed] "rsc_c001n03_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n03_monitor_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n03_monitor_0 c001n02" -> "rsc_c001n03_start_0 c001n03" [ style = dashed] "rsc_c001n03_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black"] @@ -78,8 +93,10 @@ "rsc_c001n03_stop_0 c001n03" -> "all_stopped" [ style = bold] "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" -> "all_stopped" [ style = bold] "rsc_c001n08_monitor_0 c001n01" -> "rsc_c001n08_start_0 c001n01" [ style = dashed] "rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n08_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n08_monitor_0 c001n03" -> "rsc_c001n08_start_0 c001n01" [ style = dashed] "rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_monitor_5000 c001n01" [ style=dashed color="red" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/bug-cl-5247.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/bug-cl-5247.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/bug-cl-5247.dot @@ -89,7 +89,9 @@ digraph "g" { "pgsql_stop_0 pgsr02" -> "all_stopped" [ style = bold] "pgsql_stop_0 pgsr02" -> "msPostgresql_stopped_0" [ style = bold] "pgsql_stop_0 pgsr02" [ style=bold color="green" fontcolor="orange"] +"pgsr01_monitor_0 bl460g8n4" -> "all_stopped" [ style = bold] "pgsr01_monitor_0 bl460g8n4" [ style=bold color="green" fontcolor="black"] +"pgsr02_monitor_0 bl460g8n3" -> "all_stopped" [ style = bold] "pgsr02_monitor_0 bl460g8n3" [ style=bold color="green" fontcolor="black"] "pgsr02_stop_0 bl460g8n4" -> "all_stopped" [ style = bold] "pgsr02_stop_0 bl460g8n4" -> "prmDB2_stop_0 bl460g8n4" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/bug-lf-2435.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/bug-lf-2435.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/bug-lf-2435.dot @@ -7,7 +7,11 @@ digraph "g" { "dummy3_stop_0 c21.chepkov.lan" -> "all_stopped" [ style = bold] "dummy3_stop_0 c21.chepkov.lan" -> "dummy2_start_0 c21.chepkov.lan" [ style = bold] "dummy3_stop_0 c21.chepkov.lan" [ style=bold color="green" fontcolor="black" ] +"dummy4_monitor_0 c19.chepkov.lan" -> "all_stopped" [ style = bold] "dummy4_monitor_0 c19.chepkov.lan" [ style=bold color="green" fontcolor="black" ] +"dummy4_monitor_0 c20.chepkov.lan" -> "all_stopped" [ style = bold] "dummy4_monitor_0 c20.chepkov.lan" [ style=bold color="green" fontcolor="black" ] +"dummy4_monitor_0 c21.chepkov.lan" -> "all_stopped" [ style = bold] +"dummy4_monitor_0 c21.chepkov.lan" -> "dummy2_start_0 c21.chepkov.lan" [ style = bold] "dummy4_monitor_0 c21.chepkov.lan" [ style=bold color="green" fontcolor="black" ] } Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/bug-lf-2435.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/bug-lf-2435.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/bug-lf-2435.exp @@ -8,6 +8,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="4" operation="monitor" operation_key="dummy4_monitor_0" on_node="c21.chepkov.lan" on_node_uuid="c21.chepkov.lan"/> + </trigger> + <trigger> <rsc_op id="7" operation="stop" operation_key="dummy2_stop_0" on_node="c20.chepkov.lan" on_node_uuid="c20.chepkov.lan"/> </trigger> <trigger> @@ -68,6 +71,15 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="dummy4_monitor_0" on_node="c19.chepkov.lan" on_node_uuid="c19.chepkov.lan"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="dummy4_monitor_0" on_node="c20.chepkov.lan" on_node_uuid="c20.chepkov.lan"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="dummy4_monitor_0" on_node="c21.chepkov.lan" on_node_uuid="c21.chepkov.lan"/> + </trigger> + <trigger> <rsc_op id="7" operation="stop" operation_key="dummy2_stop_0" on_node="c20.chepkov.lan" on_node_uuid="c20.chepkov.lan"/> </trigger> <trigger> 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 @@ -1,17 +1,20 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"export_home_ocfs2:0_monitor_0 power720-1" -> "all_stopped" [ style = bold] "export_home_ocfs2:0_monitor_0 power720-1" -> "export_home_ocfs2_clone_set_start_0" [ style = bold] "export_home_ocfs2:0_monitor_0 power720-1" [ style=bold color="green" fontcolor="black" ] "export_home_ocfs2:0_post_notify_start_0 power720-1" -> "export_home_ocfs2_clone_set_confirmed-post_notify_running_0" [ style = bold] "export_home_ocfs2:0_post_notify_start_0 power720-1" [ style=bold color="green" fontcolor="black" ] "export_home_ocfs2:0_start_0 power720-1" -> "export_home_ocfs2_clone_set_running_0" [ style = bold] "export_home_ocfs2:0_start_0 power720-1" [ style=bold color="green" fontcolor="black" ] +"export_home_ocfs2:1_monitor_0 power720-1" -> "all_stopped" [ style = bold] "export_home_ocfs2:1_monitor_0 power720-1" -> "export_home_ocfs2_clone_set_start_0" [ style = bold] "export_home_ocfs2:1_monitor_0 power720-1" [ style=bold color="green" fontcolor="black" ] "export_home_ocfs2:1_post_notify_start_0 power720-2" -> "export_home_ocfs2_clone_set_confirmed-post_notify_running_0" [ style = bold] "export_home_ocfs2:1_post_notify_start_0 power720-2" [ style=bold color="green" fontcolor="black" ] "export_home_ocfs2:1_pre_notify_start_0 power720-2" -> "export_home_ocfs2_clone_set_confirmed-pre_notify_start_0" [ style = bold] "export_home_ocfs2:1_pre_notify_start_0 power720-2" [ style=bold color="green" fontcolor="black" ] +"export_home_ocfs2:2_monitor_0 power720-1" -> "all_stopped" [ style = bold] "export_home_ocfs2:2_monitor_0 power720-1" -> "export_home_ocfs2_clone_set_start_0" [ style = bold] "export_home_ocfs2:2_monitor_0 power720-1" [ style=bold color="green" fontcolor="black" ] "export_home_ocfs2_clone_set_confirmed-post_notify_running_0" -> "group_nfs_start_0" [ style = bold] @@ -42,6 +45,8 @@ digraph "g" { "group_nfs_stop_0" [ style=bold color="green" fontcolor="orange" ] "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" -> "all_stopped" [ style = bold] +"resource_ipaddr1_single_monitor_0 power720-1" -> "group_nfs_stopped_0" [ style = bold] "resource_ipaddr1_single_monitor_0 power720-1" -> "resource_ipaddr1_single_start_0 power720-1" [ 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" ] @@ -53,6 +58,9 @@ digraph "g" { "resource_ipaddr1_single_stop_0 power720-2" -> "group_nfs_stopped_0" [ style = bold] "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" -> "all_stopped" [ style = bold] +"resource_nfsserver_single_monitor_0 power720-1" -> "group_nfs_stopped_0" [ style = bold] +"resource_nfsserver_single_monitor_0 power720-1" -> "resource_ipaddr1_single_stop_0 power720-2" [ style = bold] "resource_nfsserver_single_monitor_0 power720-1" -> "resource_nfsserver_single_start_0 power720-1" [ 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" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/clone-no-shuffle.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/clone-no-shuffle.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/clone-no-shuffle.dot @@ -12,7 +12,9 @@ digraph "g" { "drbd1:0_stop_0 dktest2sles10" -> "all_stopped" [ style = bold] "drbd1:0_stop_0 dktest2sles10" -> "ms-drbd1_stopped_0" [ style = bold] "drbd1:0_stop_0 dktest2sles10" [ style=bold color="green" fontcolor="black" ] +"drbd1:1_monitor_0 dktest1sles10" -> "all_stopped" [ style = bold] "drbd1:1_monitor_0 dktest1sles10" -> "ms-drbd1_start_0" [ style = bold] +"drbd1:1_monitor_0 dktest1sles10" -> "ms-drbd1_stopped_0" [ style = bold] "drbd1:1_monitor_0 dktest1sles10" [ style=bold color="green" fontcolor="black" ] "drbd1:1_monitor_11000 dktest1sles10" [ style=bold color="green" fontcolor="black" ] "drbd1:1_post_notify_start_0 dktest1sles10" -> "ms-drbd1_confirmed-post_notify_running_0" [ style = bold] @@ -71,11 +73,15 @@ digraph "g" { "ms-drbd1_stopped_0" -> "ms-drbd1_post_notify_stopped_0" [ style = bold] "ms-drbd1_stopped_0" -> "ms-drbd1_start_0" [ style = bold] "ms-drbd1_stopped_0" [ style=bold color="green" fontcolor="orange" ] +"stonith-1_monitor_0 dktest1sles10" -> "all_stopped" [ style = bold] "stonith-1_monitor_0 dktest1sles10" -> "stonith-1_start_0 dktest1sles10" [ style = bold] "stonith-1_monitor_0 dktest1sles10" [ style=bold color="green" fontcolor="black" ] +"stonith-1_monitor_0 dktest2sles10" -> "all_stopped" [ style = bold] "stonith-1_monitor_0 dktest2sles10" -> "stonith-1_start_0 dktest1sles10" [ style = bold] "stonith-1_monitor_0 dktest2sles10" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 dktest1sles10" [ style=bold color="green" fontcolor="black" ] +"testip_monitor_0 dktest1sles10" -> "all_stopped" [ style = bold] +"testip_monitor_0 dktest1sles10" -> "ms-drbd1_demote_0" [ style = bold] "testip_monitor_0 dktest1sles10" [ style=bold color="green" fontcolor="black" ] "testip_stop_0 dktest2sles10" -> "all_stopped" [ style = bold] "testip_stop_0 dktest2sles10" -> "ms-drbd1_demote_0" [ style = bold] 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,6 +1,8 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"child_rsc1_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc1_monitor_0 node2" -> "child_rsc1_start_0 node2" [ style = bold] +"child_rsc1_monitor_0 node2" -> "rsc2_stopped_0" [ 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] @@ -9,7 +11,10 @@ "child_rsc1_stop_0 node1" -> "child_rsc1_start_0 node2" [ style = bold] "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" -> "all_stopped" [ style = bold] +"child_rsc2_monitor_0 node2" -> "child_rsc1_stop_0 node1" [ style = bold] "child_rsc2_monitor_0 node2" -> "child_rsc2_start_0 node2" [ style = bold] +"child_rsc2_monitor_0 node2" -> "rsc2_stopped_0" [ 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] @@ -19,7 +24,10 @@ "child_rsc2_stop_0 node1" -> "child_rsc2_start_0 node2" [ style = bold] "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" -> "all_stopped" [ style = bold] +"child_rsc3_monitor_0 node2" -> "child_rsc2_stop_0 node1" [ style = bold] "child_rsc3_monitor_0 node2" -> "child_rsc3_start_0 node2" [ style = bold] +"child_rsc3_monitor_0 node2" -> "rsc2_stopped_0" [ 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" ] @@ -28,6 +36,7 @@ "child_rsc3_stop_0 node1" -> "child_rsc3_start_0 node2" [ style = bold] "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" -> "all_stopped" [ style = bold] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node2" -> "rsc2_start_0" [ style = bold] @@ -50,6 +59,8 @@ "rsc2_stopped_0" -> "rsc1_stop_0 node1" [ style = bold] "rsc2_stopped_0" -> "rsc2_start_0" [ style = bold] "rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ] +"rsc3_monitor_0 node2" -> "all_stopped" [ style = bold] +"rsc3_monitor_0 node2" -> "rsc2_stop_0" [ style = bold] "rsc3_monitor_0 node2" -> "rsc3_start_0 node2" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ] 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,6 +1,8 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"child_rsc1_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc1_monitor_0 node2" -> "child_rsc1_start_0 node2" [ style = bold] +"child_rsc1_monitor_0 node2" -> "rsc1_stopped_0" [ 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] @@ -9,7 +11,10 @@ "child_rsc1_stop_0 node1" -> "child_rsc1_start_0 node2" [ style = bold] "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" -> "all_stopped" [ style = bold] +"child_rsc2_monitor_0 node2" -> "child_rsc1_stop_0 node1" [ style = bold] "child_rsc2_monitor_0 node2" -> "child_rsc2_start_0 node2" [ style = bold] +"child_rsc2_monitor_0 node2" -> "rsc1_stopped_0" [ 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] @@ -19,7 +24,10 @@ "child_rsc2_stop_0 node1" -> "child_rsc2_start_0 node2" [ style = bold] "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" -> "all_stopped" [ style = bold] +"child_rsc3_monitor_0 node2" -> "child_rsc2_stop_0 node1" [ style = bold] "child_rsc3_monitor_0 node2" -> "child_rsc3_start_0 node2" [ style = bold] +"child_rsc3_monitor_0 node2" -> "rsc1_stopped_0" [ 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" ] @@ -28,7 +36,9 @@ "child_rsc3_stop_0 node1" -> "child_rsc3_start_0 node2" [ style = bold] "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" -> "all_stopped" [ style = bold] "child_rsc4_monitor_0 node2" -> "child_rsc4_start_0 node2" [ style = bold] +"child_rsc4_monitor_0 node2" -> "rsc2_stopped_0" [ 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] @@ -37,7 +47,10 @@ "child_rsc4_stop_0 node1" -> "child_rsc4_start_0 node2" [ style = bold] "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" -> "all_stopped" [ style = bold] +"child_rsc5_monitor_0 node2" -> "child_rsc4_stop_0 node1" [ style = bold] "child_rsc5_monitor_0 node2" -> "child_rsc5_start_0 node2" [ style = bold] +"child_rsc5_monitor_0 node2" -> "rsc2_stopped_0" [ 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] @@ -47,7 +60,10 @@ "child_rsc5_stop_0 node1" -> "child_rsc5_start_0 node2" [ style = bold] "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" -> "all_stopped" [ style = bold] +"child_rsc6_monitor_0 node2" -> "child_rsc5_stop_0 node1" [ style = bold] "child_rsc6_monitor_0 node2" -> "child_rsc6_start_0 node2" [ style = bold] +"child_rsc6_monitor_0 node2" -> "rsc2_stopped_0" [ 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/group9.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/group9.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/group9.dot @@ -24,9 +24,15 @@ "foo_stop_0" [ style=bold color="green" fontcolor="orange" ] "foo_stopped_0" -> "foo_start_0" [ style = bold] "foo_stopped_0" [ style=bold color="green" fontcolor="orange" ] +"rsc1_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc2_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc3_monitor_0 node2" -> "all_stopped" [ style = bold] +"rsc3_monitor_0 node2" -> "foo_stopped_0" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc4_monitor_0 node2" -> "all_stopped" [ style = bold] +"rsc4_monitor_0 node2" -> "foo_stopped_0" [ style = bold] "rsc4_monitor_0 node2" -> "rsc4_start_0 node1" [ style = bold] "rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_start_0 node1" -> "foo_running_0" [ style = bold] @@ -36,6 +42,9 @@ "rsc4_stop_0 node1" -> "foo_stopped_0" [ style = bold] "rsc4_stop_0 node1" -> "rsc4_start_0 node1" [ style = bold] "rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc5_monitor_0 node2" -> "all_stopped" [ style = bold] +"rsc5_monitor_0 node2" -> "foo_stopped_0" [ style = bold] +"rsc5_monitor_0 node2" -> "rsc4_stop_0 node1" [ style = bold] "rsc5_monitor_0 node2" -> "rsc5_start_0 node1" [ style = bold] "rsc5_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc5_start_0 node1" -> "foo_running_0" [ style = bold] @@ -45,6 +54,8 @@ "rsc5_stop_0 node1" -> "rsc4_stop_0 node1" [ style = bold] "rsc5_stop_0 node1" -> "rsc5_start_0 node1" [ style = bold] "rsc5_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc6_monitor_0 node2" -> "all_stopped" [ style = bold] +"rsc6_monitor_0 node2" -> "bar_stopped_0" [ style = bold] "rsc6_monitor_0 node2" -> "rsc6_start_0 node2" [ style = bold] "rsc6_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc6_start_0 node2" -> "bar_running_0" [ style = bold] @@ -54,6 +65,9 @@ "rsc6_stop_0 node1" -> "bar_stopped_0" [ style = bold] "rsc6_stop_0 node1" -> "rsc6_start_0 node2" [ style = bold] "rsc6_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc7_monitor_0 node2" -> "all_stopped" [ style = bold] +"rsc7_monitor_0 node2" -> "bar_stopped_0" [ style = bold] +"rsc7_monitor_0 node2" -> "rsc6_stop_0 node1" [ style = bold] "rsc7_monitor_0 node2" -> "rsc7_start_0 node2" [ style = bold] "rsc7_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc7_start_0 node2" -> "bar_running_0" [ style = bold] @@ -64,6 +78,9 @@ "rsc7_stop_0 node1" -> "rsc6_stop_0 node1" [ style = bold] "rsc7_stop_0 node1" -> "rsc7_start_0 node2" [ style = bold] "rsc7_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc8_monitor_0 node2" -> "all_stopped" [ style = bold] +"rsc8_monitor_0 node2" -> "bar_stopped_0" [ style = bold] +"rsc8_monitor_0 node2" -> "rsc7_stop_0 node1" [ style = bold] "rsc8_monitor_0 node2" -> "rsc8_start_0 node2" [ style = bold] "rsc8_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc8_start_0 node2" -> "bar_running_0" [ style = bold] 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 @@ -28,6 +28,15 @@ <rsc_op id="1" operation="stop" operation_key="rsc4_stop_0" on_node="node1" on_node_uuid="node1"/> </trigger> <trigger> + <rsc_op id="6" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="rsc5_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> <rsc_op id="19" operation="stop" operation_key="rsc5_stop_0" on_node="node1" on_node_uuid="node1"/> </trigger> <trigger> @@ -119,6 +128,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="8" operation="monitor" operation_key="rsc5_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> <rsc_op id="19" operation="stop" operation_key="rsc5_stop_0" on_node="node1" on_node_uuid="node1"/> </trigger> <trigger> @@ -181,6 +193,15 @@ <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> + <rsc_op id="10" operation="monitor" operation_key="rsc7_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> + <rsc_op id="11" operation="monitor" operation_key="rsc8_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> <rsc_op id="25" operation="stop" operation_key="rsc6_stop_0" on_node="node1" on_node_uuid="node1"/> </trigger> <trigger> @@ -263,6 +284,9 @@ <rsc_op id="2" operation="stop" operation_key="rsc7_stop_0" on_node="node1" on_node_uuid="node1"/> </trigger> <trigger> + <rsc_op id="10" operation="monitor" operation_key="rsc7_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> <pseudo_event id="32" operation="stop" operation_key="bar_stop_0"/> </trigger> </inputs> @@ -316,6 +340,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="11" operation="monitor" operation_key="rsc8_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> <rsc_op id="28" operation="stop" operation_key="rsc8_stop_0" on_node="node1" on_node_uuid="node1"/> </trigger> <trigger> @@ -381,6 +408,30 @@ <rsc_op id="2" operation="stop" operation_key="rsc7_stop_0" on_node="node1" on_node_uuid="node1"/> </trigger> <trigger> + <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> + <rsc_op id="6" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="rsc5_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> + <rsc_op id="9" operation="monitor" operation_key="rsc6_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="rsc7_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> + <rsc_op id="11" operation="monitor" operation_key="rsc8_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> <rsc_op id="19" operation="stop" operation_key="rsc5_stop_0" on_node="node1" on_node_uuid="node1"/> </trigger> <trigger> 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 @@ -1,10 +1,16 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"child_rsc1:0_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc1:0_monitor_0 node2" -> "rsc1_start_0" [ style = bold] +"child_rsc1:0_monitor_0 node2" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"child_rsc1:1_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc1:1_monitor_0 node2" -> "rsc1_start_0" [ style = bold] +"child_rsc1:1_monitor_0 node2" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"child_rsc1:2_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc1:2_monitor_0 node2" -> "rsc1_start_0" [ style = bold] +"child_rsc1:2_monitor_0 node2" -> "rsc1_stopped_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] "child_rsc1:2_start_0 node2" [ style=bold color="green" fontcolor="black" ] @@ -12,7 +18,9 @@ "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" -> "all_stopped" [ style = bold] "child_rsc1:3_monitor_0 node2" -> "rsc1_start_0" [ style = bold] +"child_rsc1:3_monitor_0 node2" -> "rsc1_stopped_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] "child_rsc1:3_start_0 node2" [ style=bold color="green" fontcolor="black" ] @@ -20,7 +28,9 @@ "child_rsc1:3_stop_0 node1" -> "child_rsc1:3_start_0 node2" [ style = bold] "child_rsc1:3_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc1:4_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc1:4_monitor_0 node2" -> "rsc1_start_0" [ style = bold] +"child_rsc1:4_monitor_0 node2" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:4_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1:4_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] 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 @@ -1,10 +1,16 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"child_rsc1:0_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc1:0_monitor_0 node2" -> "rsc1_start_0" [ style = bold] +"child_rsc1:0_monitor_0 node2" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"child_rsc1:1_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc1:1_monitor_0 node2" -> "rsc1_start_0" [ style = bold] +"child_rsc1:1_monitor_0 node2" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"child_rsc1:2_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc1:2_monitor_0 node2" -> "rsc1_start_0" [ style = bold] +"child_rsc1:2_monitor_0 node2" -> "rsc1_stopped_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] "child_rsc1:2_start_0 node2" [ style=bold color="green" fontcolor="black" ] @@ -12,7 +18,9 @@ "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" -> "all_stopped" [ style = bold] "child_rsc1:3_monitor_0 node2" -> "rsc1_start_0" [ style = bold] +"child_rsc1:3_monitor_0 node2" -> "rsc1_stopped_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] "child_rsc1:3_start_0 node2" [ style=bold color="green" fontcolor="black" ] @@ -20,18 +28,28 @@ "child_rsc1:3_stop_0 node1" -> "child_rsc1:3_start_0 node2" [ style = bold] "child_rsc1:3_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc1:4_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc1:4_monitor_0 node2" -> "rsc1_start_0" [ style = bold] +"child_rsc1:4_monitor_0 node2" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:4_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1:4_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc2:0_monitor_0 node1" -> "all_stopped" [ style = bold] "child_rsc2:0_monitor_0 node1" -> "rsc2_start_0" [ style = bold] +"child_rsc2:0_monitor_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc2:1_monitor_0 node1" -> "all_stopped" [ style = bold] "child_rsc2:1_monitor_0 node1" -> "rsc2_start_0" [ style = bold] +"child_rsc2:1_monitor_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc2:2_monitor_0 node1" -> "all_stopped" [ style = bold] "child_rsc2:2_monitor_0 node1" -> "rsc2_start_0" [ style = bold] +"child_rsc2:2_monitor_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc2:3_monitor_0 node1" -> "all_stopped" [ style = bold] "child_rsc2:3_monitor_0 node1" -> "rsc2_start_0" [ style = bold] +"child_rsc2:3_monitor_0 node1" -> "rsc2_stopped_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] "child_rsc2:3_start_0 node1" [ style=bold color="green" fontcolor="black" ] @@ -39,7 +57,9 @@ "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" -> "all_stopped" [ style = bold] "child_rsc2:4_monitor_0 node1" -> "rsc2_start_0" [ style = bold] +"child_rsc2:4_monitor_0 node1" -> "rsc2_stopped_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] "child_rsc2:4_start_0 node1" [ style=bold color="green" fontcolor="black" ] 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 @@ -1,10 +1,16 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"child_rsc1:0_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc1:0_monitor_0 node2" -> "rsc1_start_0" [ style = bold] +"child_rsc1:0_monitor_0 node2" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"child_rsc1:1_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc1:1_monitor_0 node2" -> "rsc1_start_0" [ style = bold] +"child_rsc1:1_monitor_0 node2" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"child_rsc1:2_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc1:2_monitor_0 node2" -> "rsc1_start_0" [ style = bold] +"child_rsc1:2_monitor_0 node2" -> "rsc1_stopped_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] "child_rsc1:2_start_0 node2" -> "rsc1_running_0" [ style = bold] @@ -13,7 +19,10 @@ "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" -> "all_stopped" [ style = bold] +"child_rsc1:3_monitor_0 node2" -> "child_rsc1:2_stop_0 node1" [ style = bold] "child_rsc1:3_monitor_0 node2" -> "rsc1_start_0" [ style = bold] +"child_rsc1:3_monitor_0 node2" -> "rsc1_stopped_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] "child_rsc1:3_start_0 node2" [ style=bold color="green" fontcolor="black" ] @@ -22,19 +31,30 @@ "child_rsc1:3_stop_0 node1" -> "child_rsc1:3_start_0 node2" [ style = bold] "child_rsc1:3_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc1:4_monitor_0 node2" -> "all_stopped" [ style = bold] +"child_rsc1:4_monitor_0 node2" -> "child_rsc1:3_stop_0 node1" [ style = bold] "child_rsc1:4_monitor_0 node2" -> "rsc1_start_0" [ style = bold] +"child_rsc1:4_monitor_0 node2" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:4_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1:4_stop_0 node1" -> "child_rsc1:3_stop_0 node1" [ style = bold] "child_rsc1:4_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc2:0_monitor_0 node1" -> "all_stopped" [ style = bold] "child_rsc2:0_monitor_0 node1" -> "rsc2_start_0" [ style = bold] +"child_rsc2:0_monitor_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc2:1_monitor_0 node1" -> "all_stopped" [ style = bold] "child_rsc2:1_monitor_0 node1" -> "rsc2_start_0" [ style = bold] +"child_rsc2:1_monitor_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc2:2_monitor_0 node1" -> "all_stopped" [ style = bold] "child_rsc2:2_monitor_0 node1" -> "rsc2_start_0" [ style = bold] +"child_rsc2:2_monitor_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc2:3_monitor_0 node1" -> "all_stopped" [ style = bold] "child_rsc2:3_monitor_0 node1" -> "rsc2_start_0" [ style = bold] +"child_rsc2:3_monitor_0 node1" -> "rsc2_stopped_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] "child_rsc2:3_start_0 node1" -> "rsc2_running_0" [ style = bold] @@ -43,7 +63,10 @@ "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" -> "all_stopped" [ style = bold] +"child_rsc2:4_monitor_0 node1" -> "child_rsc2:3_stop_0 node2" [ style = bold] "child_rsc2:4_monitor_0 node1" -> "rsc2_start_0" [ style = bold] +"child_rsc2:4_monitor_0 node1" -> "rsc2_stopped_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] "child_rsc2:4_start_0 node1" [ style=bold color="green" fontcolor="black" ] 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 @@ -1,12 +1,20 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"child_rsc1:0_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"child_rsc1:1_monitor_0 node1" -> "all_stopped" [ style = bold] "child_rsc1:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc1:2_monitor_0 node1" -> "all_stopped" [ style = bold] "child_rsc1:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc1:2_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"child_rsc2:0_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc2:0_monitor_0 node2" -> "rsc2_start_0" [ style = bold] +"child_rsc2:0_monitor_0 node2" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"child_rsc2:1_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc2:1_monitor_0 node2" -> "rsc2_start_0" [ style = bold] +"child_rsc2:1_monitor_0 node2" -> "rsc2_stopped_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] "child_rsc2:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] @@ -14,17 +22,29 @@ "child_rsc2:1_stop_0 node1" -> "child_rsc2:1_start_0 node2" [ style = bold] "child_rsc2:1_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc2:2_monitor_0 node1" -> "all_stopped" [ style = bold] "child_rsc2:2_monitor_0 node1" -> "rsc2_start_0" [ style = bold] +"child_rsc2:2_monitor_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc2:2_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc2:2_monitor_0 node2" -> "rsc2_start_0" [ style = bold] +"child_rsc2:2_monitor_0 node2" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"child_rsc3:0_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc3:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"child_rsc3:1_monitor_0 node1" -> "all_stopped" [ style = bold] "child_rsc3:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc3:2_monitor_0 node1" -> "all_stopped" [ style = bold] "child_rsc3:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc3:2_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc3:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"child_rsc4:0_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc4:0_monitor_0 node2" -> "rsc4_start_0" [ style = bold] +"child_rsc4:0_monitor_0 node2" -> "rsc4_stopped_0" [ style = bold] "child_rsc4:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"child_rsc4:1_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc4:1_monitor_0 node2" -> "rsc4_start_0" [ style = bold] +"child_rsc4:1_monitor_0 node2" -> "rsc4_stopped_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] "child_rsc4:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] @@ -32,13 +52,21 @@ "child_rsc4:1_stop_0 node1" -> "child_rsc4:1_start_0 node2" [ style = bold] "child_rsc4:1_stop_0 node1" -> "rsc4_stopped_0" [ style = bold] "child_rsc4:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc4:2_monitor_0 node1" -> "all_stopped" [ style = bold] "child_rsc4:2_monitor_0 node1" -> "rsc4_start_0" [ style = bold] +"child_rsc4:2_monitor_0 node1" -> "rsc4_stopped_0" [ style = bold] "child_rsc4:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc4:2_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc4:2_monitor_0 node2" -> "rsc4_start_0" [ style = bold] +"child_rsc4:2_monitor_0 node2" -> "rsc4_stopped_0" [ style = bold] "child_rsc4:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"child_rsc5:0_monitor_0 node1" -> "all_stopped" [ style = bold] "child_rsc5:0_monitor_0 node1" -> "rsc5_start_0" [ style = bold] +"child_rsc5:0_monitor_0 node1" -> "rsc5_stopped_0" [ style = bold] "child_rsc5:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc5:1_monitor_0 node1" -> "all_stopped" [ style = bold] "child_rsc5:1_monitor_0 node1" -> "rsc5_start_0" [ style = bold] +"child_rsc5:1_monitor_0 node1" -> "rsc5_stopped_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] "child_rsc5:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] @@ -46,17 +74,29 @@ "child_rsc5:1_stop_0 node2" -> "child_rsc5:1_start_0 node1" [ style = bold] "child_rsc5:1_stop_0 node2" -> "rsc5_stopped_0" [ style = bold] "child_rsc5:1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] +"child_rsc5:2_monitor_0 node1" -> "all_stopped" [ style = bold] "child_rsc5:2_monitor_0 node1" -> "rsc5_start_0" [ style = bold] +"child_rsc5:2_monitor_0 node1" -> "rsc5_stopped_0" [ style = bold] "child_rsc5:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc5:2_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc5:2_monitor_0 node2" -> "rsc5_start_0" [ style = bold] +"child_rsc5:2_monitor_0 node2" -> "rsc5_stopped_0" [ style = bold] "child_rsc5:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"child_rsc6:0_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc6:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"child_rsc6:1_monitor_0 node1" -> "all_stopped" [ style = bold] "child_rsc6:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc6:2_monitor_0 node1" -> "all_stopped" [ style = bold] "child_rsc6:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc6:2_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc6:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"child_rsc7:0_monitor_0 node1" -> "all_stopped" [ style = bold] "child_rsc7:0_monitor_0 node1" -> "rsc7_start_0" [ style = bold] +"child_rsc7:0_monitor_0 node1" -> "rsc7_stopped_0" [ style = bold] "child_rsc7:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc7:1_monitor_0 node1" -> "all_stopped" [ style = bold] "child_rsc7:1_monitor_0 node1" -> "rsc7_start_0" [ style = bold] +"child_rsc7:1_monitor_0 node1" -> "rsc7_stopped_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] "child_rsc7:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] @@ -64,13 +104,21 @@ "child_rsc7:1_stop_0 node2" -> "child_rsc7:1_start_0 node1" [ style = bold] "child_rsc7:1_stop_0 node2" -> "rsc7_stopped_0" [ style = bold] "child_rsc7:1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] +"child_rsc7:2_monitor_0 node1" -> "all_stopped" [ style = bold] "child_rsc7:2_monitor_0 node1" -> "rsc7_start_0" [ style = bold] +"child_rsc7:2_monitor_0 node1" -> "rsc7_stopped_0" [ style = bold] "child_rsc7:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc7:2_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc7:2_monitor_0 node2" -> "rsc7_start_0" [ style = bold] +"child_rsc7:2_monitor_0 node2" -> "rsc7_stopped_0" [ style = bold] "child_rsc7:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"child_rsc8:0_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc8:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"child_rsc8:1_monitor_0 node1" -> "all_stopped" [ style = bold] "child_rsc8:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc8:2_monitor_0 node1" -> "all_stopped" [ style = bold] "child_rsc8:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc8:2_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc8:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_start_0" -> "child_rsc2:1_start_0 node2" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/master-7.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/master-7.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/master-7.dot @@ -13,9 +13,17 @@ digraph "g" { "child_DoFencing:0_stop_0 c001n01" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:0_stop_0 c001n01" -> "all_stopped" [ style = bold] "child_DoFencing:0_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ] +"child_DoFencing:2_monitor_0 c001n03" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:2_monitor_0 c001n03" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:2_monitor_0 c001n08" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:2_monitor_0 c001n08" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:3_monitor_0 c001n02" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:3_monitor_0 c001n02" -> "all_stopped" [ style = bold] "child_DoFencing:3_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:3_monitor_0 c001n03" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:3_monitor_0 c001n03" -> "all_stopped" [ style = bold] "child_DoFencing:3_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "group-1_running_0" [ style=bold color="green" fontcolor="orange" ] "group-1_start_0" -> "group-1_running_0" [ style = bold] @@ -80,17 +88,35 @@ digraph "g" { "ocf_msdummy:0_stop_0 c001n01" -> "all_stopped" [ style = bold] "ocf_msdummy:0_stop_0 c001n01" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:0_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ] +"ocf_msdummy:4_monitor_0 c001n02" -> "all_stopped" [ style = bold] +"ocf_msdummy:4_monitor_0 c001n02" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:4_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:4_monitor_0 c001n03" -> "all_stopped" [ style = bold] +"ocf_msdummy:4_monitor_0 c001n03" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:4_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:4_monitor_0 c001n08" -> "all_stopped" [ style = bold] +"ocf_msdummy:4_monitor_0 c001n08" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:4_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:4_stop_0 c001n01" -> "all_stopped" [ style = bold] "ocf_msdummy:4_stop_0 c001n01" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:4_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ] +"ocf_msdummy:5_monitor_0 c001n02" -> "all_stopped" [ style = bold] +"ocf_msdummy:5_monitor_0 c001n02" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:5_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:5_monitor_0 c001n08" -> "all_stopped" [ style = bold] +"ocf_msdummy:5_monitor_0 c001n08" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:5_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:6_monitor_0 c001n03" -> "all_stopped" [ style = bold] +"ocf_msdummy:6_monitor_0 c001n03" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:6_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:6_monitor_0 c001n08" -> "all_stopped" [ style = bold] +"ocf_msdummy:6_monitor_0 c001n08" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:6_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:7_monitor_0 c001n02" -> "all_stopped" [ style = bold] +"ocf_msdummy:7_monitor_0 c001n02" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:7_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:7_monitor_0 c001n03" -> "all_stopped" [ style = bold] +"ocf_msdummy:7_monitor_0 c001n03" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:7_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_start_0 c001n03" -> "rsc_c001n01_monitor_5000 c001n03" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/master-8.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/master-8.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/master-8.dot @@ -13,9 +13,17 @@ digraph "g" { "child_DoFencing:0_stop_0 c001n01" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:0_stop_0 c001n01" -> "all_stopped" [ style = bold] "child_DoFencing:0_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ] +"child_DoFencing:2_monitor_0 c001n03" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:2_monitor_0 c001n03" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:2_monitor_0 c001n08" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:2_monitor_0 c001n08" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:3_monitor_0 c001n02" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:3_monitor_0 c001n02" -> "all_stopped" [ style = bold] "child_DoFencing:3_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:3_monitor_0 c001n03" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:3_monitor_0 c001n03" -> "all_stopped" [ style = bold] "child_DoFencing:3_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "group-1_running_0" [ style=bold color="green" fontcolor="orange" ] "group-1_start_0" -> "group-1_running_0" [ style = bold] @@ -91,25 +99,45 @@ digraph "g" { "ocf_msdummy:0_stop_0 c001n01" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:0_stop_0 c001n01" -> "ocf_msdummy:0_start_0 c001n03" [ style = bold] "ocf_msdummy:0_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ] +"ocf_msdummy:4_monitor_0 c001n02" -> "all_stopped" [ style = bold] "ocf_msdummy:4_monitor_0 c001n02" -> "master_rsc_1_start_0" [ style = bold] +"ocf_msdummy:4_monitor_0 c001n02" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:4_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:4_monitor_0 c001n03" -> "all_stopped" [ style = bold] "ocf_msdummy:4_monitor_0 c001n03" -> "master_rsc_1_start_0" [ style = bold] +"ocf_msdummy:4_monitor_0 c001n03" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:4_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:4_monitor_0 c001n08" -> "all_stopped" [ style = bold] "ocf_msdummy:4_monitor_0 c001n08" -> "master_rsc_1_start_0" [ style = bold] +"ocf_msdummy:4_monitor_0 c001n08" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:4_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:5_monitor_0 c001n02" -> "all_stopped" [ style = bold] "ocf_msdummy:5_monitor_0 c001n02" -> "master_rsc_1_start_0" [ style = bold] +"ocf_msdummy:5_monitor_0 c001n02" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:5_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:5_monitor_0 c001n03" -> "all_stopped" [ style = bold] "ocf_msdummy:5_monitor_0 c001n03" -> "master_rsc_1_start_0" [ style = bold] +"ocf_msdummy:5_monitor_0 c001n03" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:5_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:5_monitor_0 c001n08" -> "all_stopped" [ style = bold] "ocf_msdummy:5_monitor_0 c001n08" -> "master_rsc_1_start_0" [ style = bold] +"ocf_msdummy:5_monitor_0 c001n08" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:5_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:6_monitor_0 c001n03" -> "all_stopped" [ style = bold] "ocf_msdummy:6_monitor_0 c001n03" -> "master_rsc_1_start_0" [ style = bold] +"ocf_msdummy:6_monitor_0 c001n03" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:6_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:6_monitor_0 c001n08" -> "all_stopped" [ style = bold] "ocf_msdummy:6_monitor_0 c001n08" -> "master_rsc_1_start_0" [ style = bold] +"ocf_msdummy:6_monitor_0 c001n08" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:6_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:7_monitor_0 c001n02" -> "all_stopped" [ style = bold] "ocf_msdummy:7_monitor_0 c001n02" -> "master_rsc_1_start_0" [ style = bold] +"ocf_msdummy:7_monitor_0 c001n02" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:7_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:7_monitor_0 c001n03" -> "all_stopped" [ style = bold] "ocf_msdummy:7_monitor_0 c001n03" -> "master_rsc_1_start_0" [ style = bold] +"ocf_msdummy:7_monitor_0 c001n03" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:7_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_start_0 c001n03" -> "rsc_c001n01_monitor_5000 c001n03" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/notify-0.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/notify-0.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/notify-0.dot @@ -1,5 +1,6 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"child_rsc1:1_monitor_0 node1" -> "all_stopped" [ 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_start_0 node1" -> "rsc1_running_0" [ style = bold] @@ -7,6 +8,8 @@ "child_rsc2:0_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc2:0_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:0_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc2:1_monitor_0 node1" -> "all_stopped" [ style = bold] +"child_rsc2:1_monitor_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_start_0" -> "child_rsc1:1_start_0 node1" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/notify-1.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/notify-1.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/notify-1.dot @@ -4,6 +4,7 @@ "child_rsc1:0_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_pre_notify_start_0 node1" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold] "child_rsc1:0_pre_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc1:1_monitor_0 node1" -> "all_stopped" [ 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] @@ -15,6 +16,8 @@ "child_rsc2:0_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc2:0_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:0_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc2:1_monitor_0 node1" -> "all_stopped" [ style = bold] +"child_rsc2:1_monitor_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_confirmed-post_notify_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-pre_notify_start_0" -> "rsc1_post_notify_running_0" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/notify-2.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/notify-2.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/notify-2.dot @@ -4,6 +4,7 @@ "child_rsc1:0_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_pre_notify_start_0 node1" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold] "child_rsc1:0_pre_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc1:1_monitor_0 node1" -> "all_stopped" [ 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] @@ -15,6 +16,8 @@ "child_rsc2:0_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc2:0_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:0_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc2:1_monitor_0 node1" -> "all_stopped" [ style = bold] +"child_rsc2:1_monitor_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_confirmed-post_notify_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-pre_notify_start_0" -> "rsc1_post_notify_running_0" [ style = bold] 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 @@ -1,6 +1,8 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"child_rsc1:0_monitor_0 node2" -> "all_stopped" [ style = bold] "child_rsc1:0_monitor_0 node2" -> "rsc1_start_0" [ style = bold] +"child_rsc1:0_monitor_0 node2" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_running_0" [ style = bold] "child_rsc1:0_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] @@ -10,7 +12,9 @@ "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" -> "all_stopped" [ style = bold] "child_rsc1:1_monitor_0 node1" -> "rsc1_start_0" [ style = bold] +"child_rsc1:1_monitor_0 node1" -> "rsc1_stopped_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] "child_rsc1:1_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] @@ -22,13 +26,19 @@ "child_rsc1:1_stop_0 node2" -> "child_rsc1:1_start_0 node1" [ style = bold] "child_rsc1:1_stop_0 node2" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] +"child_rsc2:0_monitor_0 node2" -> "all_stopped" [ style = bold] +"child_rsc2:0_monitor_0 node2" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2:0_pre_notify_stop_0 node1" -> "rsc2_confirmed-pre_notify_stop_0" [ style = bold] "child_rsc2:0_pre_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:0_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc2:0_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:0_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc2:1_monitor_0 node1" -> "all_stopped" [ style = bold] +"child_rsc2:1_monitor_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"child_rsc2:1_monitor_0 node2" -> "all_stopped" [ style = bold] +"child_rsc2:1_monitor_0 node2" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_confirmed-post_notify_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] 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 @@ -4,6 +4,7 @@ "configstoreclone:0_post_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ] "configstoreclone:0_pre_notify_start_0 node2" -> "configstorecloneset_confirmed-pre_notify_start_0" [ style = bold] "configstoreclone:0_pre_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ] +"configstoreclone:1_monitor_0 node1" -> "all_stopped" [ style = bold] "configstoreclone:1_monitor_0 node1" -> "configstorecloneset_start_0" [ style = bold] "configstoreclone:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "configstoreclone:1_monitor_20000 node1" [ style=bold color="green" fontcolor="black" ] @@ -35,6 +36,7 @@ "evmsclone:0_post_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ] "evmsclone:0_pre_notify_start_0 node2" -> "evmscloneset_confirmed-pre_notify_start_0" [ style = bold] "evmsclone:0_pre_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ] +"evmsclone:1_monitor_0 node1" -> "all_stopped" [ style = bold] "evmsclone:1_monitor_0 node1" -> "evmscloneset_start_0" [ style = bold] "evmsclone:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "evmsclone:1_post_notify_start_0 node1" -> "evmscloneset_confirmed-post_notify_running_0" [ style = bold] @@ -59,6 +61,7 @@ "evmscloneset_start_0" -> "evmsclone:1_start_0 node1" [ style = bold] "evmscloneset_start_0" -> "evmscloneset_running_0" [ style = bold] "evmscloneset_start_0" [ style=bold color="green" fontcolor="orange" ] +"evmsdclone:1_monitor_0 node1" -> "all_stopped" [ style = bold] "evmsdclone:1_monitor_0 node1" -> "evmsdcloneset_start_0" [ style = bold] "evmsdclone:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "evmsdclone:1_monitor_5000 node1" [ style=bold color="green" fontcolor="black" ] @@ -70,7 +73,9 @@ "evmsdcloneset_start_0" -> "evmsdclone:1_start_0 node1" [ style = bold] "evmsdcloneset_start_0" -> "evmsdcloneset_running_0" [ style = bold] "evmsdcloneset_start_0" [ style=bold color="green" fontcolor="orange" ] +"imagestoreclone:0_monitor_0 node1" -> "all_stopped" [ style = bold] "imagestoreclone:0_monitor_0 node1" -> "imagestorecloneset_start_0" [ style = bold] +"imagestoreclone:0_monitor_0 node1" -> "imagestorecloneset_stopped_0" [ style = bold] "imagestoreclone:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "imagestoreclone:0_monitor_20000 node1" [ style=bold color="green" fontcolor="black" ] "imagestoreclone:0_post_notify_start_0 node1" -> "imagestorecloneset_confirmed-post_notify_running_0" [ style = bold] @@ -132,6 +137,8 @@ "sles10_migrate_from_0 node1" [ style=bold color="green" fontcolor="black"] "sles10_migrate_to_0 node2" -> "sles10_migrate_from_0 node1" [ style = bold] "sles10_migrate_to_0 node2" [ style=bold color="green" fontcolor="black"] +"sles10_monitor_0 node1" -> "all_stopped" [ style = bold] +"sles10_monitor_0 node1" -> "imagestorecloneset_stop_0" [ style = bold] "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" [ style=bold color="green" fontcolor="black" ] @@ -142,6 +149,7 @@ "sles10_stop_0 node2" -> "imagestorecloneset_stop_0" [ style = dashed] "sles10_stop_0 node2" -> "sles10_start_0 node1" [ style = bold] "sles10_stop_0 node2" [ style=bold color="green" fontcolor="black" ] +"stonithclone:1_monitor_0 node1" -> "all_stopped" [ style = bold] "stonithclone:1_monitor_0 node1" -> "stonithcloneset_start_0" [ style = bold] "stonithclone:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "stonithclone:1_monitor_5000 node1" [ style=bold color="green" fontcolor="black" ] 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 @@ -456,6 +456,9 @@ <rsc_op id="5" operation="stop" operation_key="imagestoreclone:0_stop_0" on_node="node2" on_node_uuid="2c826922-d092-4862-bedc-de9ae2312117"/> </trigger> <trigger> + <rsc_op id="11" operation="monitor" operation_key="imagestoreclone:0_monitor_0" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a"/> + </trigger> + <trigger> <pseudo_event id="55" operation="stop" operation_key="imagestorecloneset_stop_0"/> </trigger> </inputs> @@ -468,6 +471,9 @@ </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> <pseudo_event id="58" operation="notified" operation_key="imagestorecloneset_confirmed-pre_notify_stop_0"/> </trigger> </inputs> @@ -836,6 +842,24 @@ <rsc_op id="5" operation="stop" operation_key="imagestoreclone:0_stop_0" on_node="node2" on_node_uuid="2c826922-d092-4862-bedc-de9ae2312117"/> </trigger> <trigger> + <rsc_op id="8" operation="monitor" operation_key="stonithclone:1_monitor_0" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a"/> + </trigger> + <trigger> + <rsc_op id="9" operation="monitor" operation_key="evmsdclone:1_monitor_0" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a"/> + </trigger> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="evmsclone:1_monitor_0" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a"/> + </trigger> + <trigger> + <rsc_op id="11" operation="monitor" operation_key="imagestoreclone:0_monitor_0" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a"/> + </trigger> + <trigger> + <rsc_op id="12" operation="monitor" operation_key="configstoreclone:1_monitor_0" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a"/> + </trigger> + <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> <pseudo_event id="60" operation="notified" operation_key="imagestorecloneset_confirmed-post_notify_stopped_0"/> </trigger> <trigger> 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,5 +1,6 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"rsc1_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node2" -> "rsc2_start_0 node2" [ style = bold] @@ -7,7 +8,10 @@ "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="black" ] +"rsc2_monitor_0 node2" -> "all_stopped" [ style = bold] +"rsc2_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = bold] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] +"rsc2_monitor_0 node2" -> "rsc4_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" ] @@ -16,6 +20,8 @@ "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold] "rsc2_stop_0 node1" -> "rsc4_stop_0 node1" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc3_monitor_0 node2" -> "all_stopped" [ style = bold] +"rsc3_monitor_0 node2" -> "rsc2_stop_0 node1" [ style = bold] "rsc3_monitor_0 node2" -> "rsc3_start_0 node2" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ] @@ -23,6 +29,7 @@ "rsc3_stop_0 node1" -> "rsc2_stop_0 node1" [ style = bold] "rsc3_stop_0 node1" -> "rsc3_start_0 node2" [ style = bold] "rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc4_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc4_monitor_0 node2" -> "rsc4_start_0 node2" [ style = bold] "rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_start_0 node2" -> "rsc2_start_0 node2" [ style = bold] 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 @@ -13,6 +13,8 @@ digraph "g" { "group1_stopped_0" -> "group1_start_0" [ style = bold] "group1_stopped_0" -> "rsc3_stop_0 node2" [ style = bold] "group1_stopped_0" [ style=bold color="green" fontcolor="orange" ] +"rsc1_monitor_0 node2" -> "all_stopped" [ style = bold] +"rsc1_monitor_0 node2" -> "group1_stopped_0" [ style = bold] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node2" -> "group1_running_0" [ style = bold] @@ -22,6 +24,9 @@ digraph "g" { "rsc1_stop_0 node1" -> "group1_stopped_0" [ 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" -> "all_stopped" [ style = bold] +"rsc2_monitor_0 node2" -> "group1_stopped_0" [ style = bold] +"rsc2_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = bold] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" -> "group1_running_0" [ style = bold] @@ -41,6 +46,7 @@ digraph "g" { "stonith 'reboot' node1" -> "rsc2_stop_0 node1" [ style = bold] "stonith 'reboot' node1" -> "stonith_complete" [ style = bold] "stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"] +"stonith-1_monitor_0 node2" -> "all_stopped" [ style = bold] "stonith-1_monitor_0 node2" -> "stonith-1_start_0 node2" [ style = bold] "stonith-1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 node2" [ style=bold color="green" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/reload-becomes-restart.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/reload-becomes-restart.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/reload-becomes-restart.dot @@ -1,7 +1,9 @@ digraph "g" { "Fencing_monitor_0 node1" -> "Fencing_start_0 node1" [ style = bold] +"Fencing_monitor_0 node1" -> "all_stopped" [ style = bold] "Fencing_monitor_0 node1" [ style=bold color="green" fontcolor="black"] "Fencing_monitor_0 node2" -> "Fencing_start_0 node1" [ style = bold] +"Fencing_monitor_0 node2" -> "all_stopped" [ style = bold] "Fencing_monitor_0 node2" [ style=bold color="green" fontcolor="black"] "Fencing_monitor_120000 node1" [ style=bold color="green" fontcolor="black"] "Fencing_start_0 node1" -> "Fencing_monitor_120000 node1" [ style = bold] @@ -23,6 +25,7 @@ digraph "g" { "cl-rsc2_stop_0" [ style=bold color="green" fontcolor="orange"] "cl-rsc2_stopped_0" -> "cl-rsc2_start_0" [ style = bold] "cl-rsc2_stopped_0" [ style=bold color="green" fontcolor="orange"] +"rsc1:0_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc1:0_monitor_0 node2" -> "cl-rsc1_start_0" [ style = bold] "rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black"] "rsc1:0_monitor_120000 node2" [ style=bold color="green" fontcolor="black"] @@ -30,6 +33,7 @@ digraph "g" { "rsc1:0_start_0 node2" -> "rsc1:0_monitor_120000 node2" [ style = bold] "rsc1:0_start_0 node2" -> "rsc2:1_start_0 node2" [ style = bold] "rsc1:0_start_0 node2" [ style=bold color="green" fontcolor="black"] +"rsc1:1_monitor_0 node1" -> "all_stopped" [ style = bold] "rsc1:1_monitor_0 node1" -> "cl-rsc1_start_0" [ style = bold] "rsc1:1_monitor_0 node1" [ style=bold color="green" fontcolor="black"] "rsc1:1_monitor_120000 node1" [ style=bold color="green" fontcolor="black"] @@ -37,7 +41,9 @@ digraph "g" { "rsc1:1_start_0 node1" -> "rsc1:1_monitor_120000 node1" [ style = bold] "rsc1:1_start_0 node1" -> "rsc2_start_0 node1" [ style = bold] "rsc1:1_start_0 node1" [ style=bold color="green" fontcolor="black"] +"rsc2:1_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc2:1_monitor_0 node2" -> "cl-rsc2_start_0" [ style = bold] +"rsc2:1_monitor_0 node2" -> "cl-rsc2_stopped_0" [ style = bold] "rsc2:1_monitor_0 node2" [ style=bold color="green" fontcolor="black"] "rsc2:1_monitor_200000 node2" [ style=bold color="green" fontcolor="black"] "rsc2:1_start_0 node2" -> "cl-rsc2_running_0" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/reload-becomes-restart.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/reload-becomes-restart.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/reload-becomes-restart.exp @@ -240,6 +240,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="8" operation="monitor" operation_key="rsc2:1_monitor_0" on_node="node2" on_node_uuid="2"/> + </trigger> + <trigger> <rsc_op id="19" operation="stop" operation_key="rsc2_stop_0" internal_operation_key="rsc2:0_stop_0" on_node="node1" on_node_uuid="1"/> </trigger> <trigger> @@ -299,6 +302,21 @@ </action_set> <inputs> <trigger> + <rsc_op id="4" operation="monitor" operation_key="Fencing_monitor_0" on_node="node1" on_node_uuid="1"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="rsc1:1_monitor_0" on_node="node1" on_node_uuid="1"/> + </trigger> + <trigger> + <rsc_op id="6" operation="monitor" operation_key="Fencing_monitor_0" on_node="node2" on_node_uuid="2"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="rsc1:0_monitor_0" on_node="node2" on_node_uuid="2"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="rsc2:1_monitor_0" on_node="node2" on_node_uuid="2"/> + </trigger> + <trigger> <rsc_op id="19" operation="stop" operation_key="rsc2_stop_0" internal_operation_key="rsc2:0_stop_0" on_node="node1" on_node_uuid="1"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-connection-unrecoverable.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/remote-connection-unrecoverable.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-connection-unrecoverable.dot @@ -11,7 +11,10 @@ digraph "g" { "remote1_stop_0 node1" [ style=bold color="green" fontcolor="orange"] "rsc1_delete_0 remote1" -> "rsc1_start_0 node2" [ style = dashed] "rsc1_delete_0 remote1" [ style=dashed color="red" fontcolor="black"] +"rsc1_monitor_0 node2" -> "all_stopped" [ style = bold] +"rsc1_monitor_0 node2" -> "remote1_stop_0 node1" [ style = bold] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = bold] +"rsc1_monitor_0 node2" -> "rsc2-master_demote_0" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black"] "rsc1_monitor_10000 node2" [ style=bold color="green" fontcolor="black"] "rsc1_start_0 node2" -> "rsc1_monitor_10000 node2" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-connection-unrecoverable.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/remote-connection-unrecoverable.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-connection-unrecoverable.exp @@ -10,6 +10,9 @@ <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0"/> </trigger> <trigger> + <rsc_op id="8" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="2"/> + </trigger> + <trigger> <crm_event id="28" operation="stonith" operation_key="stonith-node1-reboot" on_node="node1" on_node_uuid="1"/> </trigger> </inputs> @@ -163,6 +166,9 @@ <trigger> <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0"/> </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="2"/> + </trigger> </inputs> </synapse> <synapse id="12" priority="1000000"> @@ -244,6 +250,9 @@ <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0"/> </trigger> <trigger> + <rsc_op id="8" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="2"/> + </trigger> + <trigger> <pseudo_event id="9" operation="stop" operation_key="remote1_stop_0"/> </trigger> <trigger> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc_dep1.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rsc_dep1.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc_dep1.dot @@ -1,11 +1,13 @@ digraph "g" { "rsc1_monitor_0 node1" -> "rsc1_start_0 node2" [ style = bold] +"rsc1_monitor_0 node1" -> "rsc2_start_0 node1" [ style = bold] "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_monitor_0 node1" -> "rsc2_start_0 node1" [ style = bold] "rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc2_monitor_0 node2" -> "rsc1_start_0 node2" [ style = bold] "rsc2_monitor_0 node2" -> "rsc2_start_0 node1" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node1" [ style=bold color="green" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc_dep1.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rsc_dep1.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc_dep1.exp @@ -11,6 +11,9 @@ <rsc_op id="2" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1"/> </trigger> <trigger> + <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1"/> + </trigger> + <trigger> <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="node2"/> </trigger> </inputs> @@ -45,6 +48,9 @@ <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1"/> </trigger> <trigger> + <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> <rsc_op id="5" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc_dep5.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rsc_dep5.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc_dep5.dot @@ -1,13 +1,17 @@ digraph "g" { +"rsc1_monitor_0 node1" -> "rsc3_start_0 node1" [ style = bold] "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc1_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_monitor_0 node1" -> "rsc2_start_0 node2" [ style = bold] +"rsc2_monitor_0 node1" -> "rsc3_start_0 node1" [ style = bold] "rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_monitor_0 node1" -> "rsc3_start_0 node1" [ style = bold] "rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc3_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc3_monitor_0 node2" -> "rsc3_start_0 node1" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_start_0 node1" [ style=bold color="green" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc_dep5.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rsc_dep5.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rsc_dep5.exp @@ -11,6 +11,12 @@ <rsc_op id="2" operation="monitor" operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="node1"/> </trigger> <trigger> + <rsc_op id="3" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1"/> + </trigger> + <trigger> <rsc_op id="5" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2"/> </trigger> </inputs> @@ -45,8 +51,14 @@ <rsc_op id="3" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1"/> </trigger> <trigger> + <rsc_op id="5" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> <rsc_op id="6" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="node2"/> </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> </inputs> </synapse> <synapse id="4" priority="2"> 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 @@ -13,12 +13,17 @@ digraph "g" { "clvmd-clone_stopped_0" -> "clvmd-clone_start_0" [ style = bold] "clvmd-clone_stopped_0" -> "dlm-clone_stop_0" [ style = bold] "clvmd-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] +"clvmd:1_monitor_0 virt-2" -> "all_stopped" [ style = bold] "clvmd:1_monitor_0 virt-2" -> "clvmd-clone_start_0" [ style = bold] +"clvmd:1_monitor_0 virt-2" -> "clvmd-clone_stopped_0" [ style = bold] +"clvmd:1_monitor_0 virt-2" -> "clvmd_stop_0 virt-1" [ style = bold] "clvmd:1_monitor_0 virt-2" [ style=bold color="green" fontcolor="black"] "clvmd:1_start_0 virt-2" -> "clvmd-clone_running_0" [ style = bold] "clvmd:1_start_0 virt-2" -> "clvmd:2_start_0 virt-3" [ style = bold] "clvmd:1_start_0 virt-2" [ style=bold color="green" fontcolor="black"] +"clvmd:2_monitor_0 virt-3" -> "all_stopped" [ style = bold] "clvmd:2_monitor_0 virt-3" -> "clvmd-clone_start_0" [ style = bold] +"clvmd:2_monitor_0 virt-3" -> "clvmd-clone_stopped_0" [ style = bold] "clvmd:2_monitor_0 virt-3" -> "stonith 'on' virt-3" [ style = bold] "clvmd:2_monitor_0 virt-3" [ style=bold color="green" fontcolor="black"] "clvmd:2_start_0 virt-3" -> "clvmd-clone_running_0" [ style = bold] @@ -43,7 +48,9 @@ digraph "g" { "dlm-clone_stop_0" [ style=bold color="green" fontcolor="orange"] "dlm-clone_stopped_0" -> "dlm-clone_start_0" [ style = bold] "dlm-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] +"dlm:2_monitor_0 virt-3" -> "all_stopped" [ style = bold] "dlm:2_monitor_0 virt-3" -> "dlm-clone_start_0" [ style = bold] +"dlm:2_monitor_0 virt-3" -> "dlm-clone_stopped_0" [ style = bold] "dlm:2_monitor_0 virt-3" -> "stonith 'on' virt-3" [ style = bold] "dlm:2_monitor_0 virt-3" [ style=bold color="green" fontcolor="black"] "dlm:2_start_0 virt-3" -> "clvmd:2_start_0 virt-3" [ style = bold] @@ -59,6 +66,7 @@ digraph "g" { "dlm_stop_0 virt-1" [ style=bold color="green" fontcolor="black"] "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" -> "all_stopped" [ style = bold] "fencing_monitor_0 virt-3" -> "fencing_start_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"] 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 @@ -130,6 +130,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="10" operation="monitor" operation_key="dlm:2_monitor_0" on_node="virt-3" on_node_uuid="3"/> + </trigger> + <trigger> <rsc_op id="13" operation="stop" operation_key="dlm_stop_0" internal_operation_key="dlm:0_stop_0" on_node="virt-1" on_node_uuid="1"/> </trigger> <trigger> @@ -216,6 +219,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="8" operation="monitor" operation_key="clvmd:1_monitor_0" on_node="virt-2" on_node_uuid="2"/> + </trigger> + <trigger> <pseudo_event id="28" operation="stop" operation_key="clvmd-clone_stop_0"/> </trigger> </inputs> @@ -290,6 +296,12 @@ </action_set> <inputs> <trigger> + <rsc_op id="8" operation="monitor" operation_key="clvmd:1_monitor_0" on_node="virt-2" on_node_uuid="2"/> + </trigger> + <trigger> + <rsc_op id="11" operation="monitor" operation_key="clvmd:2_monitor_0" on_node="virt-3" on_node_uuid="3"/> + </trigger> + <trigger> <rsc_op id="22" operation="stop" operation_key="clvmd_stop_0" internal_operation_key="clvmd:0_stop_0" on_node="virt-1" on_node_uuid="1"/> </trigger> <trigger> @@ -411,6 +423,18 @@ <rsc_op id="6" operation="stop" operation_key="fencing_stop_0" on_node="virt-1" on_node_uuid="1"/> </trigger> <trigger> + <rsc_op id="8" operation="monitor" operation_key="clvmd:1_monitor_0" on_node="virt-2" on_node_uuid="2"/> + </trigger> + <trigger> + <rsc_op id="9" operation="monitor" operation_key="fencing_monitor_0" on_node="virt-3" on_node_uuid="3"/> + </trigger> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="dlm:2_monitor_0" on_node="virt-3" on_node_uuid="3"/> + </trigger> + <trigger> + <rsc_op id="11" operation="monitor" operation_key="clvmd:2_monitor_0" on_node="virt-3" on_node_uuid="3"/> + </trigger> + <trigger> <rsc_op id="13" operation="stop" operation_key="dlm_stop_0" internal_operation_key="dlm:0_stop_0" on_node="virt-1" on_node_uuid="1"/> </trigger> <trigger> 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 @@ -13,12 +13,17 @@ digraph "g" { "clvmd-clone_stopped_0" -> "clvmd-clone_start_0" [ style = bold] "clvmd-clone_stopped_0" -> "dlm-clone_stop_0" [ style = bold] "clvmd-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] +"clvmd:1_monitor_0 virt-2" -> "all_stopped" [ style = bold] "clvmd:1_monitor_0 virt-2" -> "clvmd-clone_start_0" [ style = bold] +"clvmd:1_monitor_0 virt-2" -> "clvmd-clone_stopped_0" [ style = bold] +"clvmd:1_monitor_0 virt-2" -> "clvmd_stop_0 virt-1" [ style = bold] "clvmd:1_monitor_0 virt-2" [ style=bold color="green" fontcolor="black"] "clvmd:1_start_0 virt-2" -> "clvmd-clone_running_0" [ style = bold] "clvmd:1_start_0 virt-2" -> "clvmd:2_start_0 virt-3" [ style = bold] "clvmd:1_start_0 virt-2" [ style=bold color="green" fontcolor="black"] +"clvmd:2_monitor_0 virt-3" -> "all_stopped" [ style = bold] "clvmd:2_monitor_0 virt-3" -> "clvmd-clone_start_0" [ style = bold] +"clvmd:2_monitor_0 virt-3" -> "clvmd-clone_stopped_0" [ style = bold] "clvmd:2_monitor_0 virt-3" -> "stonith 'on' virt-3" [ style = bold] "clvmd:2_monitor_0 virt-3" [ style=bold color="green" fontcolor="black"] "clvmd:2_start_0 virt-3" -> "clvmd-clone_running_0" [ style = bold] @@ -43,7 +48,9 @@ digraph "g" { "dlm-clone_stop_0" [ style=bold color="green" fontcolor="orange"] "dlm-clone_stopped_0" -> "dlm-clone_start_0" [ style = bold] "dlm-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] +"dlm:2_monitor_0 virt-3" -> "all_stopped" [ style = bold] "dlm:2_monitor_0 virt-3" -> "dlm-clone_start_0" [ style = bold] +"dlm:2_monitor_0 virt-3" -> "dlm-clone_stopped_0" [ style = bold] "dlm:2_monitor_0 virt-3" -> "stonith 'on' virt-3" [ style = bold] "dlm:2_monitor_0 virt-3" [ style=bold color="green" fontcolor="black"] "dlm:2_start_0 virt-3" -> "clvmd:2_start_0 virt-3" [ style = bold] @@ -57,6 +64,7 @@ digraph "g" { "dlm_stop_0 virt-1" -> "dlm_start_0 virt-1" [ style = bold] "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" -> "all_stopped" [ style = bold] "fencing_monitor_0 virt-3" -> "fencing_start_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"] 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 @@ -114,6 +114,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="9" operation="monitor" operation_key="dlm:2_monitor_0" on_node="virt-3" on_node_uuid="3"/> + </trigger> + <trigger> <rsc_op id="12" operation="stop" operation_key="dlm_stop_0" internal_operation_key="dlm:0_stop_0" on_node="virt-1" on_node_uuid="1"/> </trigger> <trigger> @@ -200,6 +203,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="7" operation="monitor" operation_key="clvmd:1_monitor_0" on_node="virt-2" on_node_uuid="2"/> + </trigger> + <trigger> <pseudo_event id="27" operation="stop" operation_key="clvmd-clone_stop_0"/> </trigger> </inputs> @@ -274,6 +280,12 @@ </action_set> <inputs> <trigger> + <rsc_op id="7" operation="monitor" operation_key="clvmd:1_monitor_0" on_node="virt-2" on_node_uuid="2"/> + </trigger> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="clvmd:2_monitor_0" on_node="virt-3" on_node_uuid="3"/> + </trigger> + <trigger> <rsc_op id="21" operation="stop" operation_key="clvmd_stop_0" internal_operation_key="clvmd:0_stop_0" on_node="virt-1" on_node_uuid="1"/> </trigger> <trigger> @@ -392,6 +404,18 @@ </action_set> <inputs> <trigger> + <rsc_op id="7" operation="monitor" operation_key="clvmd:1_monitor_0" on_node="virt-2" on_node_uuid="2"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="fencing_monitor_0" on_node="virt-3" on_node_uuid="3"/> + </trigger> + <trigger> + <rsc_op id="9" operation="monitor" operation_key="dlm:2_monitor_0" on_node="virt-3" on_node_uuid="3"/> + </trigger> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="clvmd:2_monitor_0" on_node="virt-3" on_node_uuid="3"/> + </trigger> + <trigger> <rsc_op id="11" operation="stop" operation_key="fencing_stop_0" on_node="virt-1" on_node_uuid="1"/> </trigger> <trigger> 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 @@ -25,6 +25,8 @@ "rhel7-node1_migrate_from_0 rhel7-node3" [ style=bold color="green" fontcolor="black"] "rhel7-node1_migrate_to_0 rhel7-node2" -> "rhel7-node1_migrate_from_0 rhel7-node3" [ style = bold] "rhel7-node1_migrate_to_0 rhel7-node2" [ style=bold color="green" fontcolor="black"] +"rhel7-node1_monitor_0 rhel7-node3" -> "all_stopped" [ style = bold] +"rhel7-node1_monitor_0 rhel7-node3" -> "remote-rsc_migrate_to_0 rhel7-node2" [ style = bold] "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" [ style=bold color="green" fontcolor="black"] 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 @@ -89,7 +89,11 @@ <attributes CRM_meta_migrate_source="rhel7-node2" CRM_meta_migrate_target="rhel7-node3" CRM_meta_on_node="rhel7-node2" CRM_meta_on_node_uuid="2" CRM_meta_record_pending="true" CRM_meta_remote_node="rhel7-node1" CRM_meta_timeout="20000" /> </rsc_op> </action_set> - <inputs/> + <inputs> + <trigger> + <rsc_op id="12" operation="monitor" operation_key="rhel7-node1_monitor_0" on_node="rhel7-node3" on_node_uuid="3"/> + </trigger> + </inputs> </synapse> <synapse id="8"> <action_set> @@ -228,6 +232,9 @@ </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="13" operation="stop" operation_key="shooter1_stop_0" on_node="rhel7-node3" on_node_uuid="3"/> </trigger> <trigger> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-migrate1.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-migrate1.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-migrate1.summary @@ -22,14 +22,14 @@ Transition Summary: Executing cluster transition: * Resource action: shooter1 stop on rhel7-node3 * Resource action: FAKE3 stop on rhel7-node3 - * Resource action: remote-rsc migrate_to on rhel7-node2 * Resource action: rhel7-node1 monitor on rhel7-node3 * Resource action: shooter1 start on rhel7-node2 * Resource action: FAKE3 start on rhel7-node2 - * Resource action: remote-rsc migrate_from on rhel7-node3 - * Resource action: rhel7-node1 migrate_to on rhel7-node2 + * Resource action: remote-rsc migrate_to on rhel7-node2 * Resource action: shooter1 monitor=60000 on rhel7-node2 * Resource action: FAKE3 monitor=10000 on rhel7-node2 + * Resource action: remote-rsc migrate_from on rhel7-node3 + * Resource action: rhel7-node1 migrate_to on rhel7-node2 * Resource action: rhel7-node1 migrate_from on rhel7-node3 * Resource action: rhel7-node1 stop on rhel7-node2 * Resource action: remote-rsc stop on rhel7-node2 Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-ms-ordering.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-ms-ordering.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-ms-ordering.dot @@ -2,20 +2,26 @@ "all_stopped" -> "lxc1_start_0 18node1" [ style = bold] "all_stopped" -> "lxc2_start_0 18node1" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange"] +"container1_monitor_0 18node1" -> "all_stopped" [ style = bold] "container1_monitor_0 18node1" -> "container1_start_0 18node1" [ style = bold] "container1_monitor_0 18node1" [ style=bold color="green" fontcolor="black"] +"container1_monitor_0 18node2" -> "all_stopped" [ style = bold] "container1_monitor_0 18node2" -> "container1_start_0 18node1" [ style = bold] "container1_monitor_0 18node2" [ style=bold color="green" fontcolor="black"] +"container1_monitor_0 18node3" -> "all_stopped" [ style = bold] "container1_monitor_0 18node3" -> "container1_start_0 18node1" [ style = bold] "container1_monitor_0 18node3" [ style=bold color="green" fontcolor="black"] "container1_start_0 18node1" -> "lxc-ms_promote_0 lxc1" [ style = bold] "container1_start_0 18node1" -> "lxc-ms_start_0 lxc1" [ style = bold] "container1_start_0 18node1" -> "lxc1_start_0 18node1" [ style = bold] "container1_start_0 18node1" [ style=bold color="green" fontcolor="black"] +"container2_monitor_0 18node1" -> "all_stopped" [ style = bold] "container2_monitor_0 18node1" -> "container2_start_0 18node1" [ style = bold] "container2_monitor_0 18node1" [ style=bold color="green" fontcolor="black"] +"container2_monitor_0 18node2" -> "all_stopped" [ style = bold] "container2_monitor_0 18node2" -> "container2_start_0 18node1" [ style = bold] "container2_monitor_0 18node2" [ style=bold color="green" fontcolor="black"] +"container2_monitor_0 18node3" -> "all_stopped" [ style = bold] "container2_monitor_0 18node3" -> "container2_start_0 18node1" [ style = bold] "container2_monitor_0 18node3" [ style=bold color="green" fontcolor="black"] "container2_start_0 18node1" -> "lxc-ms_start_0 lxc2" [ style = bold] @@ -48,11 +54,17 @@ "lxc-ms_demote_0 lxc1" -> "lxc-ms_promote_0 lxc1" [ style = bold] "lxc-ms_demote_0 lxc1" -> "lxc-ms_stop_0 lxc1" [ style = bold] "lxc-ms_demote_0 lxc1" [ style=bold color="green" fontcolor="orange"] +"lxc-ms_monitor_0 18node1" -> "all_stopped" [ style = bold] "lxc-ms_monitor_0 18node1" -> "lxc-ms-master_start_0" [ style = bold] +"lxc-ms_monitor_0 18node1" -> "lxc-ms-master_stopped_0" [ style = bold] "lxc-ms_monitor_0 18node1" [ style=bold color="green" fontcolor="black"] +"lxc-ms_monitor_0 18node2" -> "all_stopped" [ style = bold] "lxc-ms_monitor_0 18node2" -> "lxc-ms-master_start_0" [ style = bold] +"lxc-ms_monitor_0 18node2" -> "lxc-ms-master_stopped_0" [ style = bold] "lxc-ms_monitor_0 18node2" [ style=bold color="green" fontcolor="black"] +"lxc-ms_monitor_0 18node3" -> "all_stopped" [ style = bold] "lxc-ms_monitor_0 18node3" -> "lxc-ms-master_start_0" [ style = bold] +"lxc-ms_monitor_0 18node3" -> "lxc-ms-master_stopped_0" [ style = bold] "lxc-ms_monitor_0 18node3" [ style=bold color="green" fontcolor="black"] "lxc-ms_monitor_10000 lxc2" [ style=bold color="green" fontcolor="black"] "lxc-ms_promote_0 lxc1" -> "lxc-ms-master_promoted_0" [ style = bold] @@ -71,10 +83,13 @@ "lxc-ms_stop_0 lxc2" -> "lxc-ms-master_stopped_0" [ style = bold] "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 18node1" -> "all_stopped" [ style = bold] "lxc1_monitor_0 18node1" -> "lxc1_start_0 18node1" [ style = bold] "lxc1_monitor_0 18node1" [ style=bold color="green" fontcolor="black"] +"lxc1_monitor_0 18node2" -> "all_stopped" [ style = bold] "lxc1_monitor_0 18node2" -> "lxc1_start_0 18node1" [ style = bold] "lxc1_monitor_0 18node2" [ style=bold color="green" fontcolor="black"] +"lxc1_monitor_0 18node3" -> "all_stopped" [ style = bold] "lxc1_monitor_0 18node3" -> "lxc1_start_0 18node1" [ style = bold] "lxc1_monitor_0 18node3" [ style=bold color="green" fontcolor="black"] "lxc1_monitor_30000 18node1" [ style=bold color="green" fontcolor="black"] @@ -82,10 +97,13 @@ "lxc1_start_0 18node1" -> "lxc-ms_start_0 lxc1" [ style = bold] "lxc1_start_0 18node1" -> "lxc1_monitor_30000 18node1" [ style = bold] "lxc1_start_0 18node1" [ style=bold color="green" fontcolor="black"] +"lxc2_monitor_0 18node1" -> "all_stopped" [ style = bold] "lxc2_monitor_0 18node1" -> "lxc2_start_0 18node1" [ style = bold] "lxc2_monitor_0 18node1" [ style=bold color="green" fontcolor="black"] +"lxc2_monitor_0 18node2" -> "all_stopped" [ style = bold] "lxc2_monitor_0 18node2" -> "lxc2_start_0 18node1" [ style = bold] "lxc2_monitor_0 18node2" [ style=bold color="green" fontcolor="black"] +"lxc2_monitor_0 18node3" -> "all_stopped" [ style = bold] "lxc2_monitor_0 18node3" -> "lxc2_start_0 18node1" [ style = bold] "lxc2_monitor_0 18node3" [ style=bold color="green" fontcolor="black"] "lxc2_monitor_30000 18node1" [ style=bold color="green" fontcolor="black"] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-ms-ordering.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-ms-ordering.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-ms-ordering.exp @@ -327,6 +327,15 @@ </action_set> <inputs> <trigger> + <rsc_op id="5" operation="monitor" operation_key="lxc-ms_monitor_0" internal_operation_key="lxc-ms:0_monitor_0" on_node="18node1" on_node_uuid="1"/> + </trigger> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="lxc-ms_monitor_0" internal_operation_key="lxc-ms:0_monitor_0" on_node="18node2" on_node_uuid="2"/> + </trigger> + <trigger> + <rsc_op id="15" operation="monitor" operation_key="lxc-ms_monitor_0" internal_operation_key="lxc-ms:0_monitor_0" on_node="18node3" on_node_uuid="3"/> + </trigger> + <trigger> <pseudo_event id="23" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:0_stop_0"/> </trigger> <trigger> @@ -572,6 +581,51 @@ </action_set> <inputs> <trigger> + <rsc_op id="3" operation="monitor" operation_key="container1_monitor_0" on_node="18node1" on_node_uuid="1"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="container2_monitor_0" on_node="18node1" on_node_uuid="1"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="lxc-ms_monitor_0" internal_operation_key="lxc-ms:0_monitor_0" on_node="18node1" on_node_uuid="1"/> + </trigger> + <trigger> + <rsc_op id="6" operation="monitor" operation_key="lxc1_monitor_0" on_node="18node1" on_node_uuid="1"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="lxc2_monitor_0" on_node="18node1" on_node_uuid="1"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="container1_monitor_0" on_node="18node2" on_node_uuid="2"/> + </trigger> + <trigger> + <rsc_op id="9" operation="monitor" operation_key="container2_monitor_0" on_node="18node2" on_node_uuid="2"/> + </trigger> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="lxc-ms_monitor_0" internal_operation_key="lxc-ms:0_monitor_0" on_node="18node2" on_node_uuid="2"/> + </trigger> + <trigger> + <rsc_op id="11" operation="monitor" operation_key="lxc1_monitor_0" on_node="18node2" on_node_uuid="2"/> + </trigger> + <trigger> + <rsc_op id="12" operation="monitor" operation_key="lxc2_monitor_0" on_node="18node2" on_node_uuid="2"/> + </trigger> + <trigger> + <rsc_op id="13" operation="monitor" operation_key="container1_monitor_0" on_node="18node3" on_node_uuid="3"/> + </trigger> + <trigger> + <rsc_op id="14" operation="monitor" operation_key="container2_monitor_0" on_node="18node3" on_node_uuid="3"/> + </trigger> + <trigger> + <rsc_op id="15" operation="monitor" operation_key="lxc-ms_monitor_0" internal_operation_key="lxc-ms:0_monitor_0" on_node="18node3" on_node_uuid="3"/> + </trigger> + <trigger> + <rsc_op id="16" operation="monitor" operation_key="lxc1_monitor_0" on_node="18node3" on_node_uuid="3"/> + </trigger> + <trigger> + <rsc_op id="17" operation="monitor" operation_key="lxc2_monitor_0" on_node="18node3" on_node_uuid="3"/> + </trigger> + <trigger> <pseudo_event id="23" operation="stop" operation_key="lxc-ms_stop_0" internal_operation_key="lxc-ms:0_stop_0"/> </trigger> <trigger> 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,5 +1,6 @@ digraph "g" { "DcIPaddr_monitor_0 hadev1" -> "DcIPaddr_start_0 hadev1" [ style = bold] +"DcIPaddr_monitor_0 hadev1" -> "all_stopped" [ 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] @@ -14,16 +15,21 @@ digraph "g" { "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"child_DoFencing:0_monitor_0 hadev1" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:0_monitor_0 hadev1" -> "all_stopped" [ style = bold] "child_DoFencing:0_monitor_0 hadev1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_stop_0 hadev2" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:0_stop_0 hadev2" -> "all_stopped" [ style = bold] "child_DoFencing:0_stop_0 hadev2" -> "do_shutdown hadev2" [ style = bold] "child_DoFencing:0_stop_0 hadev2" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:2_monitor_0 hadev2" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:2_monitor_0 hadev2" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 hadev2" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_stop_0 hadev1" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:2_stop_0 hadev1" -> "all_stopped" [ style = bold] "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" -> "all_stopped" [ style = bold] "rsc_hadev2_monitor_0 hadev1" -> "rsc_hadev2_start_0 hadev1" [ style = bold] "rsc_hadev2_monitor_0 hadev1" [ style=bold color="green" fontcolor="black" ] "rsc_hadev2_monitor_5000 hadev1" [ style=bold color="green" fontcolor="black" ] @@ -33,6 +39,7 @@ digraph "g" { "rsc_hadev2_stop_0 hadev2" -> "do_shutdown hadev2" [ style = bold] "rsc_hadev2_stop_0 hadev2" -> "rsc_hadev2_start_0 hadev1" [ style = bold] "rsc_hadev2_stop_0 hadev2" [ style=bold color="green" fontcolor="black" ] +"rsc_hadev3_monitor_0 hadev2" -> "all_stopped" [ style = bold] "rsc_hadev3_monitor_0 hadev2" [ style=bold color="green" fontcolor="black" ] "stonith 'reboot' hadev3" -> "stonith_complete" [ style = bold] "stonith 'reboot' hadev3" [ style=bold color="green" fontcolor="black"] 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 @@ -1,30 +1,54 @@ digraph "g" { +"DcIPaddr_monitor_0 c001n02" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"DcIPaddr_monitor_0 c001n03" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"DcIPaddr_monitor_0 c001n04" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 c001n04" [ style=bold color="green" fontcolor="black" ] "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n02" [ style = bold] "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"child_DoFencing:0_monitor_0 c001n04" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:0_monitor_0 c001n04" -> "all_stopped" [ style = bold] "child_DoFencing:0_monitor_0 c001n04" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:0_monitor_0 c001n09" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:0_monitor_0 c001n09" -> "all_stopped" [ style = bold] "child_DoFencing:0_monitor_0 c001n09" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:0_stop_0 c001n02" -> "all_stopped" [ style = bold] "child_DoFencing:0_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "child_DoFencing:0_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:1_monitor_0 c001n02" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:1_monitor_0 c001n02" -> "all_stopped" [ style = bold] "child_DoFencing:1_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:1_monitor_0 c001n04" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:1_monitor_0 c001n04" -> "all_stopped" [ style = bold] "child_DoFencing:1_monitor_0 c001n04" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:2_monitor_0 c001n03" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:2_monitor_0 c001n03" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:2_monitor_0 c001n09" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:2_monitor_0 c001n09" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 c001n09" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:3_monitor_0 c001n02" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:3_monitor_0 c001n02" -> "all_stopped" [ style = bold] "child_DoFencing:3_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:3_monitor_0 c001n03" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:3_monitor_0 c001n03" -> "all_stopped" [ style = bold] "child_DoFencing:3_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:3_monitor_0 c001n04" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:3_monitor_0 c001n04" -> "all_stopped" [ style = bold] "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" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n03" -> "rsc_c001n02_start_0 c001n03" [ style = bold] "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_monitor_0 c001n04" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n04" -> "rsc_c001n02_start_0 c001n03" [ style = bold] "rsc_c001n02_monitor_0 c001n04" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_monitor_0 c001n09" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n09" -> "rsc_c001n02_start_0 c001n03" [ style = bold] "rsc_c001n02_monitor_0 c001n09" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ] @@ -34,12 +58,20 @@ "rsc_c001n02_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n03" [ style = bold] "rsc_c001n02_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n03_monitor_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n03_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n03_monitor_0 c001n04" -> "all_stopped" [ style = bold] "rsc_c001n03_monitor_0 c001n04" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n03_monitor_0 c001n09" -> "all_stopped" [ style = bold] "rsc_c001n03_monitor_0 c001n09" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n04_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n04_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n04_monitor_0 c001n09" -> "all_stopped" [ style = bold] "rsc_c001n04_monitor_0 c001n09" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n09_monitor_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n09_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n09_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n09_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n09_monitor_0 c001n04" -> "all_stopped" [ style = bold] "rsc_c001n09_monitor_0 c001n04" [ style=bold color="green" fontcolor="black" ] } 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 @@ -271,6 +271,33 @@ </action_set> <inputs> <trigger> + <rsc_op id="14" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="15" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="20" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="21" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="26" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/> + </trigger> + <trigger> + <rsc_op id="27" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/> + </trigger> + <trigger> + <rsc_op id="28" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/> + </trigger> + <trigger> + <rsc_op id="32" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/> + </trigger> + <trigger> + <rsc_op id="33" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/> + </trigger> + <trigger> <rsc_op id="45" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> </trigger> <trigger> @@ -312,6 +339,75 @@ </action_set> <inputs> <trigger> + <rsc_op id="11" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="12" operation="monitor" operation_key="rsc_c001n09_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="13" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="14" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="15" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="16" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="17" operation="monitor" operation_key="rsc_c001n09_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </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="19" operation="monitor" operation_key="rsc_c001n04_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="20" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="21" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="22" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/> + </trigger> + <trigger> + <rsc_op id="23" operation="monitor" operation_key="rsc_c001n09_monitor_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/> + </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="25" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/> + </trigger> + <trigger> + <rsc_op id="26" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/> + </trigger> + <trigger> + <rsc_op id="27" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/> + </trigger> + <trigger> + <rsc_op id="28" operation="monitor" operation_key="child_DoFencing:3_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> + <trigger> + <rsc_op id="30" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/> + </trigger> + <trigger> + <rsc_op id="31" operation="monitor" operation_key="rsc_c001n04_monitor_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/> + </trigger> + <trigger> + <rsc_op id="32" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/> + </trigger> + <trigger> + <rsc_op id="33" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/> + </trigger> + <trigger> <rsc_op id="38" operation="stop" operation_key="rsc_c001n02_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> </trigger> <trigger> 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 @@ -1,7 +1,9 @@ digraph "g" { "DcIPaddr_monitor_0 hadev1" -> "DcIPaddr_start_0 hadev2" [ style = bold] +"DcIPaddr_monitor_0 hadev1" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 hadev1" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_0 hadev3" -> "DcIPaddr_start_0 hadev2" [ style = bold] +"DcIPaddr_monitor_0 hadev3" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 hadev3" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_5000 hadev2" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_start_0 hadev2" -> "DcIPaddr_monitor_5000 hadev2" [ style = bold] @@ -12,27 +14,36 @@ "DoFencing_start_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:0_monitor_0 hadev1" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:0_monitor_0 hadev1" -> "all_stopped" [ style = bold] "child_DoFencing:0_monitor_0 hadev1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_monitor_0 hadev3" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:0_monitor_0 hadev3" -> "all_stopped" [ style = bold] "child_DoFencing:0_monitor_0 hadev3" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_monitor_5000 hadev2" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_monitor_0 hadev1" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:1_monitor_0 hadev1" -> "all_stopped" [ style = bold] "child_DoFencing:1_monitor_0 hadev1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_monitor_0 hadev2" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:1_monitor_0 hadev2" -> "all_stopped" [ style = bold] "child_DoFencing:1_monitor_0 hadev2" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_monitor_5000 hadev3" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 hadev1" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:2_monitor_0 hadev1" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 hadev1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 hadev2" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:2_monitor_0 hadev2" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 hadev2" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 hadev3" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:2_monitor_0 hadev3" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 hadev3" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_5000 hadev1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_start_0 hadev1" -> "DoFencing_running_0" [ style = bold] "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" -> "all_stopped" [ style = bold] "rsc_hadev1_monitor_0 hadev1" -> "rsc_hadev1_start_0 hadev1" [ style = bold] "rsc_hadev1_monitor_0 hadev1" [ style=bold color="green" fontcolor="black" ] +"rsc_hadev1_monitor_0 hadev2" -> "all_stopped" [ style = bold] "rsc_hadev1_monitor_0 hadev2" -> "rsc_hadev1_start_0 hadev1" [ style = bold] "rsc_hadev1_monitor_0 hadev2" [ style=bold color="green" fontcolor="black" ] "rsc_hadev1_monitor_5000 hadev1" [ style=bold color="green" fontcolor="black" ] @@ -41,14 +52,18 @@ "rsc_hadev1_stop_0 hadev3" -> "all_stopped" [ style = bold] "rsc_hadev1_stop_0 hadev3" -> "rsc_hadev1_start_0 hadev1" [ style = bold] "rsc_hadev1_stop_0 hadev3" [ style=bold color="green" fontcolor="black" ] +"rsc_hadev2_monitor_0 hadev1" -> "all_stopped" [ style = bold] "rsc_hadev2_monitor_0 hadev1" -> "rsc_hadev2_start_0 hadev2" [ style = bold] "rsc_hadev2_monitor_0 hadev1" [ style=bold color="green" fontcolor="black" ] +"rsc_hadev2_monitor_0 hadev3" -> "all_stopped" [ style = bold] "rsc_hadev2_monitor_0 hadev3" -> "rsc_hadev2_start_0 hadev2" [ style = bold] "rsc_hadev2_monitor_0 hadev3" [ style=bold color="green" fontcolor="black" ] "rsc_hadev2_monitor_5000 hadev2" [ style=bold color="green" fontcolor="black" ] "rsc_hadev2_start_0 hadev2" -> "rsc_hadev2_monitor_5000 hadev2" [ style = bold] "rsc_hadev2_start_0 hadev2" [ style=bold color="green" fontcolor="black" ] +"rsc_hadev3_monitor_0 hadev1" -> "all_stopped" [ style = bold] "rsc_hadev3_monitor_0 hadev1" [ style=bold color="green" fontcolor="black" ] +"rsc_hadev3_monitor_0 hadev2" -> "all_stopped" [ style = bold] "rsc_hadev3_monitor_0 hadev2" [ style=bold color="green" fontcolor="black" ] "rsc_hadev3_monitor_5000 hadev3" [ style=bold color="green" fontcolor="black" ] } 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 @@ -339,6 +339,51 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/> + </trigger> + <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="4" operation="monitor" operation_key="rsc_hadev2_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="rsc_hadev3_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/> + </trigger> + <trigger> + <rsc_op id="6" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="child_DoFencing:2_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> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="rsc_hadev3_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/> + </trigger> + <trigger> + <rsc_op id="11" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/> + </trigger> + <trigger> + <rsc_op id="12" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/> + </trigger> + <trigger> + <rsc_op id="13" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669"/> + </trigger> + <trigger> + <rsc_op id="14" operation="monitor" operation_key="rsc_hadev2_monitor_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669"/> + </trigger> + <trigger> + <rsc_op id="15" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669"/> + </trigger> + <trigger> + <rsc_op id="16" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669"/> + </trigger> + <trigger> <rsc_op id="20" operation="stop" operation_key="rsc_hadev1_stop_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669"/> </trigger> </inputs> 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 @@ -1,6 +1,9 @@ digraph "g" { +"DcIPaddr_monitor_0 ibm1" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] +"DcIPaddr_monitor_0 sgi2" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 sgi2" [ style=bold color="green" fontcolor="black" ] +"DcIPaddr_monitor_0 test02" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 test02" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_5000 test03" [ style=bold color="green" fontcolor="black" ] "DoFencing_running_0" [ style=bold color="green" fontcolor="orange" ] @@ -12,51 +15,67 @@ "DoFencing_start_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:0_monitor_0 ibm1" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:0_monitor_0 ibm1" -> "all_stopped" [ style = bold] "child_DoFencing:0_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_monitor_0 sgi2" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:0_monitor_0 sgi2" -> "all_stopped" [ style = bold] "child_DoFencing:0_monitor_0 sgi2" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_monitor_5000 test02" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_start_0 test02" -> "DoFencing_running_0" [ style = bold] "child_DoFencing:0_start_0 test02" -> "child_DoFencing:0_monitor_5000 test02" [ style = bold] "child_DoFencing:0_start_0 test02" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_monitor_0 ibm1" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:1_monitor_0 ibm1" -> "all_stopped" [ style = bold] "child_DoFencing:1_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_monitor_0 sgi2" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:1_monitor_0 sgi2" -> "all_stopped" [ style = bold] "child_DoFencing:1_monitor_0 sgi2" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_monitor_0 test02" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:1_monitor_0 test02" -> "all_stopped" [ style = bold] "child_DoFencing:1_monitor_0 test02" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_monitor_5000 test03" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_start_0 test03" -> "DoFencing_running_0" [ style = bold] "child_DoFencing:1_start_0 test03" -> "child_DoFencing:1_monitor_5000 test03" [ style = bold] "child_DoFencing:1_start_0 test03" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 ibm1" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:2_monitor_0 ibm1" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 sgi2" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:2_monitor_0 sgi2" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 sgi2" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 test02" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:2_monitor_0 test02" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 test02" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 test03" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:2_monitor_0 test03" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 test03" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_5000 ibm1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_start_0 ibm1" -> "DoFencing_running_0" [ style = bold] "child_DoFencing:2_start_0 ibm1" -> "child_DoFencing:2_monitor_5000 ibm1" [ style = bold] "child_DoFencing:2_start_0 ibm1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 ibm1" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:3_monitor_0 ibm1" -> "all_stopped" [ style = bold] "child_DoFencing:3_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 sgi2" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:3_monitor_0 sgi2" -> "all_stopped" [ style = bold] "child_DoFencing:3_monitor_0 sgi2" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 test02" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:3_monitor_0 test02" -> "all_stopped" [ style = bold] "child_DoFencing:3_monitor_0 test02" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 test03" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:3_monitor_0 test03" -> "all_stopped" [ style = bold] "child_DoFencing:3_monitor_0 test03" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_5000 sgi2" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_start_0 sgi2" -> "DoFencing_running_0" [ style = bold] "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" -> "all_stopped" [ style = bold] "rsc_ibm1_monitor_0 ibm1" -> "rsc_ibm1_start_0 ibm1" [ style = bold] "rsc_ibm1_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] +"rsc_ibm1_monitor_0 sgi2" -> "all_stopped" [ style = bold] "rsc_ibm1_monitor_0 sgi2" -> "rsc_ibm1_start_0 ibm1" [ style = bold] "rsc_ibm1_monitor_0 sgi2" [ style=bold color="green" fontcolor="black" ] +"rsc_ibm1_monitor_0 test02" -> "all_stopped" [ style = bold] "rsc_ibm1_monitor_0 test02" -> "rsc_ibm1_start_0 ibm1" [ style = bold] "rsc_ibm1_monitor_0 test02" [ style=bold color="green" fontcolor="black" ] "rsc_ibm1_monitor_5000 ibm1" [ style=bold color="green" fontcolor="black" ] @@ -65,30 +84,41 @@ "rsc_ibm1_stop_0 test03" -> "all_stopped" [ style = bold] "rsc_ibm1_stop_0 test03" -> "rsc_ibm1_start_0 ibm1" [ style = bold] "rsc_ibm1_stop_0 test03" [ style=bold color="green" fontcolor="black" ] +"rsc_sgi2_monitor_0 ibm1" -> "all_stopped" [ style = bold] "rsc_sgi2_monitor_0 ibm1" -> "rsc_sgi2_start_0 sgi2" [ style = bold] "rsc_sgi2_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] +"rsc_sgi2_monitor_0 sgi2" -> "all_stopped" [ style = bold] "rsc_sgi2_monitor_0 sgi2" -> "rsc_sgi2_start_0 sgi2" [ style = bold] "rsc_sgi2_monitor_0 sgi2" [ style=bold color="green" fontcolor="black" ] +"rsc_sgi2_monitor_0 test02" -> "all_stopped" [ style = bold] "rsc_sgi2_monitor_0 test02" -> "rsc_sgi2_start_0 sgi2" [ style = bold] "rsc_sgi2_monitor_0 test02" [ style=bold color="green" fontcolor="black" ] +"rsc_sgi2_monitor_0 test03" -> "all_stopped" [ style = bold] "rsc_sgi2_monitor_0 test03" -> "rsc_sgi2_start_0 sgi2" [ style = bold] "rsc_sgi2_monitor_0 test03" [ style=bold color="green" fontcolor="black" ] "rsc_sgi2_monitor_5000 sgi2" [ style=bold color="green" fontcolor="black" ] "rsc_sgi2_start_0 sgi2" -> "rsc_sgi2_monitor_5000 sgi2" [ style = bold] "rsc_sgi2_start_0 sgi2" [ style=bold color="green" fontcolor="black" ] +"rsc_test02_monitor_0 ibm1" -> "all_stopped" [ style = bold] "rsc_test02_monitor_0 ibm1" -> "rsc_test02_start_0 test02" [ style = bold] "rsc_test02_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] +"rsc_test02_monitor_0 sgi2" -> "all_stopped" [ style = bold] "rsc_test02_monitor_0 sgi2" -> "rsc_test02_start_0 test02" [ style = bold] "rsc_test02_monitor_0 sgi2" [ style=bold color="green" fontcolor="black" ] +"rsc_test02_monitor_0 test02" -> "all_stopped" [ style = bold] "rsc_test02_monitor_0 test02" -> "rsc_test02_start_0 test02" [ style = bold] "rsc_test02_monitor_0 test02" [ style=bold color="green" fontcolor="black" ] +"rsc_test02_monitor_0 test03" -> "all_stopped" [ style = bold] "rsc_test02_monitor_0 test03" -> "rsc_test02_start_0 test02" [ style = bold] "rsc_test02_monitor_0 test03" [ style=bold color="green" fontcolor="black" ] "rsc_test02_monitor_5000 test02" [ style=bold color="green" fontcolor="black" ] "rsc_test02_start_0 test02" -> "rsc_test02_monitor_5000 test02" [ style = bold] "rsc_test02_start_0 test02" [ style=bold color="green" fontcolor="black" ] +"rsc_test03_monitor_0 ibm1" -> "all_stopped" [ style = bold] "rsc_test03_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] +"rsc_test03_monitor_0 sgi2" -> "all_stopped" [ style = bold] "rsc_test03_monitor_0 sgi2" [ style=bold color="green" fontcolor="black" ] +"rsc_test03_monitor_0 test02" -> "all_stopped" [ style = bold] "rsc_test03_monitor_0 test02" [ style=bold color="green" fontcolor="black" ] "rsc_test03_monitor_5000 test03" [ style=bold color="green" fontcolor="black" ] } 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 @@ -585,6 +585,96 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="rsc_sgi2_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/> + </trigger> + <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="5" operation="monitor" operation_key="rsc_test02_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/> + </trigger> + <trigger> + <rsc_op id="6" operation="monitor" operation_key="rsc_test03_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/> + </trigger> + <trigger> + <rsc_op id="9" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/> + </trigger> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/> + </trigger> + <trigger> + <rsc_op id="11" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8"/> + </trigger> + <trigger> + <rsc_op id="12" operation="monitor" operation_key="rsc_sgi2_monitor_0" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8"/> + </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="14" operation="monitor" operation_key="rsc_test02_monitor_0" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8"/> + </trigger> + <trigger> + <rsc_op id="15" operation="monitor" operation_key="rsc_test03_monitor_0" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8"/> + </trigger> + <trigger> + <rsc_op id="16" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8"/> + </trigger> + <trigger> + <rsc_op id="17" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8"/> + </trigger> + <trigger> + <rsc_op id="18" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8"/> + </trigger> + <trigger> + <rsc_op id="19" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="sgi2" on_node_uuid="619e8a37-147a-4782-ac11-46afad7c32b8"/> + </trigger> + <trigger> + <rsc_op id="20" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="test02" on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947"/> + </trigger> + <trigger> + <rsc_op id="21" operation="monitor" operation_key="rsc_sgi2_monitor_0" on_node="test02" on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947"/> + </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> + <trigger> + <rsc_op id="23" operation="monitor" operation_key="rsc_test02_monitor_0" on_node="test02" on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947"/> + </trigger> + <trigger> + <rsc_op id="24" operation="monitor" operation_key="rsc_test03_monitor_0" on_node="test02" on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947"/> + </trigger> + <trigger> + <rsc_op id="25" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="test02" on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947"/> + </trigger> + <trigger> + <rsc_op id="26" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="test02" on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947"/> + </trigger> + <trigger> + <rsc_op id="27" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="test02" on_node_uuid="f75e684a-be1e-4036-89e5-a14f8dcdc947"/> + </trigger> + <trigger> + <rsc_op id="28" operation="monitor" operation_key="rsc_sgi2_monitor_0" on_node="test03" on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a"/> + </trigger> + <trigger> + <rsc_op id="29" operation="monitor" operation_key="rsc_test02_monitor_0" on_node="test03" on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a"/> + </trigger> + <trigger> + <rsc_op id="30" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="test03" on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a"/> + </trigger> + <trigger> + <rsc_op id="31" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="test03" on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a"/> + </trigger> + <trigger> <rsc_op id="37" operation="stop" operation_key="rsc_ibm1_stop_0" on_node="test03" on_node_uuid="f9c593eb-ca0d-4ab3-ba88-fde12c02334a"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/735.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/735.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/735.dot @@ -1,4 +1,5 @@ digraph "g" { +"DcIPaddr_monitor_0 hadev3" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 hadev3" [ style=bold color="green" fontcolor="black" ] "DoFencing_running_0" [ style=bold color="green" fontcolor="orange" ] "DoFencing_start_0" -> "DoFencing_running_0" [ style = bold] @@ -7,6 +8,7 @@ "DoFencing_start_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:0_monitor_0 hadev3" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:0_monitor_0 hadev3" -> "all_stopped" [ style = bold] "child_DoFencing:0_monitor_0 hadev3" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_monitor_5000 hadev2" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_start_0 hadev2" -> "DoFencing_running_0" [ style = bold] @@ -17,6 +19,7 @@ "child_DoFencing:1_start_0 hadev3" -> "child_DoFencing:1_monitor_5000 hadev3" [ style = bold] "child_DoFencing:1_start_0 hadev3" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 hadev3" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:2_monitor_0 hadev3" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 hadev3" [ style=bold color="green" fontcolor="black" ] "rsc_hadev1_monitor_5000 hadev3" [ style=bold color="green" fontcolor="black" ] "rsc_hadev1_start_0 hadev3" -> "rsc_hadev1_monitor_5000 hadev3" [ style = bold] @@ -24,6 +27,7 @@ "rsc_hadev1_stop_0 hadev2" -> "all_stopped" [ style = bold] "rsc_hadev1_stop_0 hadev2" -> "rsc_hadev1_start_0 hadev3" [ style = bold] "rsc_hadev1_stop_0 hadev2" [ style=bold color="green" fontcolor="black" ] +"rsc_hadev2_monitor_0 hadev3" -> "all_stopped" [ style = bold] "rsc_hadev2_monitor_0 hadev3" [ style=bold color="green" fontcolor="black" ] "rsc_hadev3_monitor_5000 hadev3" [ style=bold color="green" fontcolor="black" ] "rsc_hadev3_start_0 hadev3" -> "rsc_hadev3_monitor_5000 hadev3" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/735.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/735.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/735.exp @@ -185,6 +185,18 @@ </action_set> <inputs> <trigger> + <rsc_op id="4" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="rsc_hadev2_monitor_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669"/> + </trigger> + <trigger> + <rsc_op id="6" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="hadev3" on_node_uuid="879e65f8-4b38-4c56-9552-4752ad436669"/> + </trigger> + <trigger> <rsc_op id="11" operation="stop" operation_key="rsc_hadev1_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/> </trigger> </inputs> 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,5 +1,6 @@ digraph "g" { "DcIPaddr_monitor_0 posic041" -> "DcIPaddr_start_0 posic043" [ style = dashed] +"DcIPaddr_monitor_0 posic041" -> "all_stopped" [ 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] @@ -9,10 +10,14 @@ "DcIPaddr_stop_0 posic043" [ style=bold color="green" fontcolor="black" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:0_monitor_5000 posic043" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:1_monitor_0 posic043" -> "all_stopped" [ style = bold] "child_DoFencing:1_monitor_0 posic043" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_monitor_5000 posic041" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:2_monitor_0 posic041" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 posic041" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:3_monitor_0 posic041" -> "all_stopped" [ style = bold] "child_DoFencing:3_monitor_0 posic041" [ style=bold color="green" fontcolor="black" ] +"rsc_posic041_monitor_0 posic043" -> "all_stopped" [ style = bold] "rsc_posic041_monitor_0 posic043" -> "rsc_posic041_start_0 posic041" [ style = dashed] "rsc_posic041_monitor_0 posic043" [ style=bold color="green" fontcolor="black" ] "rsc_posic041_monitor_5000 posic041" [ style=dashed color="red" fontcolor="black"] @@ -21,6 +26,7 @@ "rsc_posic041_stop_0 posic041" -> "all_stopped" [ style = bold] "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" -> "all_stopped" [ style = bold] "rsc_posic042_monitor_0 posic043" -> "rsc_posic042_start_0 posic041" [ style = dashed] "rsc_posic042_monitor_0 posic043" [ style=bold color="green" fontcolor="black" ] "rsc_posic042_monitor_5000 posic041" [ style=dashed color="red" fontcolor="black"] @@ -29,6 +35,7 @@ "rsc_posic042_stop_0 posic041" -> "all_stopped" [ style = bold] "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" -> "all_stopped" [ style = bold] "rsc_posic043_monitor_0 posic041" -> "rsc_posic043_start_0 posic043" [ style = dashed] "rsc_posic043_monitor_0 posic041" [ style=bold color="green" fontcolor="black" ] "rsc_posic043_monitor_5000 posic043" [ style=dashed color="red" fontcolor="black"] @@ -37,6 +44,7 @@ "rsc_posic043_stop_0 posic043" -> "all_stopped" [ style = bold] "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" -> "all_stopped" [ style = bold] "rsc_posic044_monitor_0 posic043" -> "rsc_posic044_start_0 posic041" [ style = dashed] "rsc_posic044_monitor_0 posic043" [ style=bold color="green" fontcolor="black" ] "rsc_posic044_monitor_5000 posic041" [ style=dashed color="red" fontcolor="black"] 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 @@ -142,6 +142,30 @@ </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> + <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> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="posic041" on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="posic041" on_node_uuid="c5d5ed56-7340-4d81-afd6-40b5ee6803ad"/> + </trigger> + <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> + <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> + <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> + <trigger> + <rsc_op id="12" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="posic043" on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596"/> + </trigger> + <trigger> <rsc_op id="13" operation="stop" operation_key="DcIPaddr_stop_0" on_node="posic043" on_node_uuid="3daa25e7-8713-4c6f-8790-7f41599a1596"/> </trigger> <trigger> 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 @@ -1,26 +1,45 @@ digraph "g" { +"DcIPaddr_monitor_0 c001n01" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"DcIPaddr_monitor_0 c001n03" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n02" [ style = bold] "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"child_DoFencing:0_monitor_0 c001n01" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:0_monitor_0 c001n01" -> "all_stopped" [ style = bold] "child_DoFencing:0_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:0_stop_0 c001n02" -> "all_stopped" [ style = bold] "child_DoFencing:0_stop_0 c001n02" [ style=bold color="green" fontcolor="orange" ] +"child_DoFencing:1_monitor_0 c001n01" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:1_monitor_0 c001n01" -> "all_stopped" [ style = bold] "child_DoFencing:1_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:2_monitor_0 c001n03" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:2_monitor_0 c001n03" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:2_monitor_0 c001n08" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:2_monitor_0 c001n08" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:3_monitor_0 c001n01" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:3_monitor_0 c001n01" -> "all_stopped" [ style = bold] "child_DoFencing:3_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:3_monitor_0 c001n03" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:3_monitor_0 c001n03" -> "all_stopped" [ style = bold] "child_DoFencing:3_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n01_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n01_monitor_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n01_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_monitor_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n01" -> "rsc_c001n02_start_0 c001n01" [ style = bold] "rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n03" -> "rsc_c001n02_start_0 c001n01" [ style = bold] "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_monitor_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n08" -> "rsc_c001n02_start_0 c001n01" [ style = bold] "rsc_c001n02_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_5000 c001n01" [ style=bold color="green" fontcolor="black" ] @@ -29,9 +48,13 @@ digraph "g" { "rsc_c001n02_stop_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n01" [ style = bold] "rsc_c001n02_stop_0 c001n02" [ style=bold color="green" fontcolor="orange" ] +"rsc_c001n03_monitor_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n03_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n03_monitor_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n03_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n08_monitor_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n08_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "stonith 'reboot' c001n02" -> "DoFencing_stop_0" [ style = bold] "stonith 'reboot' c001n02" -> "child_DoFencing:0_stop_0 c001n02" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/bug-1820-1.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/bug-1820-1.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/bug-1820-1.dot @@ -12,8 +12,10 @@ digraph "g" { "gr1_stop_0" [ style=bold color="green" fontcolor="orange" ] "gr1_stopped_0" -> "gr1_start_0" [ style = bold] "gr1_stopped_0" [ style=bold color="green" fontcolor="orange" ] +"p1_monitor_0 star" -> "all_stopped" [ style = bold] "p1_monitor_0 star" -> "p1_start_0 world" [ style = bold] "p1_monitor_0 star" [ style=bold color="green" fontcolor="black" ] +"p1_monitor_0 world" -> "all_stopped" [ style = bold] "p1_monitor_0 world" -> "p1_start_0 world" [ style = bold] "p1_monitor_0 world" [ style=bold color="green" fontcolor="black" ] "p1_start_0 world" [ style=bold color="green" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/bug-1820-1.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/bug-1820-1.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/bug-1820-1.exp @@ -263,6 +263,12 @@ </action_set> <inputs> <trigger> + <rsc_op id="4" operation="monitor" operation_key="p1_monitor_0" on_node="star" on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="p1_monitor_0" on_node="world" on_node_uuid="e4603bf6-d10f-4af2-b53b-ba72de6164d0"/> + </trigger> + <trigger> <rsc_op id="7" operation="stop" operation_key="test1_stop_0" on_node="star" on_node_uuid="3f368213-61d5-409a-a30e-1428efe70f63"/> </trigger> <trigger> 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 @@ -178,6 +178,12 @@ </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="8" operation="monitor" operation_key="resource_nfsserver_single_monitor_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3"/> + </trigger> + <trigger> <rsc_op id="24" operation="stop" operation_key="resource_ipaddr1_single_stop_0" on_node="power720-2" on_node_uuid="1a1ecd04-01a0-43bf-9392-11b89f7d6f10"/> </trigger> <trigger> @@ -270,6 +276,9 @@ </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> <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> @@ -351,6 +360,21 @@ </action_set> <inputs> <trigger> + <rsc_op id="4" operation="monitor" operation_key="export_home_ocfs2:0_monitor_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="export_home_ocfs2:1_monitor_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3"/> + </trigger> + <trigger> + <rsc_op id="6" operation="monitor" operation_key="export_home_ocfs2:2_monitor_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3"/> + </trigger> + <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="8" operation="monitor" operation_key="resource_nfsserver_single_monitor_0" on_node="power720-1" on_node_uuid="ac446085-4c9d-4d4a-a94d-5e63b6e421e3"/> + </trigger> + <trigger> <rsc_op id="24" operation="stop" operation_key="resource_ipaddr1_single_stop_0" on_node="power720-2" on_node_uuid="1a1ecd04-01a0-43bf-9392-11b89f7d6f10"/> </trigger> <trigger> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/clone-anon-dup.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/clone-anon-dup.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/clone-anon-dup.dot @@ -12,10 +12,13 @@ digraph "g" { "group_webservice:2_stop_0" [ style=bold color="green" fontcolor="orange" ] "group_webservice:2_stopped_0" -> "clone_webservice_stopped_0" [ style = bold] "group_webservice:2_stopped_0" [ style=bold color="green" fontcolor="orange" ] +"stonith-1_monitor_0 wc01" -> "all_stopped" [ style = bold] "stonith-1_monitor_0 wc01" -> "stonith-1_start_0 wc01" [ style = bold] "stonith-1_monitor_0 wc01" [ style=bold color="green" fontcolor="black" ] +"stonith-1_monitor_0 wc02" -> "all_stopped" [ style = bold] "stonith-1_monitor_0 wc02" -> "stonith-1_start_0 wc01" [ style = bold] "stonith-1_monitor_0 wc02" [ style=bold color="green" fontcolor="black" ] +"stonith-1_monitor_0 wc03" -> "all_stopped" [ style = bold] "stonith-1_monitor_0 wc03" -> "stonith-1_start_0 wc01" [ style = bold] "stonith-1_monitor_0 wc03" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 wc01" [ style=bold color="green" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/clone-anon-dup.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/clone-anon-dup.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/clone-anon-dup.exp @@ -116,6 +116,15 @@ </action_set> <inputs> <trigger> + <rsc_op id="6" operation="monitor" operation_key="stonith-1_monitor_0" on_node="wc01" on_node_uuid="31de4ab3-2d05-476e-8f9a-627ad6cd94ca"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="stonith-1_monitor_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="stonith-1_monitor_0" on_node="wc03" on_node_uuid="f61edb1d-6f49-4ffa-a46a-42ceef796f6e"/> + </trigger> + <trigger> <rsc_op id="26" operation="stop" operation_key="apache2:0_stop_0" internal_operation_key="apache2:2_stop_0" on_node="wc02" on_node_uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/clone-no-shuffle.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/clone-no-shuffle.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/clone-no-shuffle.exp @@ -228,6 +228,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="6" operation="monitor" operation_key="testip_monitor_0" on_node="dktest1sles10" on_node_uuid="c563f60c-45a8-439e-85dc-645f4ecc150d"/> + </trigger> + <trigger> <pseudo_event id="34" operation="notified" operation_key="ms-drbd1_confirmed-pre_notify_demote_0"/> </trigger> <trigger> @@ -297,6 +300,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="5" operation="monitor" operation_key="drbd1:1_monitor_0" on_node="dktest1sles10" on_node_uuid="c563f60c-45a8-439e-85dc-645f4ecc150d"/> + </trigger> + <trigger> <rsc_op id="10" operation="stop" operation_key="drbd1:0_stop_0" on_node="dktest2sles10" on_node_uuid="6676c8d5-552e-4a86-a2ea-172e954f7342"/> </trigger> <trigger> @@ -438,6 +444,18 @@ </action_set> <inputs> <trigger> + <rsc_op id="4" operation="monitor" operation_key="stonith-1_monitor_0" on_node="dktest1sles10" on_node_uuid="c563f60c-45a8-439e-85dc-645f4ecc150d"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="drbd1:1_monitor_0" on_node="dktest1sles10" on_node_uuid="c563f60c-45a8-439e-85dc-645f4ecc150d"/> + </trigger> + <trigger> + <rsc_op id="6" operation="monitor" operation_key="testip_monitor_0" on_node="dktest1sles10" on_node_uuid="c563f60c-45a8-439e-85dc-645f4ecc150d"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="stonith-1_monitor_0" on_node="dktest2sles10" on_node_uuid="6676c8d5-552e-4a86-a2ea-172e954f7342"/> + </trigger> + <trigger> <rsc_op id="10" operation="stop" operation_key="drbd1:0_stop_0" on_node="dktest2sles10" on_node_uuid="6676c8d5-552e-4a86-a2ea-172e954f7342"/> </trigger> <trigger> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/group10.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/group10.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/group10.dot @@ -28,14 +28,23 @@ "child_192.168.100.183_stop_0 c001n01" -> "child_192.168.100.183_start_0 c001n01" [ style = bold] "child_192.168.100.183_stop_0 c001n01" -> "group-1_stopped_0" [ style = bold] "child_192.168.100.183_stop_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:1_monitor_0 c001n01" -> "all_stopped" [ style = bold] "child_DoFencing:1_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:1_monitor_0 c001n03" -> "all_stopped" [ style = bold] "child_DoFencing:1_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:1_monitor_0 c001n08" -> "all_stopped" [ style = bold] "child_DoFencing:1_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:2_monitor_0 c001n01" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:2_monitor_0 c001n02" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:2_monitor_0 c001n08" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:3_monitor_0 c001n01" -> "all_stopped" [ style = bold] "child_DoFencing:3_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:3_monitor_0 c001n02" -> "all_stopped" [ style = bold] "child_DoFencing:3_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:3_monitor_0 c001n03" -> "all_stopped" [ style = bold] "child_DoFencing:3_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "group-1_running_0" [ style=bold color="green" fontcolor="orange" ] "group-1_start_0" -> "child_192.168.100.181_start_0 c001n01" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/group10.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/group10.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/group10.exp @@ -291,6 +291,33 @@ <rsc_op id="13" operation="stop" operation_key="child_192.168.100.181_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> </trigger> <trigger> + <rsc_op id="15" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="16" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="17" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="18" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="19" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="20" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="21" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="22" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="23" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> <rsc_op id="27" operation="stop" operation_key="child_192.168.100.182_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> </trigger> <trigger> 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 @@ -45,6 +45,15 @@ </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="4" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="9" operation="stop" operation_key="child_rsc1_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -66,6 +75,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="6" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="19" operation="stop" operation_key="rsc3_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> </inputs> @@ -134,6 +146,9 @@ </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="11" operation="stop" operation_key="child_rsc2_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -181,6 +196,9 @@ </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> <rsc_op id="13" operation="stop" operation_key="child_rsc3_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -286,6 +304,21 @@ </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="3" operation="monitor" operation_key="child_rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <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="5" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="6" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="7" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> 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 @@ -7,6 +7,15 @@ </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="3" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="8" operation="stop" operation_key="child_rsc1_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -93,6 +102,9 @@ </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="10" operation="stop" operation_key="child_rsc2_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -140,6 +152,9 @@ </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> <rsc_op id="12" operation="stop" operation_key="child_rsc3_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -208,6 +223,15 @@ </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="6" operation="monitor" operation_key="child_rsc5_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="child_rsc6_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="18" operation="stop" operation_key="child_rsc4_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -293,6 +317,9 @@ </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="20" operation="stop" operation_key="child_rsc5_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -340,6 +367,9 @@ </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> <rsc_op id="22" operation="stop" operation_key="child_rsc6_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -408,6 +438,24 @@ </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="3" operation="monitor" operation_key="child_rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="child_rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <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="6" operation="monitor" operation_key="child_rsc5_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="child_rsc6_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="8" operation="stop" operation_key="child_rsc1_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> 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 @@ -68,10 +68,13 @@ digraph "g" { "lxc-ms_stop_0 lxc2" -> "lxc-ms-master_stopped_0" [ style = bold] "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" -> "all_stopped" [ style = bold] "lxc1_monitor_0 rhel7-3" -> "lxc1_start_0 rhel7-2" [ style = bold] "lxc1_monitor_0 rhel7-3" [ style=bold color="green" fontcolor="black"] +"lxc1_monitor_0 rhel7-4" -> "all_stopped" [ style = bold] "lxc1_monitor_0 rhel7-4" -> "lxc1_start_0 rhel7-2" [ style = bold] "lxc1_monitor_0 rhel7-4" [ style=bold color="green" fontcolor="black"] +"lxc1_monitor_0 rhel7-5" -> "all_stopped" [ style = bold] "lxc1_monitor_0 rhel7-5" -> "lxc1_start_0 rhel7-2" [ style = bold] "lxc1_monitor_0 rhel7-5" [ style=bold color="green" fontcolor="black"] "lxc1_monitor_30000 rhel7-2" [ style=bold color="green" fontcolor="black"] @@ -83,10 +86,13 @@ digraph "g" { "lxc1_stop_0 rhel7-1" -> "container1_stop_0 rhel7-1" [ style = bold] "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" -> "all_stopped" [ style = bold] "lxc2_monitor_0 rhel7-2" -> "lxc2_start_0 rhel7-3" [ style = bold] "lxc2_monitor_0 rhel7-2" [ style=bold color="green" fontcolor="black"] +"lxc2_monitor_0 rhel7-4" -> "all_stopped" [ style = bold] "lxc2_monitor_0 rhel7-4" -> "lxc2_start_0 rhel7-3" [ style = bold] "lxc2_monitor_0 rhel7-4" [ style=bold color="green" fontcolor="black"] +"lxc2_monitor_0 rhel7-5" -> "all_stopped" [ style = bold] "lxc2_monitor_0 rhel7-5" -> "lxc2_start_0 rhel7-3" [ style = bold] "lxc2_monitor_0 rhel7-5" [ style=bold color="green" fontcolor="black"] "lxc2_monitor_30000 rhel7-3" [ style=bold color="green" fontcolor="black"] 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 @@ -123,6 +123,21 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="6" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="11" operation="stop" operation_key="child_rsc1:2_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -197,6 +212,21 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="6" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="11" operation="stop" operation_key="child_rsc1:2_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> 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 @@ -123,6 +123,21 @@ </action_set> <inputs> <trigger> + <rsc_op id="7" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <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="10" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="11" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="16" operation="stop" operation_key="child_rsc1:2_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -304,6 +319,21 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="child_rsc2:0_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="child_rsc2:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="child_rsc2:2_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <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="6" operation="monitor" operation_key="child_rsc2:4_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> <rsc_op id="31" operation="stop" operation_key="child_rsc2:3_stop_0" on_node="node2" on_node_uuid="uuid2"/> </trigger> <trigger> @@ -378,6 +408,36 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="child_rsc2:0_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="child_rsc2:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="child_rsc2:2_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <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="6" operation="monitor" operation_key="child_rsc2:4_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <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="10" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="11" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="16" operation="stop" operation_key="child_rsc1:2_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> 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,6 +42,9 @@ </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="18" operation="stop" operation_key="child_rsc1:3_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -86,6 +89,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="11" operation="monitor" operation_key="child_rsc1:4_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> @@ -132,6 +138,21 @@ </action_set> <inputs> <trigger> + <rsc_op id="7" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <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="10" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="11" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="16" operation="stop" operation_key="child_rsc1:2_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -254,6 +275,9 @@ </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> <rsc_op id="33" operation="stop" operation_key="child_rsc2:4_stop_0" on_node="node2" on_node_uuid="uuid2"/> </trigger> <trigger> @@ -319,6 +343,21 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="child_rsc2:0_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="child_rsc2:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="child_rsc2:2_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <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="6" operation="monitor" operation_key="child_rsc2:4_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> <rsc_op id="31" operation="stop" operation_key="child_rsc2:3_stop_0" on_node="node2" on_node_uuid="uuid2"/> </trigger> <trigger> @@ -393,6 +432,36 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="child_rsc2:0_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="child_rsc2:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="child_rsc2:2_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <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="6" operation="monitor" operation_key="child_rsc2:4_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="child_rsc1:1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <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="10" operation="monitor" operation_key="child_rsc1:3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="11" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="16" operation="stop" operation_key="child_rsc1:2_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> 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 @@ -108,6 +108,18 @@ </action_set> <inputs> <trigger> + <rsc_op id="4" operation="monitor" operation_key="child_rsc2:2_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="20" operation="monitor" operation_key="child_rsc2:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="21" operation="monitor" operation_key="child_rsc2:1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="22" operation="monitor" operation_key="child_rsc2:2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="44" operation="stop" operation_key="child_rsc2:1_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -271,6 +283,18 @@ </action_set> <inputs> <trigger> + <rsc_op id="7" operation="monitor" operation_key="child_rsc4:2_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="25" operation="monitor" operation_key="child_rsc4:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="26" operation="monitor" operation_key="child_rsc4:1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="27" operation="monitor" operation_key="child_rsc4:2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="60" operation="stop" operation_key="child_rsc4:1_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -398,6 +422,18 @@ </action_set> <inputs> <trigger> + <rsc_op id="8" operation="monitor" operation_key="child_rsc5:0_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="9" operation="monitor" operation_key="child_rsc5:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="child_rsc5:2_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="28" operation="monitor" operation_key="child_rsc5:2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="68" operation="stop" operation_key="child_rsc5:1_stop_0" on_node="node2" on_node_uuid="uuid2"/> </trigger> <trigger> @@ -561,6 +597,18 @@ </action_set> <inputs> <trigger> + <rsc_op id="13" operation="monitor" operation_key="child_rsc7:0_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="14" operation="monitor" operation_key="child_rsc7:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="15" operation="monitor" operation_key="child_rsc7:2_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="31" operation="monitor" operation_key="child_rsc7:2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="84" operation="stop" operation_key="child_rsc7:1_stop_0" on_node="node2" on_node_uuid="uuid2"/> </trigger> <trigger> @@ -659,6 +707,102 @@ </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> + <rsc_op id="3" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="child_rsc2:2_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="child_rsc3:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="6" operation="monitor" operation_key="child_rsc3:2_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="child_rsc4:2_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="child_rsc5:0_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="9" operation="monitor" operation_key="child_rsc5:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="child_rsc5:2_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="11" operation="monitor" operation_key="child_rsc6:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="12" operation="monitor" operation_key="child_rsc6:2_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="13" operation="monitor" operation_key="child_rsc7:0_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="14" operation="monitor" operation_key="child_rsc7:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="15" operation="monitor" operation_key="child_rsc7:2_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="16" operation="monitor" operation_key="child_rsc8:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="17" operation="monitor" operation_key="child_rsc8:2_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="18" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="19" operation="monitor" operation_key="child_rsc1:2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="20" operation="monitor" operation_key="child_rsc2:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="21" operation="monitor" operation_key="child_rsc2:1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="22" operation="monitor" operation_key="child_rsc2:2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="23" operation="monitor" operation_key="child_rsc3:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="24" operation="monitor" operation_key="child_rsc3:2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="25" operation="monitor" operation_key="child_rsc4:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="26" operation="monitor" operation_key="child_rsc4:1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="27" operation="monitor" operation_key="child_rsc4:2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="28" operation="monitor" operation_key="child_rsc5:2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="29" operation="monitor" operation_key="child_rsc6:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="30" operation="monitor" operation_key="child_rsc6:2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="31" operation="monitor" operation_key="child_rsc7:2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="32" operation="monitor" operation_key="child_rsc8:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="33" operation="monitor" operation_key="child_rsc8:2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="44" operation="stop" operation_key="child_rsc2:1_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/master-9.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/master-9.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/master-9.dot @@ -5,14 +5,24 @@ "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" [ style=bold color="green" fontcolor="orange"] +"child_DoFencing:1_monitor_0 va1" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:1_monitor_0 va1" -> "all_stopped" [ style = bold] "child_DoFencing:1_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_stop_0 ibm1" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:1_stop_0 ibm1" -> "all_stopped" [ style = bold] "child_DoFencing:1_stop_0 ibm1" -> "do_shutdown ibm1" [ style = bold] "child_DoFencing:1_stop_0 ibm1" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:2_monitor_0 ibm1" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:2_monitor_0 ibm1" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:2_monitor_0 va1" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:2_monitor_0 va1" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:3_monitor_0 ibm1" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:3_monitor_0 ibm1" -> "all_stopped" [ style = bold] "child_DoFencing:3_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:3_monitor_0 va1" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:3_monitor_0 va1" -> "all_stopped" [ style = bold] "child_DoFencing:3_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] "do_shutdown ibm1" [ style=bold color="green" fontcolor="black" ] "heartbeat_127.0.0.12_monitor_5000 va1" [ style=dashed color="red" fontcolor="black" ] @@ -21,17 +31,29 @@ "ocf_127.0.0.13_monitor_5000 va1" [ style=dashed color="red" fontcolor="black" ] "ocf_msdummy:0_monitor_6000 va1" [ style=dashed color="red" fontcolor="black"] "ocf_msdummy:1_monitor_5000 va1" [ style=dashed color="red" fontcolor="black" ] +"ocf_msdummy:2_monitor_0 ibm1" -> "all_stopped" [ style = bold] "ocf_msdummy:2_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:2_monitor_0 va1" -> "all_stopped" [ style = bold] "ocf_msdummy:2_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:3_monitor_0 ibm1" -> "all_stopped" [ style = bold] "ocf_msdummy:3_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:3_monitor_0 va1" -> "all_stopped" [ style = bold] "ocf_msdummy:3_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:4_monitor_0 ibm1" -> "all_stopped" [ style = bold] "ocf_msdummy:4_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:4_monitor_0 va1" -> "all_stopped" [ style = bold] "ocf_msdummy:4_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:5_monitor_0 ibm1" -> "all_stopped" [ style = bold] "ocf_msdummy:5_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:5_monitor_0 va1" -> "all_stopped" [ style = bold] "ocf_msdummy:5_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:6_monitor_0 ibm1" -> "all_stopped" [ style = bold] "ocf_msdummy:6_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:6_monitor_0 va1" -> "all_stopped" [ style = bold] "ocf_msdummy:6_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:7_monitor_0 ibm1" -> "all_stopped" [ style = bold] "ocf_msdummy:7_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] +"ocf_msdummy:7_monitor_0 va1" -> "all_stopped" [ style = bold] "ocf_msdummy:7_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] "rsc_ibm1_monitor_5000 va1" [ style=dashed color="red" fontcolor="black" ] "rsc_sgi2_monitor_5000 va1" [ style=dashed color="red" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/master-9.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/master-9.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/master-9.exp @@ -65,6 +65,21 @@ </action_set> <inputs> <trigger> + <rsc_op id="4" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/> + </trigger> + <trigger> + <rsc_op id="12" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="va1" on_node_uuid="b8f81462-2d65-42bf-bbb1-70db0ea29e5b"/> + </trigger> + <trigger> + <rsc_op id="13" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="va1" on_node_uuid="b8f81462-2d65-42bf-bbb1-70db0ea29e5b"/> + </trigger> + <trigger> + <rsc_op id="14" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="va1" on_node_uuid="b8f81462-2d65-42bf-bbb1-70db0ea29e5b"/> + </trigger> + <trigger> <rsc_op id="45" operation="stop" operation_key="child_DoFencing:1_stop_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/> </trigger> <trigger> @@ -211,6 +226,57 @@ </action_set> <inputs> <trigger> + <rsc_op id="4" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/> + </trigger> + <trigger> + <rsc_op id="6" operation="monitor" operation_key="ocf_msdummy:2_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="ocf_msdummy:3_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/> + </trigger> + <trigger> + <rsc_op id="9" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/> + </trigger> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/> + </trigger> + <trigger> + <rsc_op id="11" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/> + </trigger> + <trigger> + <rsc_op id="12" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="va1" on_node_uuid="b8f81462-2d65-42bf-bbb1-70db0ea29e5b"/> + </trigger> + <trigger> + <rsc_op id="13" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="va1" on_node_uuid="b8f81462-2d65-42bf-bbb1-70db0ea29e5b"/> + </trigger> + <trigger> + <rsc_op id="14" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="va1" on_node_uuid="b8f81462-2d65-42bf-bbb1-70db0ea29e5b"/> + </trigger> + <trigger> + <rsc_op id="15" operation="monitor" operation_key="ocf_msdummy:2_monitor_0" on_node="va1" on_node_uuid="b8f81462-2d65-42bf-bbb1-70db0ea29e5b"/> + </trigger> + <trigger> + <rsc_op id="16" operation="monitor" operation_key="ocf_msdummy:3_monitor_0" on_node="va1" on_node_uuid="b8f81462-2d65-42bf-bbb1-70db0ea29e5b"/> + </trigger> + <trigger> + <rsc_op id="17" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="va1" on_node_uuid="b8f81462-2d65-42bf-bbb1-70db0ea29e5b"/> + </trigger> + <trigger> + <rsc_op id="18" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="va1" on_node_uuid="b8f81462-2d65-42bf-bbb1-70db0ea29e5b"/> + </trigger> + <trigger> + <rsc_op id="19" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="va1" on_node_uuid="b8f81462-2d65-42bf-bbb1-70db0ea29e5b"/> + </trigger> + <trigger> + <rsc_op id="20" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="va1" on_node_uuid="b8f81462-2d65-42bf-bbb1-70db0ea29e5b"/> + </trigger> + <trigger> <rsc_op id="45" operation="stop" operation_key="child_DoFencing:1_stop_0" on_node="ibm1" on_node_uuid="d0d76dd9-7a01-4c12-bbec-98aa2a669638"/> </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 @@ -5,6 +5,7 @@ "rsc3_migrate_from_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_migrate_to_0 node1" -> "rsc3_migrate_from_0 node2" [ style = bold] "rsc3_migrate_to_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc3_monitor_0 node2" -> "all_stopped" [ style = bold] "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" [ style=bold color="green" fontcolor="black" ] 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 @@ -73,6 +73,9 @@ </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="3" operation="stop" operation_key="rsc3_stop_0" on_node="node1" on_node_uuid="node1"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/migrate-3.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/migrate-3.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/migrate-3.dot @@ -1,5 +1,6 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"rsc3_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc3_monitor_0 node2" -> "rsc3_start_0 node2" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/migrate-3.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/migrate-3.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/migrate-3.exp @@ -43,6 +43,9 @@ <trigger> <rsc_op id="1" operation="stop" operation_key="rsc3_stop_0" on_node="node1" on_node_uuid="node1"/> </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> </inputs> </synapse> </transition_graph> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/migrate-start-complex.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/migrate-start-complex.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/migrate-start-complex.dot @@ -1,9 +1,11 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"bottom:0_monitor_0 dom0-01" -> "all_stopped" [ style = bold] "bottom:0_monitor_0 dom0-01" -> "clone-bottom_start_0" [ style = bold] "bottom:0_monitor_0 dom0-01" [ style=bold color="green" fontcolor="black" ] "bottom:0_start_0 dom0-01" -> "clone-bottom_running_0" [ style = bold] "bottom:0_start_0 dom0-01" [ style=bold color="green" fontcolor="black" ] +"bottom:1_monitor_0 dom0-02" -> "all_stopped" [ style = bold] "bottom:1_monitor_0 dom0-02" -> "clone-bottom_start_0" [ style = bold] "bottom:1_monitor_0 dom0-02" [ style=bold color="green" fontcolor="black" ] "bottom:1_start_0 dom0-02" -> "clone-bottom_running_0" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/migrate-start-complex.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/migrate-start-complex.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/migrate-start-complex.exp @@ -241,6 +241,12 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="bottom:0_monitor_0" on_node="dom0-01" on_node_uuid="dom0-01"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="bottom:1_monitor_0" on_node="dom0-02" on_node_uuid="dom0-02"/> + </trigger> + <trigger> <rsc_op id="4" operation="stop" operation_key="top_stop_0" on_node="dom0-02" on_node_uuid="dom0-02"/> </trigger> <trigger> 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,5 +1,6 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"rsc1_monitor_0 node1" -> "all_stopped" [ style = bold] "rsc1_monitor_0 node1" -> "rsc1_start_0 node1" [ style = bold] "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_monitor_5000 node1" [ style=bold color="green" fontcolor="black" ] 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 @@ -54,6 +54,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> <rsc_op id="3" operation="stop" operation_key="rsc1_stop_0" on_node="node2" on_node_uuid="uuid2"/> </trigger> </inputs> 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,5 +1,6 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"rsc1_monitor_0 node1" -> "all_stopped" [ style = bold] "rsc1_monitor_0 node1" -> "rsc1_start_0 node1" [ style = bold] "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_monitor_5000 node1" [ style=bold color="green" fontcolor="black" ] 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 @@ -54,6 +54,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> <rsc_op id="4" operation="stop" operation_key="rsc1_stop_0" on_node="node2" on_node_uuid="uuid2"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/notify-0.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/notify-0.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/notify-0.exp @@ -78,6 +78,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="3" operation="monitor" operation_key="child_rsc2:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> <rsc_op id="11" operation="stop" operation_key="child_rsc2:0_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -101,6 +104,12 @@ </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> + <rsc_op id="3" operation="monitor" operation_key="child_rsc2:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> <rsc_op id="11" operation="stop" operation_key="child_rsc2:0_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/notify-1.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/notify-1.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/notify-1.exp @@ -239,6 +239,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="3" operation="monitor" operation_key="child_rsc2:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> <rsc_op id="19" operation="stop" operation_key="child_rsc2:0_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -266,6 +269,12 @@ </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> + <rsc_op id="3" operation="monitor" operation_key="child_rsc2:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> <rsc_op id="19" operation="stop" operation_key="child_rsc2:0_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/notify-2.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/notify-2.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/notify-2.exp @@ -239,6 +239,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="3" operation="monitor" operation_key="child_rsc2:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> <rsc_op id="19" operation="stop" operation_key="child_rsc2:0_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -266,6 +269,12 @@ </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> + <rsc_op id="3" operation="monitor" operation_key="child_rsc2:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> <rsc_op id="19" operation="stop" operation_key="child_rsc2:0_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> 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 @@ -188,6 +188,12 @@ </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> + <rsc_op id="4" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="9" operation="stop" operation_key="child_rsc1:1_stop_0" on_node="node2" on_node_uuid="uuid2"/> </trigger> <trigger> @@ -414,6 +420,15 @@ </action_set> <inputs> <trigger> + <rsc_op id="3" operation="monitor" operation_key="child_rsc2:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="child_rsc2:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="6" operation="monitor" operation_key="child_rsc2:1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="23" operation="stop" operation_key="child_rsc2:0_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> @@ -441,6 +456,21 @@ </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> + <rsc_op id="3" operation="monitor" operation_key="child_rsc2:1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="child_rsc1:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="child_rsc2:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="6" operation="monitor" operation_key="child_rsc2:1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="9" operation="stop" operation_key="child_rsc1:1_stop_0" on_node="node2" on_node_uuid="uuid2"/> </trigger> <trigger> 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 @@ -4,6 +4,7 @@ "configstoreclone:0_post_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ] "configstoreclone:0_pre_notify_start_0 node2" -> "configstorecloneset_confirmed-pre_notify_start_0" [ style = bold] "configstoreclone:0_pre_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ] +"configstoreclone:1_monitor_0 node1" -> "all_stopped" [ style = bold] "configstoreclone:1_monitor_0 node1" -> "configstorecloneset_start_0" [ style = bold] "configstoreclone:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "configstoreclone:1_monitor_20000 node1" [ style=bold color="green" fontcolor="black" ] @@ -35,6 +36,7 @@ "evmsclone:0_post_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ] "evmsclone:0_pre_notify_start_0 node2" -> "evmscloneset_confirmed-pre_notify_start_0" [ style = bold] "evmsclone:0_pre_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ] +"evmsclone:1_monitor_0 node1" -> "all_stopped" [ style = bold] "evmsclone:1_monitor_0 node1" -> "evmscloneset_start_0" [ style = bold] "evmsclone:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "evmsclone:1_post_notify_start_0 node1" -> "evmscloneset_confirmed-post_notify_running_0" [ style = bold] @@ -59,6 +61,7 @@ "evmscloneset_start_0" -> "evmsclone:1_start_0 node1" [ style = bold] "evmscloneset_start_0" -> "evmscloneset_running_0" [ style = bold] "evmscloneset_start_0" [ style=bold color="green" fontcolor="orange" ] +"evmsdclone:1_monitor_0 node1" -> "all_stopped" [ style = bold] "evmsdclone:1_monitor_0 node1" -> "evmsdcloneset_start_0" [ style = bold] "evmsdclone:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "evmsdclone:1_monitor_5000 node1" [ style=bold color="green" fontcolor="black" ] @@ -74,6 +77,7 @@ "imagestoreclone:0_post_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ] "imagestoreclone:0_pre_notify_start_0 node2" -> "imagestorecloneset_confirmed-pre_notify_start_0" [ style = bold] "imagestoreclone:0_pre_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ] +"imagestoreclone:1_monitor_0 node1" -> "all_stopped" [ style = bold] "imagestoreclone:1_monitor_0 node1" -> "imagestorecloneset_start_0" [ style = bold] "imagestoreclone:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "imagestoreclone:1_monitor_20000 node1" [ style=bold color="green" fontcolor="black" ] @@ -106,6 +110,7 @@ "sles10_migrate_from_0 node1" [ style=bold color="green" fontcolor="black" ] "sles10_migrate_to_0 node2" -> "sles10_migrate_from_0 node1" [ style = bold] "sles10_migrate_to_0 node2" [ style=bold color="green" fontcolor="black" ] +"sles10_monitor_0 node1" -> "all_stopped" [ style = bold] "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" [ style=bold color="green" fontcolor="black" ] @@ -115,6 +120,7 @@ "sles10_stop_0 node2" -> "all_stopped" [ style = bold] "sles10_stop_0 node2" -> "sles10_start_0 node1" [ style = bold] "sles10_stop_0 node2" [ style=bold color="green" fontcolor="black" ] +"stonithclone:1_monitor_0 node1" -> "all_stopped" [ style = bold] "stonithclone:1_monitor_0 node1" -> "stonithcloneset_start_0" [ style = bold] "stonithclone:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "stonithclone:1_monitor_5000 node1" [ style=bold color="green" fontcolor="black" ] 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 @@ -704,6 +704,24 @@ </action_set> <inputs> <trigger> + <rsc_op id="7" operation="monitor" operation_key="stonithclone:1_monitor_0" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="evmsdclone:1_monitor_0" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a"/> + </trigger> + <trigger> + <rsc_op id="9" operation="monitor" operation_key="evmsclone:1_monitor_0" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a"/> + </trigger> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="imagestoreclone:1_monitor_0" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a"/> + </trigger> + <trigger> + <rsc_op id="11" operation="monitor" operation_key="configstoreclone:1_monitor_0" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a"/> + </trigger> + <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="76" operation="stop" operation_key="sles10_stop_0" on_node="node2" on_node_uuid="2c826922-d092-4862-bedc-de9ae2312117"/> </trigger> </inputs> 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,6 +24,9 @@ </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="8" operation="stop" operation_key="rsc2_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> </inputs> @@ -68,6 +71,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="4" operation="monitor" operation_key="rsc3_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> @@ -143,6 +149,9 @@ </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="8" operation="stop" operation_key="rsc2_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> </inputs> @@ -164,6 +173,18 @@ </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="3" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="6" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> 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 @@ -1,27 +1,35 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"rsc1_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc2_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ 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] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc3_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc4_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc4_monitor_0 node2" -> "rsc4_start_0 node2" [ 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] "rsc4_stop_0 node1" -> "rsc4_start_0 node2" [ style = bold] "rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc5_monitor_0 node1" -> "all_stopped" [ style = bold] "rsc5_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc6_monitor_0 node1" -> "all_stopped" [ style = bold] "rsc6_monitor_0 node1" -> "rsc6_start_0 node1" [ 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] "rsc6_stop_0 node2" -> "rsc6_start_0 node1" [ style = bold] "rsc6_stop_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc7_monitor_0 node1" -> "all_stopped" [ style = bold] "rsc7_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc8_monitor_0 node1" -> "all_stopped" [ style = bold] "rsc8_monitor_0 node1" -> "rsc8_start_0 node1" [ style = bold] "rsc8_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc8_start_0 node1" [ style=bold color="green" fontcolor="black" ] 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 @@ -179,6 +179,30 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="rsc5_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="rsc6_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="rsc7_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="rsc8_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="6" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="9" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="12" operation="stop" operation_key="rsc2_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> 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 @@ -1,27 +1,35 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"rsc1_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc2_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ 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] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc3_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc4_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc4_monitor_0 node2" -> "rsc4_start_0 node2" [ 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] "rsc4_stop_0 node1" -> "rsc4_start_0 node2" [ style = bold] "rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc5_monitor_0 node1" -> "all_stopped" [ style = bold] "rsc5_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc6_monitor_0 node1" -> "all_stopped" [ style = bold] "rsc6_monitor_0 node1" -> "rsc6_start_0 node1" [ 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] "rsc6_stop_0 node2" -> "rsc6_start_0 node1" [ style = bold] "rsc6_stop_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc7_monitor_0 node1" -> "all_stopped" [ style = bold] "rsc7_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc8_monitor_0 node1" -> "all_stopped" [ style = bold] "rsc8_monitor_0 node1" -> "rsc8_start_0 node1" [ style = bold] "rsc8_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc8_start_0 node1" [ style=bold color="green" fontcolor="black" ] 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 @@ -179,6 +179,30 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="rsc5_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="rsc6_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="rsc7_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="rsc8_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="6" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="9" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="12" operation="stop" operation_key="rsc2_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/orphan-1.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/orphan-1.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/orphan-1.dot @@ -1,18 +1,30 @@ digraph "g" { "Cancel rsc_c001n02_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ] "Cancel rsc_c001n03_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ] +"DcIPaddr_monitor_0 c001n01" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"DcIPaddr_monitor_0 c001n03" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"DcIPaddr_monitor_0 c001n08" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"rsc_c001n01_monitor_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n01_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n01_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n01_monitor_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n01_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_monitor_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_monitor_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n03_monitor_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n03_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n03_monitor_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n03_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n03_monitor_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n03_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_monitor_6000 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_delete_0 c001n08" [ style=bold color="green" fontcolor="black"] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/orphan-1.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/orphan-1.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/orphan-1.exp @@ -164,6 +164,42 @@ </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="9" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="11" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="12" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="13" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="14" 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="15" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="16" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="17" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="18" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="19" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> <rsc_op id="29" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/orphan-2.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/orphan-2.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/orphan-2.dot @@ -1,18 +1,30 @@ digraph "g" { "Cancel rsc_c001n02_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black"] "Cancel rsc_c001n03_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black"] +"DcIPaddr_monitor_0 c001n01" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black"] +"DcIPaddr_monitor_0 c001n03" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black"] +"DcIPaddr_monitor_0 c001n08" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 c001n08" [ style=bold color="green" fontcolor="black"] "all_stopped" [ style=bold color="green" fontcolor="orange"] +"rsc_c001n01_monitor_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n01_monitor_0 c001n02" [ style=bold color="green" fontcolor="black"] +"rsc_c001n01_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black"] +"rsc_c001n01_monitor_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n01_monitor_0 c001n08" [ style=bold color="green" fontcolor="black"] +"rsc_c001n02_monitor_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black"] +"rsc_c001n02_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black"] +"rsc_c001n02_monitor_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n08" [ style=bold color="green" fontcolor="black"] +"rsc_c001n03_monitor_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n03_monitor_0 c001n01" [ style=bold color="green" fontcolor="black"] +"rsc_c001n03_monitor_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n03_monitor_0 c001n02" [ style=bold color="green" fontcolor="black"] +"rsc_c001n03_monitor_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n03_monitor_0 c001n08" [ style=bold color="green" fontcolor="black"] "rsc_c001n03_monitor_6000 c001n03" [ style=bold color="green" fontcolor="black"] "rsc_c001n08_clear_failcount_0 c001n02" -> "rsc_c001n08_stop_0 c001n08" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/orphan-2.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/orphan-2.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/orphan-2.exp @@ -189,6 +189,42 @@ </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="9" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="11" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="12" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="13" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="14" 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="15" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="16" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="17" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="18" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="19" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> <rsc_op id="31" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> </trigger> </inputs> 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,10 +1,13 @@ 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" -> "all_stopped" [ 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" -> "all_stopped" [ 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" -> "all_stopped" [ 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] @@ -13,18 +16,30 @@ "DcIPaddr_stop_0 c001n02" -> "all_stopped" [ style = bold] "DcIPaddr_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"rsc_c001n01_monitor_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n01_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n01_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n01_monitor_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n01_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_monitor_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_monitor_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_6000 c001n02" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n03_monitor_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n03_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n03_monitor_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n03_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n03_monitor_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n03_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n08_monitor_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n08_monitor_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n08_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n08_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_monitor_5000 c001n08" [ style=bold color="green" fontcolor="black" ] } 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 @@ -213,6 +213,51 @@ </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="9" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="11" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="12" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="13" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="14" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </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="16" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="17" 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="18" operation="monitor" operation_key="rsc_c001n01_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> + <trigger> + <rsc_op id="20" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="21" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="22" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> <rsc_op id="23" operation="stop" operation_key="DcIPaddr_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> </trigger> </inputs> 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 @@ -1,15 +1,19 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "do_shutdown node1" [ style=bold color="green" fontcolor="black" ] +"rsc1_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc1_monitor_0 node3" -> "all_stopped" [ style = bold] "rsc1_monitor_0 node3" [ style=bold color="green" fontcolor="black" ] "rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "do_shutdown node1" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_delete_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc2_delete_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc2_monitor_0 node1" -> "all_stopped" [ style = bold] "rsc2_monitor_0 node1" -> "rsc2_start_0 node2" [ style = bold] "rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc2_monitor_0 node3" -> "all_stopped" [ style = bold] "rsc2_monitor_0 node3" -> "rsc2_start_0 node2" [ style = bold] "rsc2_monitor_0 node3" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] @@ -19,8 +23,10 @@ "rsc2_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_delete_0 node3" -> "rsc3_start_0 node3" [ style = bold] "rsc3_delete_0 node3" [ style=bold color="green" fontcolor="black"] +"rsc3_monitor_0 node1" -> "all_stopped" [ style = bold] "rsc3_monitor_0 node1" -> "rsc3_start_0 node3" [ style = bold] "rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc3_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc3_monitor_0 node2" -> "rsc3_start_0 node3" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_start_0 node3" [ style=bold color="green" fontcolor="black" ] 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 @@ -160,6 +160,24 @@ <rsc_op id="2" operation="stop" operation_key="rsc2_stop_0" on_node="node2" on_node_uuid="node2"/> </trigger> <trigger> + <rsc_op id="6" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="node1"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> + <rsc_op id="9" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="rsc1_monitor_0" on_node="node3" on_node_uuid="node3"/> + </trigger> + <trigger> + <rsc_op id="11" operation="monitor" operation_key="rsc2_monitor_0" on_node="node3" on_node_uuid="node3"/> + </trigger> + <trigger> <rsc_op id="12" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/> </trigger> </inputs> 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,10 +1,13 @@ 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" -> "all_stopped" [ 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" -> "all_stopped" [ 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" -> "all_stopped" [ 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] @@ -13,18 +16,30 @@ digraph "g" { "DcIPaddr_stop_0 c001n02" -> "all_stopped" [ style = bold] "DcIPaddr_stop_0 c001n02" [ style=bold color="green" fontcolor="black"] "all_stopped" [ style=bold color="green" fontcolor="orange"] +"rsc_c001n01_monitor_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n01_monitor_0 c001n02" [ style=bold color="green" fontcolor="black"] +"rsc_c001n01_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black"] +"rsc_c001n01_monitor_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n01_monitor_0 c001n08" [ style=bold color="green" fontcolor="black"] +"rsc_c001n02_monitor_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black"] +"rsc_c001n02_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black"] +"rsc_c001n02_monitor_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n08" [ style=bold color="green" fontcolor="black"] "rsc_c001n02_monitor_6000 c001n02" [ style=bold color="green" fontcolor="black"] +"rsc_c001n03_monitor_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n03_monitor_0 c001n01" [ style=bold color="green" fontcolor="black"] +"rsc_c001n03_monitor_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n03_monitor_0 c001n02" [ style=bold color="green" fontcolor="black"] +"rsc_c001n03_monitor_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n03_monitor_0 c001n08" [ style=bold color="green" fontcolor="black"] +"rsc_c001n08_monitor_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" fontcolor="black"] +"rsc_c001n08_monitor_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n08_monitor_0 c001n02" [ style=bold color="green" fontcolor="black"] +"rsc_c001n08_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black"] "rsc_c001n08_monitor_5000 c001n08" [ style=bold color="green" fontcolor="black"] } 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 @@ -213,6 +213,51 @@ </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="9" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="11" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="12" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="13" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="14" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </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="16" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="17" 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="18" operation="monitor" operation_key="rsc_c001n01_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> + <trigger> + <rsc_op id="20" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="21" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="22" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> <rsc_op id="23" operation="stop" operation_key="DcIPaddr_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> </trigger> </inputs> 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 @@ -1,14 +1,18 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"rsc1_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc2_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ 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] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc3_monitor_0 node1" -> "all_stopped" [ style = bold] "rsc3_monitor_0 node1" -> "rsc3_start_0 node1" [ style = bold] "rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc3_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc3_monitor_0 node2" -> "rsc3_start_0 node1" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_start_0 node1" [ style=bold color="green" fontcolor="black" ] 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 @@ -84,6 +84,18 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="rsc3_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/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 @@ -1,12 +1,16 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"rsc1_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc2_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ 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] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc3_monitor_0 node1" -> "all_stopped" [ style = bold] "rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc3_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] } 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 @@ -68,6 +68,18 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="rsc3_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/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,17 +1,21 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"rsc1_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc1_monitor_0 node2" -> "rsc1_start_0 node1" [ style = dashed] "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" -> "all_stopped" [ style = bold] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ 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 = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = dashed] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc3_monitor_0 node1" -> "all_stopped" [ style = bold] "rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc3_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] } 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 @@ -61,6 +61,18 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <rsc_op id="6" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> 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,16 +1,19 @@ digraph "g" { "all_stopped" [ style=dashed color="red" fontcolor="orange" ] +"rsc1_monitor_0 node2" -> "all_stopped" [ style = dashed] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ 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" -> "all_stopped" [ style = dashed] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ 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] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = dashed] "rsc2_stop_0 node1" [ style=dashed color="red" fontcolor="black" ] +"stonith-1_monitor_0 node2" -> "all_stopped" [ style = dashed] "stonith-1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] } Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-12.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rec-node-12.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-12.dot @@ -1,9 +1,12 @@ digraph "g" { "DcIPaddr_monitor_0 c001n01" -> "DcIPaddr_start_0 c001n08" [ style = bold] +"DcIPaddr_monitor_0 c001n01" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_0 c001n03" -> "DcIPaddr_start_0 c001n08" [ style = bold] +"DcIPaddr_monitor_0 c001n03" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_0 c001n08" -> "DcIPaddr_start_0 c001n08" [ style = bold] +"DcIPaddr_monitor_0 c001n08" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_5000 c001n08" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_start_0 c001n08" -> "DcIPaddr_monitor_5000 c001n08" [ style = bold] @@ -16,72 +19,96 @@ digraph "g" { "DoFencing_start_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:0_monitor_0 c001n01" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:0_monitor_0 c001n01" -> "all_stopped" [ style = bold] "child_DoFencing:0_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_monitor_0 c001n03" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:0_monitor_0 c001n03" -> "all_stopped" [ style = bold] "child_DoFencing:0_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_monitor_0 c001n08" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:0_monitor_0 c001n08" -> "all_stopped" [ style = bold] "child_DoFencing:0_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_start_0 c001n03" -> "DoFencing_running_0" [ style = bold] "child_DoFencing:0_start_0 c001n03" -> "child_DoFencing:0_monitor_5000 c001n03" [ style = bold] "child_DoFencing:0_start_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_monitor_0 c001n01" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:1_monitor_0 c001n01" -> "all_stopped" [ style = bold] "child_DoFencing:1_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_monitor_0 c001n03" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:1_monitor_0 c001n03" -> "all_stopped" [ style = bold] "child_DoFencing:1_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_monitor_0 c001n08" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:1_monitor_0 c001n08" -> "all_stopped" [ style = bold] "child_DoFencing:1_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_monitor_5000 c001n01" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_start_0 c001n01" -> "DoFencing_running_0" [ style = bold] "child_DoFencing:1_start_0 c001n01" -> "child_DoFencing:1_monitor_5000 c001n01" [ style = bold] "child_DoFencing:1_start_0 c001n01" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 c001n01" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:2_monitor_0 c001n01" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 c001n03" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:2_monitor_0 c001n03" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 c001n08" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:2_monitor_0 c001n08" -> "all_stopped" [ style = bold] "child_DoFencing:2_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_5000 c001n08" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_start_0 c001n08" -> "DoFencing_running_0" [ style = bold] "child_DoFencing:2_start_0 c001n08" -> "child_DoFencing:2_monitor_5000 c001n08" [ style = bold] "child_DoFencing:2_start_0 c001n08" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 c001n01" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:3_monitor_0 c001n01" -> "all_stopped" [ style = bold] "child_DoFencing:3_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 c001n03" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:3_monitor_0 c001n03" -> "all_stopped" [ style = bold] "child_DoFencing:3_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 c001n08" -> "DoFencing_start_0" [ style = bold] +"child_DoFencing:3_monitor_0 c001n08" -> "all_stopped" [ style = bold] "child_DoFencing:3_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n01_monitor_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n01_monitor_0 c001n01" -> "rsc_c001n01_start_0 c001n01" [ style = bold] "rsc_c001n01_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n01_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n01_monitor_0 c001n03" -> "rsc_c001n01_start_0 c001n01" [ style = bold] "rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n01_monitor_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n01_monitor_0 c001n08" -> "rsc_c001n01_start_0 c001n01" [ style = bold] "rsc_c001n01_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_monitor_5000 c001n01" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_start_0 c001n01" -> "rsc_c001n01_monitor_5000 c001n01" [ style = bold] "rsc_c001n01_start_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_monitor_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n01" -> "rsc_c001n02_start_0 c001n01" [ style = bold] "rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n03" -> "rsc_c001n02_start_0 c001n01" [ style = bold] "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_monitor_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n08" -> "rsc_c001n02_start_0 c001n01" [ 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] "rsc_c001n02_start_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n03_monitor_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n03_monitor_0 c001n01" -> "rsc_c001n03_start_0 c001n03" [ style = bold] "rsc_c001n03_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n03_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n03_monitor_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = bold] "rsc_c001n03_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n03_monitor_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n03_monitor_0 c001n08" -> "rsc_c001n03_start_0 c001n03" [ style = bold] "rsc_c001n03_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_start_0 c001n03" -> "rsc_c001n03_monitor_5000 c001n03" [ style = bold] "rsc_c001n03_start_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n08_monitor_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n08_monitor_0 c001n01" -> "rsc_c001n08_start_0 c001n08" [ style = bold] "rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n08_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n08_monitor_0 c001n03" -> "rsc_c001n08_start_0 c001n08" [ style = bold] "rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n08_monitor_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n08_monitor_0 c001n08" -> "rsc_c001n08_start_0 c001n08" [ style = bold] "rsc_c001n08_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_monitor_5000 c001n08" [ style=bold color="green" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-12.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rec-node-12.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-12.exp @@ -592,6 +592,87 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="6" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="9" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="11" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="12" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="13" 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="14" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="15" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="16" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="17" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="18" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="19" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="20" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="21" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </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> + <rsc_op id="23" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="24" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="25" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="26" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="27" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="28" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> <pseudo_event id="49" operation="stonith_complete" operation_key="stonith_complete"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-15.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rec-node-15.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-15.dot @@ -76,8 +76,10 @@ digraph "g" { "oralsnr_25_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "stonith 'reboot' sapcl03" -> "stonith_complete" [ style = bold] "stonith 'reboot' sapcl03" [ style=bold color="green" fontcolor="black"] +"stonith-1_monitor_0 sapcl01" -> "all_stopped" [ style = bold] "stonith-1_monitor_0 sapcl01" -> "stonith-1_start_0 sapcl01" [ style = bold] "stonith-1_monitor_0 sapcl01" [ style=bold color="green" fontcolor="black" ] +"stonith-1_monitor_0 sapcl02" -> "all_stopped" [ style = bold] "stonith-1_monitor_0 sapcl02" -> "stonith-1_start_0 sapcl01" [ style = bold] "stonith-1_monitor_0 sapcl02" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-2.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rec-node-2.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-2.dot @@ -13,32 +13,39 @@ digraph "g" { "group2_start_0" -> "rsc5_start_0 node2" [ style = bold] "group2_start_0" -> "rsc6_start_0 node2" [ style = bold] "group2_start_0" [ style=bold color="green" fontcolor="orange" ] +"rsc1_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc2_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc3_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc3_monitor_0 node2" -> "rsc3_start_0 node2" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_start_0 node2" -> "group1_running_0" [ style = bold] "rsc3_start_0 node2" -> "rsc4_start_0 node2" [ style = bold] "rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc4_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc4_monitor_0 node2" -> "rsc4_start_0 node2" [ style = bold] "rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_start_0 node2" -> "group1_running_0" [ style = bold] "rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc5_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc5_monitor_0 node2" -> "rsc5_start_0 node2" [ style = bold] "rsc5_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc5_start_0 node2" -> "group2_running_0" [ style = bold] "rsc5_start_0 node2" -> "rsc6_start_0 node2" [ style = bold] "rsc5_start_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc6_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc6_monitor_0 node2" -> "rsc6_start_0 node2" [ style = bold] "rsc6_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc6_start_0 node2" -> "group2_running_0" [ style = bold] "rsc6_start_0 node2" [ style=bold color="green" fontcolor="black" ] "stonith 'reboot' node1" -> "stonith_complete" [ style = bold] "stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"] +"stonith-1_monitor_0 node2" -> "all_stopped" [ style = bold] "stonith-1_monitor_0 node2" -> "stonith-1_start_0 node2" [ style = bold] "stonith-1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 node2" [ style=bold color="green" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-2.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rec-node-2.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-2.exp @@ -275,6 +275,27 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="6" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="rsc5_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="rsc6_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <pseudo_event id="24" operation="stonith_complete" operation_key="stonith_complete"/> </trigger> </inputs> 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 @@ -1,12 +1,14 @@ digraph "g" { "all_stopped" -> "stonith-1_start_0 node2" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"rsc1_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ 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" -> "all_stopped" [ style = bold] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] @@ -17,6 +19,7 @@ digraph "g" { "stonith 'reboot' node1" -> "rsc2_stop_0 node1" [ style = bold] "stonith 'reboot' node1" -> "stonith_complete" [ style = bold] "stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"] +"stonith-1_monitor_0 node2" -> "all_stopped" [ style = bold] "stonith-1_monitor_0 node2" -> "stonith-1_start_0 node2" [ style = bold] "stonith-1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 node2" [ style=bold color="green" fontcolor="black" ] 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 @@ -1,12 +1,14 @@ digraph "g" { "all_stopped" -> "stonith-1_start_0 node2" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"rsc1_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ 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" -> "all_stopped" [ style = bold] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] @@ -17,6 +19,7 @@ digraph "g" { "stonith 'reboot' node1" -> "rsc2_stop_0 node1" [ style = bold] "stonith 'reboot' node1" -> "stonith_complete" [ style = bold] "stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"] +"stonith-1_monitor_0 node2" -> "all_stopped" [ style = bold] "stonith-1_monitor_0 node2" -> "stonith-1_start_0 node2" [ style = bold] "stonith-1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 node2" [ style=bold color="green" fontcolor="black" ] 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 @@ -1,12 +1,14 @@ digraph "g" { "all_stopped" -> "stonith-1_start_0 node2" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"rsc1_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ 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" -> "all_stopped" [ style = bold] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] @@ -17,6 +19,7 @@ digraph "g" { "stonith 'reboot' node1" -> "rsc2_stop_0 node1" [ style = bold] "stonith 'reboot' node1" -> "stonith_complete" [ style = bold] "stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"] +"stonith-1_monitor_0 node2" -> "all_stopped" [ style = bold] "stonith-1_monitor_0 node2" -> "stonith-1_start_0 node2" [ style = bold] "stonith-1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 node2" [ style=bold color="green" fontcolor="black" ] 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,17 +1,21 @@ digraph "g" { "all_stopped" [ style=dashed color="red" fontcolor="orange" ] +"rsc1_monitor_0 node2" -> "all_stopped" [ style = dashed] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ 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" -> "all_stopped" [ style = dashed] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ 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] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = dashed] "rsc2_stop_0 node1" [ style=dashed color="red" fontcolor="black" ] +"rsc3_monitor_0 node2" -> "all_stopped" [ style = dashed] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"stonith-1_monitor_0 node2" -> "all_stopped" [ style = dashed] "stonith-1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] } Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-rsc-1.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rec-rsc-1.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-rsc-1.dot @@ -1,5 +1,6 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"rsc1_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-rsc-1.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rec-rsc-1.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-rsc-1.exp @@ -43,6 +43,9 @@ <trigger> <rsc_op id="1" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> </inputs> </synapse> </transition_graph> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-rsc-2.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rec-rsc-2.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-rsc-2.dot @@ -1,6 +1,7 @@ digraph "g" { "Cancel rsc1_monitor_1 node1" [ style=bold color="green" fontcolor="black" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"rsc1_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc1_monitor_0 node2" -> "rsc1_start_0 node1" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-rsc-2.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rec-rsc-2.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-rsc-2.exp @@ -56,6 +56,9 @@ <trigger> <rsc_op id="2" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> </inputs> </synapse> </transition_graph> 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 @@ -1,12 +1,14 @@ digraph "g" { "all_stopped" -> "stonith-1_start_0 node1" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"rsc1_monitor_0 node1" -> "all_stopped" [ style = bold] "rsc1_monitor_0 node1" -> "rsc1_start_0 node1" [ style = bold] "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" -> "rsc1_start_0 node1" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="orange" ] +"rsc2_monitor_0 node1" -> "all_stopped" [ style = bold] "rsc2_monitor_0 node1" -> "rsc2_start_0 node1" [ style = bold] "rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node1" [ style=bold color="green" fontcolor="black" ] @@ -17,6 +19,7 @@ digraph "g" { "stonith 'reboot' node2" -> "rsc2_stop_0 node2" [ style = bold] "stonith 'reboot' node2" -> "stonith_complete" [ style = bold] "stonith 'reboot' node2" [ style=bold color="green" fontcolor="black"] +"stonith-1_monitor_0 node1" -> "all_stopped" [ style = bold] "stonith-1_monitor_0 node1" -> "stonith-1_start_0 node1" [ style = bold] "stonith-1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 node1" [ style=bold color="green" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-probe-disable.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/remote-probe-disable.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-probe-disable.dot @@ -1,10 +1,14 @@ digraph "g" { +"FAKE1_monitor_0 remote1" -> "all_stopped" [ style = bold] "FAKE1_monitor_0 remote1" -> "remote1_stop_0 18builder" [ style = bold] "FAKE1_monitor_0 remote1" [ style=bold color="green" fontcolor="black"] +"FAKE2_monitor_0 remote1" -> "all_stopped" [ style = bold] "FAKE2_monitor_0 remote1" -> "remote1_stop_0 18builder" [ style = bold] "FAKE2_monitor_0 remote1" [ style=bold color="green" fontcolor="black"] +"FAKE3_monitor_0 remote1" -> "all_stopped" [ style = bold] "FAKE3_monitor_0 remote1" -> "remote1_stop_0 18builder" [ style = bold] "FAKE3_monitor_0 remote1" [ style=bold color="green" fontcolor="black"] +"FAKE4_monitor_0 remote1" -> "all_stopped" [ style = bold] "FAKE4_monitor_0 remote1" -> "remote1_stop_0 18builder" [ style = bold] "FAKE4_monitor_0 remote1" [ style=bold color="green" fontcolor="black"] "all_stopped" [ style=bold color="green" fontcolor="orange"] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-probe-disable.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/remote-probe-disable.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-probe-disable.exp @@ -68,6 +68,18 @@ </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> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="FAKE2_monitor_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/> + </trigger> + <trigger> + <rsc_op id="9" operation="monitor" operation_key="FAKE3_monitor_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/> + </trigger> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="FAKE4_monitor_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/> + </trigger> + <trigger> <rsc_op id="13" operation="stop" operation_key="remote1_stop_0" on_node="18builder" on_node_uuid="5"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-recover-unknown.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/remote-recover-unknown.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-recover-unknown.dot @@ -13,6 +13,7 @@ digraph "g" { "galera-0_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "galera-2_stop_0 controller-1" -> "all_stopped" [ style = bold] "galera-2_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] +"galera_monitor_0 galera-2" -> "all_stopped" [ style = dashed] "galera_monitor_0 galera-2" [ style=dashed color="red" fontcolor="black"] "galera_monitor_10000 galera-0" [ style=bold color="green" fontcolor="black"] "haproxy-clone_stop_0" -> "haproxy-clone_stopped_0" [ style = bold] 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,5 +1,6 @@ digraph "g" { "FAKE1_monitor_0 remote1" -> "FAKE1_start_0 18node2" [ style = bold] +"FAKE1_monitor_0 remote1" -> "all_stopped" [ 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] @@ -8,6 +9,7 @@ "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" -> "all_stopped" [ 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] @@ -15,7 +17,9 @@ "FAKE2_stop_0 18node2" -> "FAKE2_start_0 remote1" [ style = bold] "FAKE2_stop_0 18node2" -> "all_stopped" [ style = bold] "FAKE2_stop_0 18node2" [ style=bold color="green" fontcolor="black"] +"FAKE3_monitor_0 remote1" -> "all_stopped" [ style = bold] "FAKE3_monitor_0 remote1" [ style=bold color="green" fontcolor="black"] +"FAKE4_monitor_0 remote1" -> "all_stopped" [ style = bold] "FAKE4_monitor_0 remote1" [ style=bold color="green" fontcolor="black"] "all_stopped" [ style=bold color="green" fontcolor="orange"] "remote1_monitor_60000 18builder" [ style=bold color="green" fontcolor="black"] 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 @@ -163,6 +163,18 @@ </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> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="FAKE2_monitor_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/> + </trigger> + <trigger> + <rsc_op id="9" operation="monitor" operation_key="FAKE3_monitor_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/> + </trigger> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="FAKE4_monitor_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/> + </trigger> + <trigger> <rsc_op id="15" operation="stop" operation_key="FAKE1_stop_0" on_node="18builder" on_node_uuid="5"/> </trigger> <trigger> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-startup.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/remote-startup.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-startup.dot @@ -1,18 +1,25 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange"] +"fake_monitor_0 18builder" -> "all_stopped" [ style = bold] "fake_monitor_0 18builder" -> "fake_start_0 18node2" [ style = bold] "fake_monitor_0 18builder" [ style=bold color="green" fontcolor="black"] +"fake_monitor_0 18node1" -> "all_stopped" [ style = bold] "fake_monitor_0 18node1" -> "fake_start_0 18node2" [ style = bold] "fake_monitor_0 18node1" [ style=bold color="green" fontcolor="black"] +"fake_monitor_0 18node2" -> "all_stopped" [ style = bold] "fake_monitor_0 18node2" -> "fake_start_0 18node2" [ style = bold] "fake_monitor_0 18node2" [ style=bold color="green" fontcolor="black"] +"fake_monitor_0 remote1" -> "all_stopped" [ style = bold] "fake_monitor_0 remote1" -> "fake_start_0 18node2" [ style = bold] "fake_monitor_0 remote1" [ style=bold color="green" fontcolor="black"] "fake_start_0 18node2" [ style=bold color="green" fontcolor="black"] +"remote1_monitor_0 18builder" -> "all_stopped" [ style = bold] "remote1_monitor_0 18builder" -> "remote1_start_0 18builder" [ style = bold] "remote1_monitor_0 18builder" [ style=bold color="green" fontcolor="black"] +"remote1_monitor_0 18node1" -> "all_stopped" [ style = bold] "remote1_monitor_0 18node1" -> "remote1_start_0 18builder" [ style = bold] "remote1_monitor_0 18node1" [ style=bold color="green" fontcolor="black"] +"remote1_monitor_0 18node2" -> "all_stopped" [ style = bold] "remote1_monitor_0 18node2" -> "remote1_start_0 18builder" [ style = bold] "remote1_monitor_0 18node2" [ style=bold color="green" fontcolor="black"] "remote1_monitor_60000 18builder" [ style=bold color="green" fontcolor="black"] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-startup.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/remote-startup.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-startup.exp @@ -163,6 +163,27 @@ </action_set> <inputs> <trigger> + <rsc_op id="3" operation="monitor" operation_key="fake_monitor_0" on_node="18builder" on_node_uuid="5"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="remote1_monitor_0" on_node="18builder" on_node_uuid="5"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="fake_monitor_0" on_node="18node1" on_node_uuid="1"/> + </trigger> + <trigger> + <rsc_op id="6" operation="monitor" operation_key="remote1_monitor_0" on_node="18node1" on_node_uuid="1"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="fake_monitor_0" on_node="18node2" on_node_uuid="2"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="remote1_monitor_0" on_node="18node2" on_node_uuid="2"/> + </trigger> + <trigger> + <rsc_op id="9" operation="monitor" operation_key="fake_monitor_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/> + </trigger> + <trigger> <rsc_op id="10" operation="stop" operation_key="shooter_stop_0" on_node="18builder" on_node_uuid="5"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-startup.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/remote-startup.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/remote-startup.summary @@ -20,12 +20,12 @@ Executing cluster transition: * Resource action: remote1 monitor on 18node2 * Resource action: remote1 monitor on 18node1 * Resource action: remote1 monitor on 18builder - * Pseudo action: all_stopped * Resource action: shooter start on 18node1 * Resource action: remote1 start on 18builder * Resource action: shooter monitor=60000 on 18node1 * Resource action: fake monitor on remote1 * Resource action: remote1 monitor=60000 on 18builder + * Pseudo action: all_stopped * Resource action: fake start on 18node2 Revised cluster status: 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 @@ -1,20 +1,27 @@ digraph "g" { "FAKE1_monitor_0 18builder" -> "FAKE1_start_0 18node2" [ style = bold] +"FAKE1_monitor_0 18builder" -> "all_stopped" [ style = bold] "FAKE1_monitor_0 18builder" [ style=bold color="green" fontcolor="black"] "FAKE1_monitor_0 18node1" -> "FAKE1_start_0 18node2" [ style = bold] +"FAKE1_monitor_0 18node1" -> "all_stopped" [ style = bold] "FAKE1_monitor_0 18node1" [ style=bold color="green" fontcolor="black"] "FAKE1_monitor_0 18node2" -> "FAKE1_start_0 18node2" [ style = bold] +"FAKE1_monitor_0 18node2" -> "all_stopped" [ style = bold] "FAKE1_monitor_0 18node2" [ style=bold color="green" fontcolor="black"] "FAKE1_monitor_0 18node3" -> "FAKE1_start_0 18node2" [ style = bold] +"FAKE1_monitor_0 18node3" -> "all_stopped" [ style = bold] "FAKE1_monitor_0 18node3" [ style=bold color="green" fontcolor="black"] "FAKE1_monitor_0 18node4" -> "FAKE1_start_0 18node2" [ style = bold] +"FAKE1_monitor_0 18node4" -> "all_stopped" [ style = bold] "FAKE1_monitor_0 18node4" [ 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] "FAKE1_start_0 18node2" [ style=bold color="green" fontcolor="black"] "FAKE2_monitor_0 18node3" -> "FAKE2_start_0 18node3" [ style = bold] +"FAKE2_monitor_0 18node3" -> "all_stopped" [ 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" -> "all_stopped" [ 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] @@ -23,8 +30,10 @@ "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" -> "all_stopped" [ 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" -> "all_stopped" [ 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] @@ -33,8 +42,10 @@ "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" -> "all_stopped" [ 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" -> "all_stopped" [ 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] @@ -43,14 +54,19 @@ "FAKE4_stop_0 18node1" -> "all_stopped" [ style = bold] "FAKE4_stop_0 18node1" [ style=bold color="green" fontcolor="black"] "FAKE5_monitor_0 18builder" -> "FAKE5_start_0 18builder" [ style = bold] +"FAKE5_monitor_0 18builder" -> "all_stopped" [ style = bold] "FAKE5_monitor_0 18builder" [ style=bold color="green" fontcolor="black"] "FAKE5_monitor_0 18node1" -> "FAKE5_start_0 18builder" [ style = bold] +"FAKE5_monitor_0 18node1" -> "all_stopped" [ style = bold] "FAKE5_monitor_0 18node1" [ style=bold color="green" fontcolor="black"] "FAKE5_monitor_0 18node2" -> "FAKE5_start_0 18builder" [ style = bold] +"FAKE5_monitor_0 18node2" -> "all_stopped" [ style = bold] "FAKE5_monitor_0 18node2" [ style=bold color="green" fontcolor="black"] "FAKE5_monitor_0 18node3" -> "FAKE5_start_0 18builder" [ style = bold] +"FAKE5_monitor_0 18node3" -> "all_stopped" [ style = bold] "FAKE5_monitor_0 18node3" [ style=bold color="green" fontcolor="black"] "FAKE5_monitor_0 18node4" -> "FAKE5_start_0 18builder" [ style = bold] +"FAKE5_monitor_0 18node4" -> "all_stopped" [ style = bold] "FAKE5_monitor_0 18node4" [ style=bold color="green" fontcolor="black"] "FAKE5_monitor_60000 18builder" [ style=bold color="green" fontcolor="black"] "FAKE5_start_0 18builder" -> "FAKE5_monitor_60000 18builder" [ style = bold] @@ -65,24 +81,28 @@ "FAKECLONE1-clone_start_0" -> "FAKECLONE1:5_start_0 18builder" [ style = bold] "FAKECLONE1-clone_start_0" [ style=bold color="green" fontcolor="orange"] "FAKECLONE1:0_monitor_0 18node1" -> "FAKECLONE1-clone_start_0" [ style = bold] +"FAKECLONE1:0_monitor_0 18node1" -> "all_stopped" [ style = bold] "FAKECLONE1:0_monitor_0 18node1" [ style=bold color="green" fontcolor="black"] "FAKECLONE1:0_monitor_60000 18node1" [ style=bold color="green" fontcolor="black"] "FAKECLONE1:0_start_0 18node1" -> "FAKECLONE1-clone_running_0" [ style = bold] "FAKECLONE1:0_start_0 18node1" -> "FAKECLONE1:0_monitor_60000 18node1" [ style = bold] "FAKECLONE1:0_start_0 18node1" [ style=bold color="green" fontcolor="black"] "FAKECLONE1:1_monitor_0 18node2" -> "FAKECLONE1-clone_start_0" [ style = bold] +"FAKECLONE1:1_monitor_0 18node2" -> "all_stopped" [ style = bold] "FAKECLONE1:1_monitor_0 18node2" [ style=bold color="green" fontcolor="black"] "FAKECLONE1:1_monitor_60000 18node2" [ style=bold color="green" fontcolor="black"] "FAKECLONE1:1_start_0 18node2" -> "FAKECLONE1-clone_running_0" [ style = bold] "FAKECLONE1:1_start_0 18node2" -> "FAKECLONE1:1_monitor_60000 18node2" [ style = bold] "FAKECLONE1:1_start_0 18node2" [ style=bold color="green" fontcolor="black"] "FAKECLONE1:2_monitor_0 18node3" -> "FAKECLONE1-clone_start_0" [ style = bold] +"FAKECLONE1:2_monitor_0 18node3" -> "all_stopped" [ style = bold] "FAKECLONE1:2_monitor_0 18node3" [ style=bold color="green" fontcolor="black"] "FAKECLONE1:2_monitor_60000 18node3" [ style=bold color="green" fontcolor="black"] "FAKECLONE1:2_start_0 18node3" -> "FAKECLONE1-clone_running_0" [ style = bold] "FAKECLONE1:2_start_0 18node3" -> "FAKECLONE1:2_monitor_60000 18node3" [ style = bold] "FAKECLONE1:2_start_0 18node3" [ style=bold color="green" fontcolor="black"] "FAKECLONE1:3_monitor_0 18node4" -> "FAKECLONE1-clone_start_0" [ style = bold] +"FAKECLONE1:3_monitor_0 18node4" -> "all_stopped" [ style = bold] "FAKECLONE1:3_monitor_0 18node4" [ style=bold color="green" fontcolor="black"] "FAKECLONE1:3_monitor_60000 18node4" [ style=bold color="green" fontcolor="black"] "FAKECLONE1:3_start_0 18node4" -> "FAKECLONE1-clone_running_0" [ style = bold] @@ -93,6 +113,7 @@ "FAKECLONE1:4_start_0 remote1" -> "FAKECLONE1:4_monitor_60000 remote1" [ style = bold] "FAKECLONE1:4_start_0 remote1" [ style=bold color="green" fontcolor="black"] "FAKECLONE1:5_monitor_0 18builder" -> "FAKECLONE1-clone_start_0" [ style = bold] +"FAKECLONE1:5_monitor_0 18builder" -> "all_stopped" [ style = bold] "FAKECLONE1:5_monitor_0 18builder" [ style=bold color="green" fontcolor="black"] "FAKECLONE1:5_monitor_60000 18builder" [ style=bold color="green" fontcolor="black"] "FAKECLONE1:5_start_0 18builder" -> "FAKECLONE1-clone_running_0" [ style = bold] @@ -108,24 +129,28 @@ "FAKECLONE2-clone_start_0" -> "FAKECLONE2:5_start_0 18builder" [ style = bold] "FAKECLONE2-clone_start_0" [ style=bold color="green" fontcolor="orange"] "FAKECLONE2:0_monitor_0 18node1" -> "FAKECLONE2-clone_start_0" [ style = bold] +"FAKECLONE2:0_monitor_0 18node1" -> "all_stopped" [ style = bold] "FAKECLONE2:0_monitor_0 18node1" [ style=bold color="green" fontcolor="black"] "FAKECLONE2:0_monitor_60000 18node1" [ style=bold color="green" fontcolor="black"] "FAKECLONE2:0_start_0 18node1" -> "FAKECLONE2-clone_running_0" [ style = bold] "FAKECLONE2:0_start_0 18node1" -> "FAKECLONE2:0_monitor_60000 18node1" [ style = bold] "FAKECLONE2:0_start_0 18node1" [ style=bold color="green" fontcolor="black"] "FAKECLONE2:1_monitor_0 18node2" -> "FAKECLONE2-clone_start_0" [ style = bold] +"FAKECLONE2:1_monitor_0 18node2" -> "all_stopped" [ style = bold] "FAKECLONE2:1_monitor_0 18node2" [ style=bold color="green" fontcolor="black"] "FAKECLONE2:1_monitor_60000 18node2" [ style=bold color="green" fontcolor="black"] "FAKECLONE2:1_start_0 18node2" -> "FAKECLONE2-clone_running_0" [ style = bold] "FAKECLONE2:1_start_0 18node2" -> "FAKECLONE2:1_monitor_60000 18node2" [ style = bold] "FAKECLONE2:1_start_0 18node2" [ style=bold color="green" fontcolor="black"] "FAKECLONE2:2_monitor_0 18node3" -> "FAKECLONE2-clone_start_0" [ style = bold] +"FAKECLONE2:2_monitor_0 18node3" -> "all_stopped" [ style = bold] "FAKECLONE2:2_monitor_0 18node3" [ style=bold color="green" fontcolor="black"] "FAKECLONE2:2_monitor_60000 18node3" [ style=bold color="green" fontcolor="black"] "FAKECLONE2:2_start_0 18node3" -> "FAKECLONE2-clone_running_0" [ style = bold] "FAKECLONE2:2_start_0 18node3" -> "FAKECLONE2:2_monitor_60000 18node3" [ style = bold] "FAKECLONE2:2_start_0 18node3" [ style=bold color="green" fontcolor="black"] "FAKECLONE2:3_monitor_0 18node4" -> "FAKECLONE2-clone_start_0" [ style = bold] +"FAKECLONE2:3_monitor_0 18node4" -> "all_stopped" [ style = bold] "FAKECLONE2:3_monitor_0 18node4" [ style=bold color="green" fontcolor="black"] "FAKECLONE2:3_monitor_60000 18node4" [ style=bold color="green" fontcolor="black"] "FAKECLONE2:3_start_0 18node4" -> "FAKECLONE2-clone_running_0" [ style = bold] @@ -136,14 +161,17 @@ "FAKECLONE2:4_start_0 remote1" -> "FAKECLONE2:4_monitor_60000 remote1" [ style = bold] "FAKECLONE2:4_start_0 remote1" [ style=bold color="green" fontcolor="black"] "FAKECLONE2:5_monitor_0 18builder" -> "FAKECLONE2-clone_start_0" [ style = bold] +"FAKECLONE2:5_monitor_0 18builder" -> "all_stopped" [ style = bold] "FAKECLONE2:5_monitor_0 18builder" [ style=bold color="green" fontcolor="black"] "FAKECLONE2:5_monitor_60000 18builder" [ style=bold color="green" fontcolor="black"] "FAKECLONE2:5_start_0 18builder" -> "FAKECLONE2-clone_running_0" [ style = bold] "FAKECLONE2:5_start_0 18builder" -> "FAKECLONE2:5_monitor_60000 18builder" [ style = bold] "FAKECLONE2:5_start_0 18builder" [ style=bold color="green" fontcolor="black"] "all_stopped" [ style=bold color="green" fontcolor="orange"] +"remote1_monitor_0 18node3" -> "all_stopped" [ style = bold] "remote1_monitor_0 18node3" -> "remote1_start_0 18builder" [ style = bold] "remote1_monitor_0 18node3" [ style=bold color="green" fontcolor="black"] +"remote1_monitor_0 18node4" -> "all_stopped" [ style = bold] "remote1_monitor_0 18node4" -> "remote1_start_0 18builder" [ style = bold] "remote1_monitor_0 18node4" [ style=bold color="green" fontcolor="black"] "remote1_monitor_60000 18builder" [ style=bold color="green" fontcolor="black"] @@ -155,6 +183,8 @@ "remote1_start_0 18builder" -> "FAKECLONE2:4_start_0 remote1" [ style = bold] "remote1_start_0 18builder" -> "remote1_monitor_60000 18builder" [ style = bold] "remote1_start_0 18builder" [ style=bold color="green" fontcolor="black"] +"shooter_monitor_0 18node3" -> "all_stopped" [ style = bold] "shooter_monitor_0 18node3" [ style=bold color="green" fontcolor="black"] +"shooter_monitor_0 18node4" -> "all_stopped" [ style = bold] "shooter_monitor_0 18node4" [ style=bold color="green" fontcolor="black"] } 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 @@ -943,6 +943,96 @@ </action_set> <inputs> <trigger> + <rsc_op id="6" operation="monitor" operation_key="FAKE1_monitor_0" on_node="18builder" on_node_uuid="5"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="FAKE5_monitor_0" on_node="18builder" on_node_uuid="5"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="FAKECLONE1:5_monitor_0" on_node="18builder" on_node_uuid="5"/> + </trigger> + <trigger> + <rsc_op id="9" operation="monitor" operation_key="FAKECLONE2:5_monitor_0" on_node="18builder" on_node_uuid="5"/> + </trigger> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="FAKE1_monitor_0" on_node="18node1" on_node_uuid="1"/> + </trigger> + <trigger> + <rsc_op id="11" operation="monitor" operation_key="FAKE5_monitor_0" on_node="18node1" on_node_uuid="1"/> + </trigger> + <trigger> + <rsc_op id="12" operation="monitor" operation_key="FAKECLONE1:0_monitor_0" on_node="18node1" on_node_uuid="1"/> + </trigger> + <trigger> + <rsc_op id="13" operation="monitor" operation_key="FAKECLONE2:0_monitor_0" on_node="18node1" on_node_uuid="1"/> + </trigger> + <trigger> + <rsc_op id="14" operation="monitor" operation_key="FAKE1_monitor_0" on_node="18node2" on_node_uuid="2"/> + </trigger> + <trigger> + <rsc_op id="15" operation="monitor" operation_key="FAKE5_monitor_0" on_node="18node2" on_node_uuid="2"/> + </trigger> + <trigger> + <rsc_op id="16" operation="monitor" operation_key="FAKECLONE1:1_monitor_0" on_node="18node2" on_node_uuid="2"/> + </trigger> + <trigger> + <rsc_op id="17" operation="monitor" operation_key="FAKECLONE2:1_monitor_0" on_node="18node2" on_node_uuid="2"/> + </trigger> + <trigger> + <rsc_op id="18" operation="monitor" operation_key="shooter_monitor_0" on_node="18node3" on_node_uuid="3"/> + </trigger> + <trigger> + <rsc_op id="19" operation="monitor" operation_key="remote1_monitor_0" on_node="18node3" on_node_uuid="3"/> + </trigger> + <trigger> + <rsc_op id="20" operation="monitor" operation_key="FAKE1_monitor_0" on_node="18node3" on_node_uuid="3"/> + </trigger> + <trigger> + <rsc_op id="21" operation="monitor" operation_key="FAKE2_monitor_0" on_node="18node3" on_node_uuid="3"/> + </trigger> + <trigger> + <rsc_op id="22" operation="monitor" operation_key="FAKE3_monitor_0" on_node="18node3" on_node_uuid="3"/> + </trigger> + <trigger> + <rsc_op id="23" operation="monitor" operation_key="FAKE4_monitor_0" on_node="18node3" on_node_uuid="3"/> + </trigger> + <trigger> + <rsc_op id="24" operation="monitor" operation_key="FAKE5_monitor_0" on_node="18node3" on_node_uuid="3"/> + </trigger> + <trigger> + <rsc_op id="25" operation="monitor" operation_key="FAKECLONE1:2_monitor_0" on_node="18node3" on_node_uuid="3"/> + </trigger> + <trigger> + <rsc_op id="26" operation="monitor" operation_key="FAKECLONE2:2_monitor_0" on_node="18node3" on_node_uuid="3"/> + </trigger> + <trigger> + <rsc_op id="27" operation="monitor" operation_key="shooter_monitor_0" on_node="18node4" on_node_uuid="4"/> + </trigger> + <trigger> + <rsc_op id="28" operation="monitor" operation_key="remote1_monitor_0" on_node="18node4" on_node_uuid="4"/> + </trigger> + <trigger> + <rsc_op id="29" operation="monitor" operation_key="FAKE1_monitor_0" on_node="18node4" on_node_uuid="4"/> + </trigger> + <trigger> + <rsc_op id="30" operation="monitor" operation_key="FAKE2_monitor_0" on_node="18node4" on_node_uuid="4"/> + </trigger> + <trigger> + <rsc_op id="31" operation="monitor" operation_key="FAKE3_monitor_0" on_node="18node4" on_node_uuid="4"/> + </trigger> + <trigger> + <rsc_op id="32" operation="monitor" operation_key="FAKE4_monitor_0" on_node="18node4" on_node_uuid="4"/> + </trigger> + <trigger> + <rsc_op id="33" operation="monitor" operation_key="FAKE5_monitor_0" on_node="18node4" on_node_uuid="4"/> + </trigger> + <trigger> + <rsc_op id="34" operation="monitor" operation_key="FAKECLONE1:3_monitor_0" on_node="18node4" on_node_uuid="4"/> + </trigger> + <trigger> + <rsc_op id="35" operation="monitor" operation_key="FAKECLONE2:3_monitor_0" on_node="18node4" on_node_uuid="4"/> + </trigger> + <trigger> <rsc_op id="42" operation="stop" operation_key="FAKE2_stop_0" on_node="18node2" on_node_uuid="2"/> </trigger> <trigger> 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 @@ -16,11 +16,13 @@ digraph "g" { "basegrp:1_start_0" -> "vg1:1_start_0 sys3" [ style = bold] "basegrp:1_start_0" -> "vg2:1_start_0 sys3" [ style = bold] "basegrp:1_start_0" [ style=bold color="green" fontcolor="orange" ] +"clvmd:1_monitor_0 sys3" -> "all_stopped" [ style = bold] "clvmd:1_monitor_0 sys3" -> "baseclone_start_0" [ style = bold] "clvmd:1_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] "clvmd:1_start_0 sys3" -> "basegrp:1_running_0" [ style = bold] "clvmd:1_start_0 sys3" -> "o2cb:1_start_0 sys3" [ style = bold] "clvmd:1_start_0 sys3" [ style=bold color="green" fontcolor="black" ] +"controld:1_monitor_0 sys3" -> "all_stopped" [ style = bold] "controld:1_monitor_0 sys3" -> "baseclone_start_0" [ style = bold] "controld:1_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] "controld:1_monitor_10000 sys3" [ style=bold color="green" fontcolor="black" ] @@ -28,12 +30,14 @@ digraph "g" { "controld:1_start_0 sys3" -> "clvmd:1_start_0 sys3" [ style = bold] "controld:1_start_0 sys3" -> "controld:1_monitor_10000 sys3" [ style = bold] "controld:1_start_0 sys3" [ style=bold color="green" fontcolor="black" ] +"fs2:1_monitor_0 sys3" -> "all_stopped" [ style = bold] "fs2:1_monitor_0 sys3" -> "baseclone_start_0" [ style = bold] "fs2:1_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] "fs2:1_monitor_20000 sys3" [ style=bold color="green" fontcolor="black" ] "fs2:1_start_0 sys3" -> "basegrp:1_running_0" [ style = bold] "fs2:1_start_0 sys3" -> "fs2:1_monitor_20000 sys3" [ style = bold] "fs2:1_start_0 sys3" [ style=bold color="green" fontcolor="black" ] +"iscsi1:1_monitor_0 sys3" -> "all_stopped" [ style = bold] "iscsi1:1_monitor_0 sys3" -> "baseclone_start_0" [ style = bold] "iscsi1:1_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] "iscsi1:1_monitor_120000 sys3" [ style=bold color="green" fontcolor="black" ] @@ -41,6 +45,7 @@ digraph "g" { "iscsi1:1_start_0 sys3" -> "iscsi1:1_monitor_120000 sys3" [ style = bold] "iscsi1:1_start_0 sys3" -> "iscsi2:1_start_0 sys3" [ style = bold] "iscsi1:1_start_0 sys3" [ style=bold color="green" fontcolor="black" ] +"iscsi2:1_monitor_0 sys3" -> "all_stopped" [ style = bold] "iscsi2:1_monitor_0 sys3" -> "baseclone_start_0" [ style = bold] "iscsi2:1_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] "iscsi2:1_monitor_120000 sys3" [ style=bold color="green" fontcolor="black" ] @@ -50,17 +55,21 @@ digraph "g" { "iscsi2:1_start_0 sys3" [ style=bold color="green" fontcolor="black" ] "load_stopped_sys2 sys2" [ style=bold color="green" fontcolor="orange" ] "load_stopped_sys3 sys3" [ style=bold color="green" fontcolor="orange" ] +"nfs1:0_monitor_0 sys3" -> "all_stopped" [ style = bold] "nfs1:0_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] +"o2cb:1_monitor_0 sys3" -> "all_stopped" [ style = bold] "o2cb:1_monitor_0 sys3" -> "baseclone_start_0" [ style = bold] "o2cb:1_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] "o2cb:1_start_0 sys3" -> "basegrp:1_running_0" [ style = bold] "o2cb:1_start_0 sys3" -> "iscsi1:1_start_0 sys3" [ style = bold] "o2cb:1_start_0 sys3" [ style=bold color="green" fontcolor="black" ] +"stonithsys2_monitor_0 sys3" -> "all_stopped" [ style = bold] "stonithsys2_monitor_0 sys3" -> "stonithsys2_start_0 sys3" [ style = bold] "stonithsys2_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] "stonithsys2_monitor_15000 sys3" [ style=bold color="green" fontcolor="black" ] "stonithsys2_start_0 sys3" -> "stonithsys2_monitor_15000 sys3" [ style = bold] "stonithsys2_start_0 sys3" [ style=bold color="green" fontcolor="black" ] +"stonithsys3_monitor_0 sys3" -> "all_stopped" [ style = bold] "stonithsys3_monitor_0 sys3" -> "stonithsys3_start_0 sys2" [ style = bold] "stonithsys3_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] "stonithsys3_monitor_15000 sys2" [ style=bold color="green" fontcolor="black" ] @@ -69,18 +78,24 @@ digraph "g" { "stonithsys3_stop_0 sys2" -> "all_stopped" [ style = bold] "stonithsys3_stop_0 sys2" -> "stonithsys3_start_0 sys2" [ style = bold] "stonithsys3_stop_0 sys2" [ style=bold color="green" fontcolor="black" ] +"vg1:1_monitor_0 sys3" -> "all_stopped" [ style = bold] "vg1:1_monitor_0 sys3" -> "baseclone_start_0" [ style = bold] "vg1:1_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] "vg1:1_start_0 sys3" -> "basegrp:1_running_0" [ style = bold] "vg1:1_start_0 sys3" -> "vg2:1_start_0 sys3" [ style = bold] "vg1:1_start_0 sys3" [ style=bold color="green" fontcolor="black" ] +"vg2:1_monitor_0 sys3" -> "all_stopped" [ style = bold] "vg2:1_monitor_0 sys3" -> "baseclone_start_0" [ style = bold] "vg2:1_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] "vg2:1_start_0 sys3" -> "basegrp:1_running_0" [ style = bold] "vg2:1_start_0 sys3" -> "fs2:1_start_0 sys3" [ style = bold] "vg2:1_start_0 sys3" [ style=bold color="green" fontcolor="black" ] +"vm1_monitor_0 sys3" -> "all_stopped" [ style = bold] "vm1_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] +"vm2_monitor_0 sys3" -> "all_stopped" [ style = bold] "vm2_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] +"vm3_monitor_0 sys3" -> "all_stopped" [ style = bold] "vm3_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] +"vm4_monitor_0 sys3" -> "all_stopped" [ style = bold] "vm4_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] } 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 @@ -495,6 +495,51 @@ </action_set> <inputs> <trigger> + <rsc_op id="11" operation="monitor" operation_key="vm1_monitor_0" on_node="sys3" on_node_uuid="sys3"/> + </trigger> + <trigger> + <rsc_op id="12" operation="monitor" operation_key="vm2_monitor_0" on_node="sys3" on_node_uuid="sys3"/> + </trigger> + <trigger> + <rsc_op id="13" operation="monitor" operation_key="vm3_monitor_0" on_node="sys3" on_node_uuid="sys3"/> + </trigger> + <trigger> + <rsc_op id="14" operation="monitor" operation_key="vm4_monitor_0" on_node="sys3" on_node_uuid="sys3"/> + </trigger> + <trigger> + <rsc_op id="15" operation="monitor" operation_key="stonithsys3_monitor_0" on_node="sys3" on_node_uuid="sys3"/> + </trigger> + <trigger> + <rsc_op id="16" operation="monitor" operation_key="controld:1_monitor_0" on_node="sys3" on_node_uuid="sys3"/> + </trigger> + <trigger> + <rsc_op id="17" operation="monitor" operation_key="clvmd:1_monitor_0" on_node="sys3" on_node_uuid="sys3"/> + </trigger> + <trigger> + <rsc_op id="18" operation="monitor" operation_key="o2cb:1_monitor_0" on_node="sys3" on_node_uuid="sys3"/> + </trigger> + <trigger> + <rsc_op id="19" operation="monitor" operation_key="iscsi1:1_monitor_0" on_node="sys3" on_node_uuid="sys3"/> + </trigger> + <trigger> + <rsc_op id="20" operation="monitor" operation_key="iscsi2:1_monitor_0" on_node="sys3" on_node_uuid="sys3"/> + </trigger> + <trigger> + <rsc_op id="21" operation="monitor" operation_key="vg1:1_monitor_0" on_node="sys3" on_node_uuid="sys3"/> + </trigger> + <trigger> + <rsc_op id="22" operation="monitor" operation_key="vg2:1_monitor_0" on_node="sys3" on_node_uuid="sys3"/> + </trigger> + <trigger> + <rsc_op id="23" operation="monitor" operation_key="fs2:1_monitor_0" on_node="sys3" on_node_uuid="sys3"/> + </trigger> + <trigger> + <rsc_op id="24" operation="monitor" operation_key="nfs1:0_monitor_0" on_node="sys3" on_node_uuid="sys3"/> + </trigger> + <trigger> + <rsc_op id="25" operation="monitor" operation_key="stonithsys2_monitor_0" on_node="sys3" on_node_uuid="sys3"/> + </trigger> + <trigger> <rsc_op id="28" operation="stop" operation_key="stonithsys3_stop_0" on_node="sys2" on_node_uuid="sys2"/> </trigger> </inputs> 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 @@ -1,16 +1,22 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"rsc1_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc2_monitor_0 node1" -> "all_stopped" [ style = bold] "rsc2_monitor_0 node1" -> "rsc2_start_0 node1" [ style = bold] "rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc2_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc2_monitor_0 node2" -> "rsc2_start_0 node1" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc3_monitor_0 node1" -> "all_stopped" [ style = bold] "rsc3_monitor_0 node1" -> "rsc3_start_0 node2" [ style = bold] "rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc3_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc3_monitor_0 node2" -> "rsc3_start_0 node2" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc4_monitor_0 node2" -> "all_stopped" [ style = bold] "rsc4_monitor_0 node2" -> "rsc4_start_0 node2" [ style = bold] "rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ] 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 @@ -118,6 +118,24 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="node1"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> + <rsc_op id="5" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> + <rsc_op id="6" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2"/> + </trigger> + <trigger> <rsc_op id="9" operation="stop" operation_key="rsc4_stop_0" on_node="node1" on_node_uuid="node1"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/simple6.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/simple6.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/simple6.dot @@ -3,6 +3,7 @@ "rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "rsc2_start_0 node1" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] +"rsc2_monitor_0 node1" -> "all_stopped" [ style = bold] "rsc2_monitor_0 node1" -> "rsc2_start_0 node1" [ style = bold] "rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node1" [ style=bold color="green" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/simple6.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/simple6.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/simple6.exp @@ -41,6 +41,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="node1"/> + </trigger> + <trigger> <rsc_op id="4" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/start-then-stop-with-unfence.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/start-then-stop-with-unfence.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/start-then-stop-with-unfence.dot @@ -15,11 +15,13 @@ digraph "g" { "jrummy_start_0 rhel7-node1.example.com" -> "jrummy-clone_running_0" [ style = bold] "jrummy_start_0 rhel7-node1.example.com" -> "jrummy_monitor_10000 rhel7-node1.example.com" [ style = bold] "jrummy_start_0 rhel7-node1.example.com" [ style=bold color="green" fontcolor="black"] +"mpath-node1_monitor_0 rhel7-node1.example.com" -> "all_stopped" [ style = bold] "mpath-node1_monitor_0 rhel7-node1.example.com" -> "mpath-node1_start_0 rhel7-node1.example.com" [ style = bold] "mpath-node1_monitor_0 rhel7-node1.example.com" [ style=bold color="green" fontcolor="black"] "mpath-node1_monitor_60000 rhel7-node1.example.com" [ style=bold color="green" fontcolor="black"] "mpath-node1_start_0 rhel7-node1.example.com" -> "mpath-node1_monitor_60000 rhel7-node1.example.com" [ style = bold] "mpath-node1_start_0 rhel7-node1.example.com" [ style=bold color="green" fontcolor="black"] +"mpath-node2_monitor_0 rhel7-node1.example.com" -> "all_stopped" [ style = bold] "mpath-node2_monitor_0 rhel7-node1.example.com" [ style=bold color="green" fontcolor="black"] "stonith 'on' rhel7-node1.example.com" -> "ip1_start_0 rhel7-node1.example.com" [ style = bold] "stonith 'on' rhel7-node1.example.com" -> "jrummy_start_0 rhel7-node1.example.com" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/start-then-stop-with-unfence.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/start-then-stop-with-unfence.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/start-then-stop-with-unfence.exp @@ -161,6 +161,12 @@ </action_set> <inputs> <trigger> + <rsc_op id="8" operation="monitor" operation_key="mpath-node2_monitor_0" on_node="rhel7-node1.example.com" on_node_uuid="1"/> + </trigger> + <trigger> + <rsc_op id="9" operation="monitor" operation_key="mpath-node1_monitor_0" on_node="rhel7-node1.example.com" on_node_uuid="1"/> + </trigger> + <trigger> <rsc_op id="14" operation="stop" operation_key="ip1_stop_0" on_node="rhel7-node2.example.com" on_node_uuid="2"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/stonith-3.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/stonith-3.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/stonith-3.dot @@ -10,11 +10,13 @@ digraph "g" { "grpStonith:0_start_0" -> "grpStonith:0_running_0" [ style = bold] "grpStonith:0_start_0" -> "prmStonith:0_start_0 rh5node2" [ style = bold] "grpStonith:0_start_0" [ style=bold color="green" fontcolor="orange" ] +"prmIpPostgreSQLDB_monitor_0 rh5node2" -> "all_stopped" [ style = bold] "prmIpPostgreSQLDB_monitor_0 rh5node2" -> "prmIpPostgreSQLDB_start_0 rh5node2" [ style = bold] "prmIpPostgreSQLDB_monitor_0 rh5node2" [ style=bold color="green" fontcolor="black" ] "prmIpPostgreSQLDB_monitor_30000 rh5node2" [ style=bold color="green" fontcolor="black" ] "prmIpPostgreSQLDB_start_0 rh5node2" -> "prmIpPostgreSQLDB_monitor_30000 rh5node2" [ style = bold] "prmIpPostgreSQLDB_start_0 rh5node2" [ style=bold color="green" fontcolor="black" ] +"prmStonith:0_monitor_0 rh5node2" -> "all_stopped" [ style = bold] "prmStonith:0_monitor_0 rh5node2" -> "clnStonith_start_0" [ style = bold] "prmStonith:0_monitor_0 rh5node2" [ style=bold color="green" fontcolor="black" ] "prmStonith:0_start_0 rh5node2" -> "grpStonith:0_running_0" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/stonith-3.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/stonith-3.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/stonith-3.exp @@ -147,6 +147,12 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="prmIpPostgreSQLDB_monitor_0" on_node="rh5node2" on_node_uuid="fb62f5f4-015c-466a-8778-7b5c1c5639d6"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="prmStonith:0_monitor_0" on_node="rh5node2" on_node_uuid="fb62f5f4-015c-466a-8778-7b5c1c5639d6"/> + </trigger> + <trigger> <pseudo_event id="19" operation="stonith_complete" operation_key="stonith_complete"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/stonith-4.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/stonith-4.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/stonith-4.dot @@ -1,9 +1,12 @@ digraph "g" { "Fencing_monitor_0 pcmk-11" -> "Fencing_start_0 pcmk-1" [ style = dashed] +"Fencing_monitor_0 pcmk-11" -> "all_stopped" [ style = dashed] "Fencing_monitor_0 pcmk-11" [ style=dashed color="red" fontcolor="black"] "Fencing_monitor_0 pcmk-2" -> "Fencing_start_0 pcmk-1" [ style = dashed] +"Fencing_monitor_0 pcmk-2" -> "all_stopped" [ style = dashed] "Fencing_monitor_0 pcmk-2" [ style=dashed color="red" fontcolor="black"] "Fencing_monitor_0 pcmk-3" -> "Fencing_start_0 pcmk-1" [ style = dashed] +"Fencing_monitor_0 pcmk-3" -> "all_stopped" [ style = dashed] "Fencing_monitor_0 pcmk-3" [ style=dashed color="red" fontcolor="black"] "Fencing_start_0 pcmk-1" [ style=dashed color="red" fontcolor="black"] "all_stopped" -> "Fencing_start_0 pcmk-1" [ style = dashed] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/stop-failure-with-fencing.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/stop-failure-with-fencing.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/stop-failure-with-fencing.dot @@ -1,5 +1,6 @@ digraph "g" { "ClusterIP_monitor_60000 pcmk-1" [ style=dashed color="red" fontcolor="black"] +"Fencing_monitor_0 pcmk-1" -> "all_stopped" [ style = bold] "Fencing_monitor_0 pcmk-1" [ style=bold color="green" fontcolor="black"] "all_stopped" [ style=bold color="green" fontcolor="orange"] "clvm-clone_stop_0" -> "clvm-clone_stopped_0" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealth2.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/systemhealth2.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealth2.dot @@ -1,11 +1,13 @@ digraph "g" { "all_stopped" -> "stonith-1_start_0 hs21c" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"apache_1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "apache_1_monitor_0 hs21c" -> "apache_1_start_0 hs21c" [ style = bold] "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "apache_1_monitor_10000 hs21c" [ style=bold color="green" fontcolor="black" ] "apache_1_start_0 hs21c" -> "apache_1_monitor_10000 hs21c" [ style = bold] "apache_1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] +"nfs_1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "nfs_1_monitor_0 hs21c" -> "nfs_1_start_0 hs21c" [ style = bold] "nfs_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "nfs_1_monitor_20000 hs21c" [ style=bold color="green" fontcolor="black" ] @@ -13,6 +15,7 @@ digraph "g" { "nfs_1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith 'reboot' hs21d" -> "stonith_complete" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] +"stonith-1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "stonith-1_monitor_0 hs21c" -> "stonith-1_start_0 hs21c" [ style = bold] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealth2.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/systemhealth2.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealth2.exp @@ -131,6 +131,15 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="apache_1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="nfs_1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> <pseudo_event id="10" operation="stonith_complete" operation_key="stonith_complete"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealth3.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/systemhealth3.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealth3.dot @@ -1,11 +1,13 @@ digraph "g" { "all_stopped" -> "stonith-1_start_0 hs21c" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"apache_1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "apache_1_monitor_0 hs21c" -> "apache_1_start_0 hs21c" [ style = bold] "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "apache_1_monitor_10000 hs21c" [ style=bold color="green" fontcolor="black" ] "apache_1_start_0 hs21c" -> "apache_1_monitor_10000 hs21c" [ style = bold] "apache_1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] +"nfs_1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "nfs_1_monitor_0 hs21c" -> "nfs_1_start_0 hs21c" [ style = bold] "nfs_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "nfs_1_monitor_20000 hs21c" [ style=bold color="green" fontcolor="black" ] @@ -13,6 +15,7 @@ digraph "g" { "nfs_1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith 'reboot' hs21d" -> "stonith_complete" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] +"stonith-1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "stonith-1_monitor_0 hs21c" -> "stonith-1_start_0 hs21c" [ style = bold] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealth3.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/systemhealth3.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealth3.exp @@ -131,6 +131,15 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="apache_1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="nfs_1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> <pseudo_event id="10" operation="stonith_complete" operation_key="stonith_complete"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealthm2.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/systemhealthm2.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealthm2.dot @@ -1,11 +1,13 @@ digraph "g" { "all_stopped" -> "stonith-1_start_0 hs21c" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"apache_1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "apache_1_monitor_0 hs21c" -> "apache_1_start_0 hs21c" [ style = bold] "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "apache_1_monitor_10000 hs21c" [ style=bold color="green" fontcolor="black" ] "apache_1_start_0 hs21c" -> "apache_1_monitor_10000 hs21c" [ style = bold] "apache_1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] +"nfs_1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "nfs_1_monitor_0 hs21c" -> "nfs_1_start_0 hs21c" [ style = bold] "nfs_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "nfs_1_monitor_20000 hs21c" [ style=bold color="green" fontcolor="black" ] @@ -13,6 +15,7 @@ digraph "g" { "nfs_1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith 'reboot' hs21d" -> "stonith_complete" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] +"stonith-1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "stonith-1_monitor_0 hs21c" -> "stonith-1_start_0 hs21c" [ style = bold] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealthm2.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/systemhealthm2.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealthm2.exp @@ -131,6 +131,15 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="apache_1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="nfs_1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> <pseudo_event id="10" operation="stonith_complete" operation_key="stonith_complete"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealthm3.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/systemhealthm3.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealthm3.dot @@ -1,9 +1,12 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"apache_1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] +"nfs_1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "nfs_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith 'reboot' hs21d" -> "stonith_complete" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] +"stonith-1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealthm3.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/systemhealthm3.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealthm3.exp @@ -57,6 +57,15 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="apache_1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="nfs_1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> <pseudo_event id="5" operation="stonith_complete" operation_key="stonith_complete"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealthn2.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/systemhealthn2.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealthn2.dot @@ -1,11 +1,13 @@ digraph "g" { "all_stopped" -> "stonith-1_start_0 hs21c" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"apache_1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "apache_1_monitor_0 hs21c" -> "apache_1_start_0 hs21c" [ style = bold] "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "apache_1_monitor_10000 hs21c" [ style=bold color="green" fontcolor="black" ] "apache_1_start_0 hs21c" -> "apache_1_monitor_10000 hs21c" [ style = bold] "apache_1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] +"nfs_1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "nfs_1_monitor_0 hs21c" -> "nfs_1_start_0 hs21c" [ style = bold] "nfs_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "nfs_1_monitor_20000 hs21c" [ style=bold color="green" fontcolor="black" ] @@ -13,6 +15,7 @@ digraph "g" { "nfs_1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith 'reboot' hs21d" -> "stonith_complete" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] +"stonith-1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "stonith-1_monitor_0 hs21c" -> "stonith-1_start_0 hs21c" [ style = bold] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealthn2.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/systemhealthn2.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealthn2.exp @@ -131,6 +131,15 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="apache_1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="nfs_1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> <pseudo_event id="10" operation="stonith_complete" operation_key="stonith_complete"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealthn3.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/systemhealthn3.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealthn3.dot @@ -1,11 +1,13 @@ digraph "g" { "all_stopped" -> "stonith-1_start_0 hs21c" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"apache_1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "apache_1_monitor_0 hs21c" -> "apache_1_start_0 hs21c" [ style = bold] "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "apache_1_monitor_10000 hs21c" [ style=bold color="green" fontcolor="black" ] "apache_1_start_0 hs21c" -> "apache_1_monitor_10000 hs21c" [ style = bold] "apache_1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] +"nfs_1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "nfs_1_monitor_0 hs21c" -> "nfs_1_start_0 hs21c" [ style = bold] "nfs_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "nfs_1_monitor_20000 hs21c" [ style=bold color="green" fontcolor="black" ] @@ -13,6 +15,7 @@ digraph "g" { "nfs_1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith 'reboot' hs21d" -> "stonith_complete" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] +"stonith-1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "stonith-1_monitor_0 hs21c" -> "stonith-1_start_0 hs21c" [ style = bold] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealthn3.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/systemhealthn3.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealthn3.exp @@ -131,6 +131,15 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="apache_1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="nfs_1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> <pseudo_event id="10" operation="stonith_complete" operation_key="stonith_complete"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealtho2.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/systemhealtho2.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealtho2.dot @@ -1,9 +1,12 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"apache_1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] +"nfs_1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "nfs_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith 'reboot' hs21d" -> "stonith_complete" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] +"stonith-1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealtho2.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/systemhealtho2.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealtho2.exp @@ -57,6 +57,15 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="apache_1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="nfs_1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> <pseudo_event id="5" operation="stonith_complete" operation_key="stonith_complete"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealtho3.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/systemhealtho3.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealtho3.dot @@ -1,9 +1,12 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"apache_1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] +"nfs_1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "nfs_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith 'reboot' hs21d" -> "stonith_complete" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] +"stonith-1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealtho3.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/systemhealtho3.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealtho3.exp @@ -57,6 +57,15 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="apache_1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="nfs_1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> <pseudo_event id="5" operation="stonith_complete" operation_key="stonith_complete"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealthp2.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/systemhealthp2.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealthp2.dot @@ -1,10 +1,12 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"apache_1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "apache_1_monitor_0 hs21c" -> "apache_1_start_0 hs21c" [ style = bold] "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "apache_1_monitor_10000 hs21c" [ style=bold color="green" fontcolor="black" ] "apache_1_start_0 hs21c" -> "apache_1_monitor_10000 hs21c" [ style = bold] "apache_1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] +"nfs_1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "nfs_1_monitor_0 hs21c" -> "nfs_1_start_0 hs21c" [ style = bold] "nfs_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "nfs_1_monitor_20000 hs21c" [ style=bold color="green" fontcolor="black" ] @@ -12,6 +14,7 @@ digraph "g" { "nfs_1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith 'reboot' hs21d" -> "stonith_complete" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] +"stonith-1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" -> "apache_1_start_0 hs21c" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealthp2.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/systemhealthp2.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealthp2.exp @@ -115,6 +115,15 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="apache_1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="nfs_1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> <pseudo_event id="9" operation="stonith_complete" operation_key="stonith_complete"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealthp3.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/systemhealthp3.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealthp3.dot @@ -1,9 +1,12 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"apache_1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] +"nfs_1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "nfs_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith 'reboot' hs21d" -> "stonith_complete" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] +"stonith-1_monitor_0 hs21c" -> "all_stopped" [ style = bold] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealthp3.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/systemhealthp3.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/systemhealthp3.exp @@ -57,6 +57,15 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="apache_1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="nfs_1_monitor_0" on_node="hs21c" on_node_uuid="c97a3ee5-02d8-4fad-a9fb-a79ae2b35549"/> + </trigger> + <trigger> <pseudo_event id="5" operation="stonith_complete" operation_key="stonith_complete"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/target-1.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/target-1.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/target-1.dot @@ -1,16 +1,28 @@ digraph "g" { +"DcIPaddr_monitor_0 c001n01" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"DcIPaddr_monitor_0 c001n03" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"DcIPaddr_monitor_0 c001n08" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"rsc_c001n01_monitor_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n01_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n01_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n01_monitor_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n01_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_monitor_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_monitor_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n08_monitor_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n08_monitor_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n08_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n08_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_stop_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n08_stop_0 c001n08" [ style=bold color="green" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/target-1.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/target-1.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/target-1.exp @@ -124,6 +124,42 @@ </action_set> <inputs> <trigger> + <rsc_op id="7" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="9" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="11" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="12" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="13" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="14" 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="15" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="16" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="17" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="18" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> <rsc_op id="21" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/target-2.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/target-2.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/target-2.dot @@ -1,19 +1,34 @@ digraph "g" { +"DcIPaddr_monitor_0 c001n01" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"DcIPaddr_monitor_0 c001n03" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"DcIPaddr_monitor_0 c001n08" -> "all_stopped" [ style = bold] "DcIPaddr_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] +"rsc_c001n01_monitor_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n01_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n01_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n01_monitor_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n01_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_monitor_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n02_monitor_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n02_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n03_monitor_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n03_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n03_monitor_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n03_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n03_monitor_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n03_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n08_monitor_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n08_monitor_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n08_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n08_monitor_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_stop_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n08_stop_0 c001n08" [ style=bold color="green" fontcolor="black" ] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/target-2.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/target-2.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/target-2.exp @@ -151,6 +151,51 @@ </action_set> <inputs> <trigger> + <rsc_op id="7" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="9" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="11" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="12" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="13" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="14" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="15" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="16" 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="17" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="18" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="19" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="20" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="21" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> <rsc_op id="24" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/unfence-startup.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/unfence-startup.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/unfence-startup.dot @@ -5,11 +5,13 @@ digraph "g" { "clvmd-clone_start_0" -> "clvmd:1_start_0 virt-2" [ style = bold] "clvmd-clone_start_0" -> "clvmd:2_start_0 virt-3" [ style = bold] "clvmd-clone_start_0" [ style=bold color="green" fontcolor="orange"] +"clvmd:1_monitor_0 virt-2" -> "all_stopped" [ style = bold] "clvmd:1_monitor_0 virt-2" -> "clvmd-clone_start_0" [ style = bold] "clvmd:1_monitor_0 virt-2" [ style=bold color="green" fontcolor="black"] "clvmd:1_start_0 virt-2" -> "clvmd-clone_running_0" [ style = bold] "clvmd:1_start_0 virt-2" -> "clvmd:2_start_0 virt-3" [ style = bold] "clvmd:1_start_0 virt-2" [ style=bold color="green" fontcolor="black"] +"clvmd:2_monitor_0 virt-3" -> "all_stopped" [ style = bold] "clvmd:2_monitor_0 virt-3" -> "clvmd-clone_start_0" [ style = bold] "clvmd:2_monitor_0 virt-3" -> "stonith 'on' virt-3" [ style = bold] "clvmd:2_monitor_0 virt-3" [ style=bold color="green" fontcolor="black"] @@ -20,12 +22,14 @@ digraph "g" { "dlm-clone_start_0" -> "dlm-clone_running_0" [ style = bold] "dlm-clone_start_0" -> "dlm:2_start_0 virt-3" [ style = bold] "dlm-clone_start_0" [ style=bold color="green" fontcolor="orange"] +"dlm:2_monitor_0 virt-3" -> "all_stopped" [ style = bold] "dlm:2_monitor_0 virt-3" -> "dlm-clone_start_0" [ style = bold] "dlm:2_monitor_0 virt-3" -> "stonith 'on' virt-3" [ style = bold] "dlm:2_monitor_0 virt-3" [ style=bold color="green" fontcolor="black"] "dlm:2_start_0 virt-3" -> "clvmd:2_start_0 virt-3" [ style = bold] "dlm:2_start_0 virt-3" -> "dlm-clone_running_0" [ style = bold] "dlm:2_start_0 virt-3" [ style=bold color="green" fontcolor="black"] +"fencing_monitor_0 virt-3" -> "all_stopped" [ style = bold] "fencing_monitor_0 virt-3" [ style=bold color="green" fontcolor="black"] "stonith 'on' virt-3" -> "clvmd:2_start_0 virt-3" [ style = bold] "stonith 'on' virt-3" -> "dlm:2_start_0 virt-3" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/unfence-startup.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/unfence-startup.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/unfence-startup.exp @@ -208,6 +208,18 @@ </action_set> <inputs> <trigger> + <rsc_op id="6" operation="monitor" operation_key="clvmd:1_monitor_0" on_node="virt-2" on_node_uuid="2"/> + </trigger> + <trigger> + <rsc_op id="7" operation="monitor" operation_key="fencing_monitor_0" on_node="virt-3" on_node_uuid="3"/> + </trigger> + <trigger> + <rsc_op id="8" operation="monitor" operation_key="dlm:2_monitor_0" on_node="virt-3" on_node_uuid="3"/> + </trigger> + <trigger> + <rsc_op id="9" operation="monitor" operation_key="clvmd:2_monitor_0" on_node="virt-3" on_node_uuid="3"/> + </trigger> + <trigger> <pseudo_event id="29" operation="stonith_complete" operation_key="stonith_complete"/> </trigger> </inputs> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/unrunnable-1.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/unrunnable-1.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/unrunnable-1.dot @@ -1,4 +1,5 @@ digraph "g" { +"DcIPaddr_monitor_0 c001n03" -> "all_stopped" [ style = dashed] "DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ] "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold] @@ -6,24 +7,37 @@ "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" [ style=dashed color="red" fontcolor="orange"] +"child_192.168.100.181_monitor_0 c001n03" -> "all_stopped" [ style = dashed] "child_192.168.100.181_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_192.168.100.181_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ] +"child_192.168.100.182_monitor_0 c001n03" -> "all_stopped" [ style = dashed] "child_192.168.100.182_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_192.168.100.182_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ] +"child_192.168.100.183_monitor_0 c001n03" -> "all_stopped" [ style = dashed] "child_192.168.100.183_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_192.168.100.183_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ] +"child_DoFencing:1_monitor_0 c001n03" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:1_monitor_0 c001n03" -> "all_stopped" [ style = dashed] "child_DoFencing:1_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = dashed] "child_DoFencing:1_stop_0 c001n02" -> "all_stopped" [ style = dashed] "child_DoFencing:1_stop_0 c001n02" [ style=dashed color="red" fontcolor="black" ] +"child_DoFencing:2_monitor_0 c001n03" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:2_monitor_0 c001n03" -> "all_stopped" [ style = dashed] "child_DoFencing:2_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"child_DoFencing:3_monitor_0 c001n03" -> "DoFencing_stopped_0" [ style = bold] +"child_DoFencing:3_monitor_0 c001n03" -> "all_stopped" [ style = dashed] "child_DoFencing:3_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] +"rsc_c001n01_monitor_0 c001n03" -> "all_stopped" [ style = dashed] "rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ] +"rsc_c001n02_monitor_0 c001n03" -> "all_stopped" [ style = dashed] "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ] +"rsc_c001n03_monitor_0 c001n03" -> "all_stopped" [ style = dashed] "rsc_c001n03_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ] +"rsc_c001n08_monitor_0 c001n03" -> "all_stopped" [ style = dashed] "rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ] } Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-fail3.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-fail3.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-fail3.dot @@ -1,5 +1,6 @@ digraph "g" { "18builder_monitor_0 dvossel-laptop2" -> "18builder_start_0 dvossel-laptop2" [ style = bold] +"18builder_monitor_0 dvossel-laptop2" -> "all_stopped" [ style = bold] "18builder_monitor_0 dvossel-laptop2" [ style=bold color="green" fontcolor="black"] "18builder_monitor_30000 dvossel-laptop2" [ style=bold color="green" fontcolor="black"] "18builder_start_0 dvossel-laptop2" -> "18builder_monitor_30000 dvossel-laptop2" [ style = bold] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-fail3.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-fail3.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-fail3.exp @@ -198,6 +198,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="18builder_monitor_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/> + </trigger> + <trigger> <rsc_op id="4" operation="stop" operation_key="FAKE_stop_0" on_node="dvossel-laptop2" on_node_uuid="24815808"/> </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 @@ -43,12 +43,16 @@ digraph "g" { "lxc-ms_stop_0 lxc1" -> "lxc-ms_start_0 lxc1" [ style = bold] "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" -> "all_stopped" [ style = bold] "lxc1_monitor_0 rhel7-2" -> "lxc1_start_0 rhel7-2" [ style = bold] "lxc1_monitor_0 rhel7-2" [ style=bold color="green" fontcolor="black"] +"lxc1_monitor_0 rhel7-3" -> "all_stopped" [ style = bold] "lxc1_monitor_0 rhel7-3" -> "lxc1_start_0 rhel7-2" [ style = bold] "lxc1_monitor_0 rhel7-3" [ style=bold color="green" fontcolor="black"] +"lxc1_monitor_0 rhel7-4" -> "all_stopped" [ style = bold] "lxc1_monitor_0 rhel7-4" -> "lxc1_start_0 rhel7-2" [ style = bold] "lxc1_monitor_0 rhel7-4" [ style=bold color="green" fontcolor="black"] +"lxc1_monitor_0 rhel7-5" -> "all_stopped" [ style = bold] "lxc1_monitor_0 rhel7-5" -> "lxc1_start_0 rhel7-2" [ style = bold] "lxc1_monitor_0 rhel7-5" [ style=bold color="green" fontcolor="black"] "lxc1_monitor_30000 rhel7-2" [ style=bold color="green" fontcolor="black"] @@ -60,8 +64,12 @@ digraph "g" { "lxc1_stop_0 rhel7-1" -> "container1_stop_0 rhel7-1" [ style = bold] "lxc1_stop_0 rhel7-1" -> "lxc1_start_0 rhel7-2" [ style = bold] "lxc1_stop_0 rhel7-1" [ style=bold color="green" fontcolor="black"] +"lxc2_monitor_0 rhel7-2" -> "all_stopped" [ style = bold] "lxc2_monitor_0 rhel7-2" [ style=bold color="green" fontcolor="black"] +"lxc2_monitor_0 rhel7-3" -> "all_stopped" [ style = bold] "lxc2_monitor_0 rhel7-3" [ style=bold color="green" fontcolor="black"] +"lxc2_monitor_0 rhel7-4" -> "all_stopped" [ style = bold] "lxc2_monitor_0 rhel7-4" [ style=bold color="green" fontcolor="black"] +"lxc2_monitor_0 rhel7-5" -> "all_stopped" [ style = bold] "lxc2_monitor_0 rhel7-5" [ style=bold color="green" fontcolor="black"] } 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 @@ -160,6 +160,12 @@ </action_set> <inputs> <trigger> + <rsc_op id="11" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/> + </trigger> + <trigger> + <rsc_op id="13" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/> + </trigger> + <trigger> <rsc_op id="24" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/> </trigger> <trigger> @@ -230,6 +236,21 @@ </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> + <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> + <trigger> + <rsc_op id="11" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/> + </trigger> + <trigger> + <rsc_op id="12" operation="monitor" operation_key="rsc_hadev3_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/> + </trigger> + <trigger> + <rsc_op id="13" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/> + </trigger> + <trigger> <rsc_op id="14" operation="stop" operation_key="DcIPaddr_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/> </trigger> <trigger> 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 @@ -253,6 +253,18 @@ </action_set> <inputs> <trigger> + <rsc_op id="16" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="17" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="20" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="24" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> <rsc_op id="36" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> </trigger> <trigger> @@ -345,6 +357,45 @@ <rsc_op id="10" operation="stop" operation_key="DcIPaddr_stop_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> </trigger> <trigger> + <rsc_op id="12" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <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="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="15" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="16" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="17" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="18" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="19" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="20" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </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> + <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> + <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> + <trigger> + <rsc_op id="24" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> <rsc_op id="26" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> </trigger> <trigger> 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 @@ -225,6 +225,24 @@ </action_set> <inputs> <trigger> + <rsc_op id="13" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="14" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="15" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="20" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="21" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="25" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> <pseudo_event id="37" operation="stop" operation_key="child_DoFencing:0_stop_0"/> </trigger> <trigger> @@ -275,6 +293,57 @@ </action_set> <inputs> <trigger> + <rsc_op id="9" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="10" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <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="12" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="13" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="14" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="15" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/> + </trigger> + <trigger> + <rsc_op id="16" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="17" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </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="19" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="20" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="21" operation="monitor" operation_key="child_DoFencing:3_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> + <rsc_op id="23" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="24" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="25" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> <pseudo_event id="30" operation="stop" operation_key="rsc_c001n02_stop_0"/> </trigger> <trigger> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/bug-cl-5247.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/bug-cl-5247.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/bug-cl-5247.exp @@ -737,6 +737,12 @@ <rsc_op id="4" operation="stop" operation_key="prmDB2_stop_0" on_node="bl460g8n4" on_node_uuid="3232261400"/> </trigger> <trigger> + <rsc_op id="11" operation="monitor" operation_key="pgsr02_monitor_0" on_node="bl460g8n3" on_node_uuid="3232261399"/> + </trigger> + <trigger> + <rsc_op id="12" operation="monitor" operation_key="pgsr01_monitor_0" on_node="bl460g8n4" on_node_uuid="3232261400"/> + </trigger> + <trigger> <rsc_op id="15" operation="stop" operation_key="prmStonith1-2_stop_0" on_node="bl460g8n4" on_node_uuid="3232261400"/> </trigger> <trigger> 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 @@ -625,6 +625,24 @@ </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="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="7" operation="monitor" operation_key="lxc2_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> + <rsc_op id="9" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-5" on_node_uuid="3"/> + </trigger> + <trigger> <rsc_op id="10" operation="stop" operation_key="Fencing_stop_0" on_node="rhel7-4" on_node_uuid="5"/> </trigger> <trigger> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/master-7.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/master-7.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/master-7.exp @@ -393,6 +393,18 @@ </action_set> <inputs> <trigger> + <rsc_op id="18" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="22" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="23" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="27" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> <pseudo_event id="59" operation="stop" operation_key="child_DoFencing:0_stop_0"/> </trigger> <trigger> @@ -572,6 +584,33 @@ </action_set> <inputs> <trigger> + <rsc_op id="19" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="20" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="21" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="24" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="25" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="26" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="28" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="29" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="30" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> <pseudo_event id="71" operation="stop" operation_key="ocf_msdummy:0_stop_0"/> </trigger> <trigger> @@ -628,6 +667,45 @@ </action_set> <inputs> <trigger> + <rsc_op id="18" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="19" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="20" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="21" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="22" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="23" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="24" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="25" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="26" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="27" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="28" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="29" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="30" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> <pseudo_event id="31" operation="stop" operation_key="DcIPaddr_stop_0"/> </trigger> <trigger> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/master-8.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/master-8.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/master-8.exp @@ -393,6 +393,18 @@ </action_set> <inputs> <trigger> + <rsc_op id="17" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="21" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="22" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="27" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> <pseudo_event id="59" operation="stop" operation_key="child_DoFencing:0_stop_0"/> </trigger> <trigger> @@ -601,6 +613,36 @@ </action_set> <inputs> <trigger> + <rsc_op id="18" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="19" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="20" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="23" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="24" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="25" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="26" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="28" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="29" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="30" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> <pseudo_event id="71" operation="stop" operation_key="ocf_msdummy:0_stop_0"/> </trigger> <trigger> @@ -714,6 +756,48 @@ </action_set> <inputs> <trigger> + <rsc_op id="17" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="18" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="19" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="20" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/> + </trigger> + <trigger> + <rsc_op id="21" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="22" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="23" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="24" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="25" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="26" operation="monitor" operation_key="ocf_msdummy:7_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="27" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="28" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="29" operation="monitor" operation_key="ocf_msdummy:5_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> + <rsc_op id="30" operation="monitor" operation_key="ocf_msdummy:6_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/> + </trigger> + <trigger> <pseudo_event id="31" operation="stop" operation_key="DcIPaddr_stop_0"/> </trigger> <trigger> 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 @@ -32,6 +32,12 @@ </action_set> <inputs> <trigger> + <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0"/> </trigger> <trigger> @@ -117,6 +123,9 @@ </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="8" operation="stop" operation_key="rsc2_stop_0"/> </trigger> <trigger> @@ -245,6 +254,15 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0"/> </trigger> <trigger> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-15.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/rec-node-15.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/rec-node-15.exp @@ -468,6 +468,12 @@ </action_set> <inputs> <trigger> + <rsc_op id="8" operation="monitor" operation_key="stonith-1_monitor_0" on_node="sapcl01" on_node_uuid="85180fd0-70c9-4136-a5e0-90d89ea6079d"/> + </trigger> + <trigger> + <rsc_op id="9" operation="monitor" operation_key="stonith-1_monitor_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/> + </trigger> + <trigger> <rsc_op id="21" operation="stop" operation_key="IPaddr_192_168_1_102_stop_0" on_node="sapcl02" on_node_uuid="09fa194c-d7e1-41fa-a0d0-afd79a139181"/> </trigger> <trigger> 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 @@ -135,6 +135,15 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0"/> </trigger> <trigger> 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 @@ -135,6 +135,15 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0"/> </trigger> <trigger> 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 @@ -135,6 +135,15 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="uuid2"/> + </trigger> + <trigger> <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0"/> </trigger> <trigger> 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 @@ -135,6 +135,15 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="stonith-1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> + <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_0" on_node="node1" on_node_uuid="uuid1"/> + </trigger> + <trigger> <pseudo_event id="6" operation="stop" operation_key="rsc1_stop_0"/> </trigger> <trigger> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/stop-failure-with-fencing.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/stop-failure-with-fencing.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/stop-failure-with-fencing.exp @@ -81,6 +81,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="Fencing_monitor_0" on_node="pcmk-1" on_node_uuid="101"/> + </trigger> + <trigger> <pseudo_event id="9" operation="stop" operation_key="clvm_stop_0" internal_operation_key="clvm:0_stop_0"/> </trigger> <trigger> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/unfence-startup.summary =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/unfence-startup.summary +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/unfence-startup.summary @@ -26,11 +26,11 @@ Executing cluster transition: * Fencing virt-4 (reboot) * Pseudo action: stonith_complete * Fencing virt-3 (on) - * Pseudo action: all_stopped * Resource action: fencing monitor on virt-3 * Resource action: dlm start on virt-3 * Pseudo action: dlm-clone_running_0 * Pseudo action: clvmd-clone_start_0 + * Pseudo action: all_stopped * Resource action: clvmd start on virt-2 * Resource action: clvmd start on virt-3 * Pseudo action: clvmd-clone_running_0 Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/unrunnable-1.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/unrunnable-1.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/unrunnable-1.exp @@ -106,6 +106,15 @@ </action_set> <inputs> <trigger> + <rsc_op id="11" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="12" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> + <rsc_op id="13" operation="monitor" operation_key="child_DoFencing:3_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/> + </trigger> + <trigger> <pseudo_event id="39" operation="stop" operation_key="DoFencing_stop_0"/> </trigger> </inputs> 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 @@ -351,6 +351,30 @@ </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="27" operation="monitor" operation_key="lxc2_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="29" operation="monitor" operation_key="lxc2_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="31" operation="monitor" operation_key="lxc2_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="33" operation="monitor" operation_key="lxc2_monitor_0" on_node="rhel7-5" on_node_uuid="3"/> + </trigger> + <trigger> <rsc_op id="98" operation="stop" operation_key="container1_stop_0" on_node="rhel7-1" on_node_uuid="1"/> </trigger> <trigger> Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-unexpectedly-running.dot =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-unexpectedly-running.dot +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-unexpectedly-running.dot @@ -9,6 +9,7 @@ "FAKE_stop_0 18builder" [ style=bold color="green" fontcolor="black"] "all_stopped" -> "remote1_start_0 18builder" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange"] +"remote1_monitor_0 18builder" -> "all_stopped" [ style = bold] "remote1_monitor_0 18builder" -> "remote1_start_0 18builder" [ style = bold] "remote1_monitor_0 18builder" [ style=bold color="green" fontcolor="black"] "remote1_monitor_30000 18builder" [ style=bold color="green" fontcolor="black"] Index: pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-unexpectedly-running.exp =================================================================== --- pacemaker-1.1.16+20170320.77ea74d.orig/pengine/test10/whitebox-unexpectedly-running.exp +++ pacemaker-1.1.16+20170320.77ea74d/pengine/test10/whitebox-unexpectedly-running.exp @@ -110,6 +110,9 @@ </action_set> <inputs> <trigger> + <rsc_op id="2" operation="monitor" operation_key="remote1_monitor_0" on_node="18builder" on_node_uuid="5"/> + </trigger> + <trigger> <rsc_op id="3" operation="stop" operation_key="FAKE_stop_0" on_node="18builder" on_node_uuid="5"/> </trigger> <trigger>
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
