commit dfcfb5f354e6df601878ce6fbcc4ef7baaf8a969 Author: Andrew Beekhof Date: Wed Apr 2 15:30:45 2014 +1100 Test: PE: Include stonith operation in .dot graph regression test results (cherry picked from commit c1fb74e4a3fd39ee94182bfd6f26634cc7bdcdca) Conflicts: pengine/test10/bug-5186-partial-migrate.dot pengine/test10/remote-fence-unclean.dot diff --git a/pengine/test10/594.dot b/pengine/test10/594.dot index 0e7a507..9e38bc6 100644 --- a/pengine/test10/594.dot +++ b/pengine/test10/594.dot @@ -45,8 +45,8 @@ digraph "g" { "rsc_hadev2_stop_0 hadev2" [ style=bold color="green" fontcolor="black" ] "rsc_hadev3_monitor_0 hadev2" -> "probe_complete hadev2" [ style = bold] "rsc_hadev3_monitor_0 hadev2" [ style=bold color="green" fontcolor="black" ] -"stonith hadev3" -> "stonith_complete" [ style = bold] -"stonith hadev3" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' hadev3" -> "stonith_complete" [ style = bold] +"stonith 'reboot' hadev3" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "DcIPaddr_start_0 hadev1" [ style = bold] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" -> "rsc_hadev2_start_0 hadev1" [ style = bold] diff --git a/pengine/test10/829.dot b/pengine/test10/829.dot index cb41eda..85873cf 100644 --- a/pengine/test10/829.dot +++ b/pengine/test10/829.dot @@ -57,11 +57,11 @@ digraph "g" { "rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold] "rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] -"stonith c001n02" -> "DoFencing_stop_0" [ style = bold] -"stonith c001n02" -> "child_DoFencing:0_stop_0 c001n02" [ style = bold] -"stonith c001n02" -> "rsc_c001n02_stop_0 c001n02" [ style = bold] -"stonith c001n02" -> "stonith_complete" [ style = bold] -"stonith c001n02" [ 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] +"stonith 'reboot' c001n02" -> "rsc_c001n02_stop_0 c001n02" [ style = bold] +"stonith 'reboot' c001n02" -> "stonith_complete" [ style = bold] +"stonith 'reboot' c001n02" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" -> "rsc_c001n02_start_0 c001n01" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange" ] diff --git a/pengine/test10/bug-lf-2508.dot b/pengine/test10/bug-lf-2508.dot index 918e4fa..6bef312 100644 --- a/pengine/test10/bug-lf-2508.dot +++ b/pengine/test10/bug-lf-2508.dot @@ -91,19 +91,19 @@ digraph "g" { "prmStonith4-3:1_stop_0 srv02" -> "grpStonith4:1_stopped_0" [ style = bold] "prmStonith4-3:1_stop_0 srv02" -> "prmStonith4-1:1_stop_0 srv02" [ style = bold] "prmStonith4-3:1_stop_0 srv02" [ style=bold color="green" fontcolor="orange"] -"stonith srv02" -> "Dummy02_stop_0 srv02" [ style = bold] -"stonith srv02" -> "Group02_stop_0" [ style = bold] -"stonith srv02" -> "clnStonith1_stop_0" [ style = bold] -"stonith srv02" -> "clnStonith3_stop_0" [ style = bold] -"stonith srv02" -> "clnStonith4_stop_0" [ style = bold] -"stonith srv02" -> "prmStonith1-1:1_stop_0 srv02" [ style = bold] -"stonith srv02" -> "prmStonith1-3:1_stop_0 srv02" [ style = bold] -"stonith srv02" -> "prmStonith3-1:1_stop_0 srv02" [ style = bold] -"stonith srv02" -> "prmStonith3-3:1_stop_0 srv02" [ style = bold] -"stonith srv02" -> "prmStonith4-1:1_stop_0 srv02" [ style = bold] -"stonith srv02" -> "prmStonith4-3:1_stop_0 srv02" [ style = bold] -"stonith srv02" -> "stonith_complete" [ style = bold] -"stonith srv02" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' srv02" -> "Dummy02_stop_0 srv02" [ style = bold] +"stonith 'reboot' srv02" -> "Group02_stop_0" [ style = bold] +"stonith 'reboot' srv02" -> "clnStonith1_stop_0" [ style = bold] +"stonith 'reboot' srv02" -> "clnStonith3_stop_0" [ style = bold] +"stonith 'reboot' srv02" -> "clnStonith4_stop_0" [ style = bold] +"stonith 'reboot' srv02" -> "prmStonith1-1:1_stop_0 srv02" [ style = bold] +"stonith 'reboot' srv02" -> "prmStonith1-3:1_stop_0 srv02" [ style = bold] +"stonith 'reboot' srv02" -> "prmStonith3-1:1_stop_0 srv02" [ style = bold] +"stonith 'reboot' srv02" -> "prmStonith3-3:1_stop_0 srv02" [ style = bold] +"stonith 'reboot' srv02" -> "prmStonith4-1:1_stop_0 srv02" [ style = bold] +"stonith 'reboot' srv02" -> "prmStonith4-3:1_stop_0 srv02" [ style = bold] +"stonith 'reboot' srv02" -> "stonith_complete" [ style = bold] +"stonith 'reboot' srv02" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "Dummy01_start_0 srv01" [ style = bold] "stonith_complete" -> "Dummy02_start_0 srv04" [ style = bold] "stonith_complete" -> "all_stopped" [ style = bold] diff --git a/pengine/test10/bug-lf-2551.dot b/pengine/test10/bug-lf-2551.dot index b4a69db..3225e00 100644 --- a/pengine/test10/bug-lf-2551.dot +++ b/pengine/test10/bug-lf-2551.dot @@ -51,33 +51,33 @@ digraph "g" { "ocfs2-1:3_stop_0 hex-9" -> "base-group:3_stopped_0" [ style = bold] "ocfs2-1:3_stop_0 hex-9" -> "vg1:3_stop_0 hex-9" [ style = bold] "ocfs2-1:3_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ] -"stonith hex-9" -> "base-clone_stop_0" [ style = bold] -"stonith hex-9" -> "clvm:3_stop_0 hex-9" [ style = bold] -"stonith hex-9" -> "cmirrord:3_stop_0 hex-9" [ style = bold] -"stonith hex-9" -> "dlm:3_stop_0 hex-9" [ style = bold] -"stonith hex-9" -> "dummy1_stop_0 hex-9" [ style = bold] -"stonith hex-9" -> "fencing-sbd_stop_0 hex-9" [ style = bold] -"stonith hex-9" -> "o2cb:3_stop_0 hex-9" [ style = bold] -"stonith hex-9" -> "ocfs2-1:3_stop_0 hex-9" [ style = bold] -"stonith hex-9" -> "stonith_complete" [ style = bold] -"stonith hex-9" -> "vg1:3_stop_0 hex-9" [ style = bold] -"stonith hex-9" -> "vm-03_stop_0 hex-9" [ style = bold] -"stonith hex-9" -> "vm-06_stop_0 hex-9" [ style = bold] -"stonith hex-9" -> "vm-09_stop_0 hex-9" [ style = bold] -"stonith hex-9" -> "vm-13_stop_0 hex-9" [ style = bold] -"stonith hex-9" -> "vm-17_stop_0 hex-9" [ style = bold] -"stonith hex-9" -> "vm-21_stop_0 hex-9" [ style = bold] -"stonith hex-9" -> "vm-25_stop_0 hex-9" [ style = bold] -"stonith hex-9" -> "vm-29_stop_0 hex-9" [ style = bold] -"stonith hex-9" -> "vm-33_stop_0 hex-9" [ style = bold] -"stonith hex-9" -> "vm-37_stop_0 hex-9" [ style = bold] -"stonith hex-9" -> "vm-41_stop_0 hex-9" [ style = bold] -"stonith hex-9" -> "vm-45_stop_0 hex-9" [ style = bold] -"stonith hex-9" -> "vm-49_stop_0 hex-9" [ style = bold] -"stonith hex-9" -> "vm-53_stop_0 hex-9" [ style = bold] -"stonith hex-9" -> "vm-57_stop_0 hex-9" [ style = bold] -"stonith hex-9" -> "vm-61_stop_0 hex-9" [ style = bold] -"stonith hex-9" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' hex-9" -> "base-clone_stop_0" [ style = bold] +"stonith 'reboot' hex-9" -> "clvm:3_stop_0 hex-9" [ style = bold] +"stonith 'reboot' hex-9" -> "cmirrord:3_stop_0 hex-9" [ style = bold] +"stonith 'reboot' hex-9" -> "dlm:3_stop_0 hex-9" [ style = bold] +"stonith 'reboot' hex-9" -> "dummy1_stop_0 hex-9" [ style = bold] +"stonith 'reboot' hex-9" -> "fencing-sbd_stop_0 hex-9" [ style = bold] +"stonith 'reboot' hex-9" -> "o2cb:3_stop_0 hex-9" [ style = bold] +"stonith 'reboot' hex-9" -> "ocfs2-1:3_stop_0 hex-9" [ style = bold] +"stonith 'reboot' hex-9" -> "stonith_complete" [ style = bold] +"stonith 'reboot' hex-9" -> "vg1:3_stop_0 hex-9" [ style = bold] +"stonith 'reboot' hex-9" -> "vm-03_stop_0 hex-9" [ style = bold] +"stonith 'reboot' hex-9" -> "vm-06_stop_0 hex-9" [ style = bold] +"stonith 'reboot' hex-9" -> "vm-09_stop_0 hex-9" [ style = bold] +"stonith 'reboot' hex-9" -> "vm-13_stop_0 hex-9" [ style = bold] +"stonith 'reboot' hex-9" -> "vm-17_stop_0 hex-9" [ style = bold] +"stonith 'reboot' hex-9" -> "vm-21_stop_0 hex-9" [ style = bold] +"stonith 'reboot' hex-9" -> "vm-25_stop_0 hex-9" [ style = bold] +"stonith 'reboot' hex-9" -> "vm-29_stop_0 hex-9" [ style = bold] +"stonith 'reboot' hex-9" -> "vm-33_stop_0 hex-9" [ style = bold] +"stonith 'reboot' hex-9" -> "vm-37_stop_0 hex-9" [ style = bold] +"stonith 'reboot' hex-9" -> "vm-41_stop_0 hex-9" [ style = bold] +"stonith 'reboot' hex-9" -> "vm-45_stop_0 hex-9" [ style = bold] +"stonith 'reboot' hex-9" -> "vm-49_stop_0 hex-9" [ style = bold] +"stonith 'reboot' hex-9" -> "vm-53_stop_0 hex-9" [ style = bold] +"stonith 'reboot' hex-9" -> "vm-57_stop_0 hex-9" [ style = bold] +"stonith 'reboot' hex-9" -> "vm-61_stop_0 hex-9" [ style = bold] +"stonith 'reboot' hex-9" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" -> "dummy1_start_0 hex-0" [ style = bold] "stonith_complete" -> "fencing-sbd_start_0 hex-0" [ style = bold] diff --git a/pengine/test10/bug-lf-2606.dot b/pengine/test10/bug-lf-2606.dot index 403dc1e..612bd02 100644 --- a/pengine/test10/bug-lf-2606.dot +++ b/pengine/test10/bug-lf-2606.dot @@ -24,13 +24,13 @@ digraph "g" { "rsc3:1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc3:1_stop_0 node2" -> "ms3_stopped_0" [ style = bold] "rsc3:1_stop_0 node2" [ style=bold color="green" fontcolor="orange"] -"stonith node2" -> "ms3_stop_0" [ style = bold] -"stonith node2" -> "rsc1_stop_0 node2" [ style = bold] -"stonith node2" -> "rsc2_stop_0 node2" [ style = bold] -"stonith node2" -> "rsc3:1_demote_0 node2" [ style = bold] -"stonith node2" -> "rsc3:1_stop_0 node2" [ style = bold] -"stonith node2" -> "stonith_complete" [ style = bold] -"stonith node2" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' node2" -> "ms3_stop_0" [ style = bold] +"stonith 'reboot' node2" -> "rsc1_stop_0 node2" [ style = bold] +"stonith 'reboot' node2" -> "rsc2_stop_0 node2" [ style = bold] +"stonith 'reboot' node2" -> "rsc3:1_demote_0 node2" [ style = bold] +"stonith 'reboot' node2" -> "rsc3:1_stop_0 node2" [ style = bold] +"stonith 'reboot' node2" -> "stonith_complete" [ style = bold] +"stonith 'reboot' node2" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" -> "rsc2_start_0 node1" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange"] diff --git a/pengine/test10/interleave-pseudo-stop.dot b/pengine/test10/interleave-pseudo-stop.dot index 8c3ddd3..5b3d272 100644 --- a/pengine/test10/interleave-pseudo-stop.dot +++ b/pengine/test10/interleave-pseudo-stop.dot @@ -91,19 +91,19 @@ digraph "g" { "imagestorecloneset_stop_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_stopped_0" -> "imagestorecloneset_post_notify_stopped_0" [ style = bold] "imagestorecloneset_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"stonith node1" -> "configstoreclone:0_post_notify_stonith_0" [ style = bold] -"stonith node1" -> "configstoreclone:0_stop_0 node1" [ style = bold] -"stonith node1" -> "configstorecloneset_stop_0" [ style = bold] -"stonith node1" -> "evmsclone:0_post_notify_stonith_0" [ style = bold] -"stonith node1" -> "evmsclone:0_stop_0 node1" [ style = bold] -"stonith node1" -> "evmscloneset_stop_0" [ style = bold] -"stonith node1" -> "imagestoreclone:0_post_notify_stonith_0" [ style = bold] -"stonith node1" -> "imagestoreclone:0_stop_0 node1" [ style = bold] -"stonith node1" -> "imagestorecloneset_stop_0" [ style = bold] -"stonith node1" -> "stonith_complete" [ style = bold] -"stonith node1" -> "stonithclone:0_stop_0 node1" [ style = bold] -"stonith node1" -> "stonithcloneset_stop_0" [ style = bold] -"stonith node1" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' node1" -> "configstoreclone:0_post_notify_stonith_0" [ style = bold] +"stonith 'reboot' node1" -> "configstoreclone:0_stop_0 node1" [ style = bold] +"stonith 'reboot' node1" -> "configstorecloneset_stop_0" [ style = bold] +"stonith 'reboot' node1" -> "evmsclone:0_post_notify_stonith_0" [ style = bold] +"stonith 'reboot' node1" -> "evmsclone:0_stop_0 node1" [ style = bold] +"stonith 'reboot' node1" -> "evmscloneset_stop_0" [ style = bold] +"stonith 'reboot' node1" -> "imagestoreclone:0_post_notify_stonith_0" [ style = bold] +"stonith 'reboot' node1" -> "imagestoreclone:0_stop_0 node1" [ style = bold] +"stonith 'reboot' node1" -> "imagestorecloneset_stop_0" [ style = bold] +"stonith 'reboot' node1" -> "stonith_complete" [ style = bold] +"stonith 'reboot' node1" -> "stonithclone:0_stop_0 node1" [ style = bold] +"stonith 'reboot' node1" -> "stonithcloneset_stop_0" [ style = bold] +"stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange" ] "stonithclone:0_stop_0 node1" -> "all_stopped" [ style = bold] diff --git a/pengine/test10/master-7.dot b/pengine/test10/master-7.dot index ae5e08e..61b0f1c 100644 --- a/pengine/test10/master-7.dot +++ b/pengine/test10/master-7.dot @@ -127,16 +127,16 @@ digraph "g" { "rsc_c001n01_stop_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n03" [ style = bold] "rsc_c001n01_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ] -"stonith c001n01" -> "DcIPaddr_stop_0 c001n01" [ style = bold] -"stonith c001n01" -> "DoFencing_stop_0" [ style = bold] -"stonith c001n01" -> "child_DoFencing:0_stop_0 c001n01" [ style = bold] -"stonith c001n01" -> "master_rsc_1_stop_0" [ style = bold] -"stonith c001n01" -> "ocf_msdummy:0_demote_0 c001n01" [ style = bold] -"stonith c001n01" -> "ocf_msdummy:0_stop_0 c001n01" [ style = bold] -"stonith c001n01" -> "ocf_msdummy:4_stop_0 c001n01" [ style = bold] -"stonith c001n01" -> "rsc_c001n01_stop_0 c001n01" [ style = bold] -"stonith c001n01" -> "stonith_complete" [ style = bold] -"stonith c001n01" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' c001n01" -> "DcIPaddr_stop_0 c001n01" [ style = bold] +"stonith 'reboot' c001n01" -> "DoFencing_stop_0" [ style = bold] +"stonith 'reboot' c001n01" -> "child_DoFencing:0_stop_0 c001n01" [ style = bold] +"stonith 'reboot' c001n01" -> "master_rsc_1_stop_0" [ style = bold] +"stonith 'reboot' c001n01" -> "ocf_msdummy:0_demote_0 c001n01" [ style = bold] +"stonith 'reboot' c001n01" -> "ocf_msdummy:0_stop_0 c001n01" [ style = bold] +"stonith 'reboot' c001n01" -> "ocf_msdummy:4_stop_0 c001n01" [ style = bold] +"stonith 'reboot' c001n01" -> "rsc_c001n01_stop_0 c001n01" [ style = bold] +"stonith 'reboot' c001n01" -> "stonith_complete" [ style = bold] +"stonith 'reboot' c001n01" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "DcIPaddr_start_0 c001n03" [ style = bold] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold] diff --git a/pengine/test10/master-8.dot b/pengine/test10/master-8.dot index a6ed1f6..70be8f1 100644 --- a/pengine/test10/master-8.dot +++ b/pengine/test10/master-8.dot @@ -137,15 +137,15 @@ digraph "g" { "rsc_c001n01_stop_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n03" [ style = bold] "rsc_c001n01_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ] -"stonith c001n01" -> "DcIPaddr_stop_0 c001n01" [ style = bold] -"stonith c001n01" -> "DoFencing_stop_0" [ style = bold] -"stonith c001n01" -> "child_DoFencing:0_stop_0 c001n01" [ style = bold] -"stonith c001n01" -> "master_rsc_1_stop_0" [ style = bold] -"stonith c001n01" -> "ocf_msdummy:0_demote_0 c001n01" [ style = bold] -"stonith c001n01" -> "ocf_msdummy:0_stop_0 c001n01" [ style = bold] -"stonith c001n01" -> "rsc_c001n01_stop_0 c001n01" [ style = bold] -"stonith c001n01" -> "stonith_complete" [ style = bold] -"stonith c001n01" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' c001n01" -> "DcIPaddr_stop_0 c001n01" [ style = bold] +"stonith 'reboot' c001n01" -> "DoFencing_stop_0" [ style = bold] +"stonith 'reboot' c001n01" -> "child_DoFencing:0_stop_0 c001n01" [ style = bold] +"stonith 'reboot' c001n01" -> "master_rsc_1_stop_0" [ style = bold] +"stonith 'reboot' c001n01" -> "ocf_msdummy:0_demote_0 c001n01" [ style = bold] +"stonith 'reboot' c001n01" -> "ocf_msdummy:0_stop_0 c001n01" [ style = bold] +"stonith 'reboot' c001n01" -> "rsc_c001n01_stop_0 c001n01" [ style = bold] +"stonith 'reboot' c001n01" -> "stonith_complete" [ style = bold] +"stonith 'reboot' c001n01" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "DcIPaddr_start_0 c001n03" [ style = bold] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold] diff --git a/pengine/test10/migrate-fencing.dot b/pengine/test10/migrate-fencing.dot index 8dd3e3a..1aa8d3c 100644 --- a/pengine/test10/migrate-fencing.dot +++ b/pengine/test10/migrate-fencing.dot @@ -107,21 +107,21 @@ digraph "g" { "stateful-1:1_promote_0 pcmk-1" [ style=bold color="green" fontcolor="black" ] "stateful-1:2_monitor_15000 pcmk-2" [ style=bold color="green" fontcolor="black" ] "stateful-1:3_monitor_15000 pcmk-3" [ style=bold color="green" fontcolor="black" ] -"stonith pcmk-4" -> "Connectivity_stop_0" [ style = bold] -"stonith pcmk-4" -> "FencingChild:0_stop_0 pcmk-4" [ style = bold] -"stonith pcmk-4" -> "Fencing_stop_0" [ style = bold] -"stonith pcmk-4" -> "group-1_stop_0" [ style = bold] -"stonith pcmk-4" -> "lsb-dummy_stop_0 pcmk-4" [ style = bold] -"stonith pcmk-4" -> "master-1_stop_0" [ style = bold] -"stonith pcmk-4" -> "ping-1:0_stop_0 pcmk-4" [ style = bold] -"stonith pcmk-4" -> "r192.168.101.181_stop_0 pcmk-4" [ style = bold] -"stonith pcmk-4" -> "r192.168.101.182_stop_0 pcmk-4" [ style = bold] -"stonith pcmk-4" -> "r192.168.101.183_stop_0 pcmk-4" [ style = bold] -"stonith pcmk-4" -> "rsc_pcmk-4_stop_0 pcmk-4" [ style = bold] -"stonith pcmk-4" -> "stateful-1:0_demote_0 pcmk-4" [ style = bold] -"stonith pcmk-4" -> "stateful-1:0_stop_0 pcmk-4" [ style = bold] -"stonith pcmk-4" -> "stonith_complete" [ style = bold] -"stonith pcmk-4" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' pcmk-4" -> "Connectivity_stop_0" [ style = bold] +"stonith 'reboot' pcmk-4" -> "FencingChild:0_stop_0 pcmk-4" [ style = bold] +"stonith 'reboot' pcmk-4" -> "Fencing_stop_0" [ style = bold] +"stonith 'reboot' pcmk-4" -> "group-1_stop_0" [ style = bold] +"stonith 'reboot' pcmk-4" -> "lsb-dummy_stop_0 pcmk-4" [ style = bold] +"stonith 'reboot' pcmk-4" -> "master-1_stop_0" [ style = bold] +"stonith 'reboot' pcmk-4" -> "ping-1:0_stop_0 pcmk-4" [ style = bold] +"stonith 'reboot' pcmk-4" -> "r192.168.101.181_stop_0 pcmk-4" [ style = bold] +"stonith 'reboot' pcmk-4" -> "r192.168.101.182_stop_0 pcmk-4" [ style = bold] +"stonith 'reboot' pcmk-4" -> "r192.168.101.183_stop_0 pcmk-4" [ style = bold] +"stonith 'reboot' pcmk-4" -> "rsc_pcmk-4_stop_0 pcmk-4" [ style = bold] +"stonith 'reboot' pcmk-4" -> "stateful-1:0_demote_0 pcmk-4" [ style = bold] +"stonith 'reboot' pcmk-4" -> "stateful-1:0_stop_0 pcmk-4" [ style = bold] +"stonith 'reboot' pcmk-4" -> "stonith_complete" [ style = bold] +"stonith 'reboot' pcmk-4" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" -> "lsb-dummy_start_0 pcmk-1" [ style = bold] "stonith_complete" -> "migrator_migrate_to_0 pcmk-1" [ style = bold] diff --git a/pengine/test10/rec-node-11.dot b/pengine/test10/rec-node-11.dot index d78cf6b..2865f41 100644 --- a/pengine/test10/rec-node-11.dot +++ b/pengine/test10/rec-node-11.dot @@ -44,11 +44,11 @@ digraph "g" { "rsc3_stop_0 node2" -> "all_stopped" [ style = bold] "rsc3_stop_0 node2" -> "rsc3_start_0 node2" [ style = bold] "rsc3_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"stonith node1" -> "group1_stop_0" [ style = bold] -"stonith node1" -> "rsc1_stop_0 node1" [ style = bold] -"stonith node1" -> "rsc2_stop_0 node1" [ style = bold] -"stonith node1" -> "stonith_complete" [ style = bold] -"stonith node1" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' node1" -> "group1_stop_0" [ style = bold] +"stonith 'reboot' node1" -> "rsc1_stop_0 node1" [ style = bold] +"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" -> "probe_complete 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" ] diff --git a/pengine/test10/rec-node-12.dot b/pengine/test10/rec-node-12.dot index 5f79a9a..8275a2e 100644 --- a/pengine/test10/rec-node-12.dot +++ b/pengine/test10/rec-node-12.dot @@ -105,8 +105,8 @@ digraph "g" { "rsc_c001n08_monitor_5000 c001n08" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_start_0 c001n08" -> "rsc_c001n08_monitor_5000 c001n08" [ style = bold] "rsc_c001n08_start_0 c001n08" [ style=bold color="green" fontcolor="black" ] -"stonith c001n02" -> "stonith_complete" [ style = bold] -"stonith c001n02" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' c001n02" -> "stonith_complete" [ style = bold] +"stonith 'reboot' c001n02" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "DcIPaddr_start_0 c001n08" [ style = bold] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" -> "rsc_c001n01_start_0 c001n01" [ style = bold] diff --git a/pengine/test10/rec-node-13.dot b/pengine/test10/rec-node-13.dot index 9a55e66..094c241 100644 --- a/pengine/test10/rec-node-13.dot +++ b/pengine/test10/rec-node-13.dot @@ -7,10 +7,10 @@ "ocf_msdummy:6_stop_0 c001n04" -> "all_stopped" [ style = bold] "ocf_msdummy:6_stop_0 c001n04" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:6_stop_0 c001n04" [ style=bold color="green" fontcolor="orange" ] -"stonith c001n04" -> "master_rsc_1_stop_0" [ style = bold] -"stonith c001n04" -> "ocf_msdummy:6_stop_0 c001n04" [ style = bold] -"stonith c001n04" -> "stonith_complete" [ style = bold] -"stonith c001n04" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' c001n04" -> "master_rsc_1_stop_0" [ style = bold] +"stonith 'reboot' c001n04" -> "ocf_msdummy:6_stop_0 c001n04" [ style = bold] +"stonith 'reboot' c001n04" -> "stonith_complete" [ style = bold] +"stonith 'reboot' c001n04" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/rec-node-14.dot b/pengine/test10/rec-node-14.dot index 6f5956c..395fa89 100644 --- a/pengine/test10/rec-node-14.dot +++ b/pengine/test10/rec-node-14.dot @@ -1,11 +1,11 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] -"stonith node1" -> "stonith node3" [ style = bold] -"stonith node1" [ style=bold color="green" fontcolor="black" ] -"stonith node2" [ style=bold color="green" fontcolor="black" ] -"stonith node3" -> "stonith node2" [ style = bold] -"stonith node3" -> "stonith_complete" [ style = bold] -"stonith node3" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' node1" -> "stonith 'reboot' node3" [ style = bold] +"stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' node2" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' node3" -> "stonith 'reboot' node2" [ style = bold] +"stonith 'reboot' node3" -> "stonith_complete" [ style = bold] +"stonith 'reboot' node3" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/rec-node-15.dot b/pengine/test10/rec-node-15.dot index a01ffd2..31d0929 100644 --- a/pengine/test10/rec-node-15.dot +++ b/pengine/test10/rec-node-15.dot @@ -82,8 +82,8 @@ digraph "g" { "probe_complete" -> "LVM_12_stop_0 sapcl02" [ style = bold] "probe_complete" -> "stonith-1_start_0 sapcl01" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] -"stonith sapcl03" -> "stonith_complete" [ style = bold] -"stonith sapcl03" [ 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" -> "probe_complete sapcl01" [ style = bold] "stonith-1_monitor_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "stonith-1_monitor_0 sapcl02" -> "probe_complete sapcl02" [ style = bold] diff --git a/pengine/test10/rec-node-2.dot b/pengine/test10/rec-node-2.dot index 23b3f2f..f8ba887 100644 --- a/pengine/test10/rec-node-2.dot +++ b/pengine/test10/rec-node-2.dot @@ -46,8 +46,8 @@ digraph "g" { "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 node1" -> "stonith_complete" [ style = bold] -"stonith node1" [ 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" -> "probe_complete 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" ] diff --git a/pengine/test10/rec-node-4.dot b/pengine/test10/rec-node-4.dot index be10460..e5b31ef 100644 --- a/pengine/test10/rec-node-4.dot +++ b/pengine/test10/rec-node-4.dot @@ -20,10 +20,10 @@ digraph "g" { "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="orange" ] -"stonith node1" -> "rsc1_stop_0 node1" [ style = bold] -"stonith node1" -> "rsc2_stop_0 node1" [ style = bold] -"stonith node1" -> "stonith_complete" [ style = bold] -"stonith node1" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' node1" -> "rsc1_stop_0 node1" [ style = bold] +"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" -> "probe_complete 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" ] diff --git a/pengine/test10/rec-node-6.dot b/pengine/test10/rec-node-6.dot index be10460..e5b31ef 100644 --- a/pengine/test10/rec-node-6.dot +++ b/pengine/test10/rec-node-6.dot @@ -20,10 +20,10 @@ digraph "g" { "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="orange" ] -"stonith node1" -> "rsc1_stop_0 node1" [ style = bold] -"stonith node1" -> "rsc2_stop_0 node1" [ style = bold] -"stonith node1" -> "stonith_complete" [ style = bold] -"stonith node1" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' node1" -> "rsc1_stop_0 node1" [ style = bold] +"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" -> "probe_complete 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" ] diff --git a/pengine/test10/rec-node-7.dot b/pengine/test10/rec-node-7.dot index be10460..e5b31ef 100644 --- a/pengine/test10/rec-node-7.dot +++ b/pengine/test10/rec-node-7.dot @@ -20,10 +20,10 @@ digraph "g" { "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="orange" ] -"stonith node1" -> "rsc1_stop_0 node1" [ style = bold] -"stonith node1" -> "rsc2_stop_0 node1" [ style = bold] -"stonith node1" -> "stonith_complete" [ style = bold] -"stonith node1" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' node1" -> "rsc1_stop_0 node1" [ style = bold] +"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" -> "probe_complete 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" ] diff --git a/pengine/test10/rec-rsc-5.dot b/pengine/test10/rec-rsc-5.dot index 48bad88..53b9521 100644 --- a/pengine/test10/rec-rsc-5.dot +++ b/pengine/test10/rec-rsc-5.dot @@ -20,10 +20,10 @@ digraph "g" { "rsc2_stop_0 node2" -> "all_stopped" [ style = bold] "rsc2_stop_0 node2" -> "rsc2_start_0 node1" [ style = bold] "rsc2_stop_0 node2" [ style=bold color="green" fontcolor="orange" ] -"stonith node2" -> "rsc1_stop_0 node2" [ style = bold] -"stonith node2" -> "rsc2_stop_0 node2" [ style = bold] -"stonith node2" -> "stonith_complete" [ style = bold] -"stonith node2" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' node2" -> "rsc1_stop_0 node2" [ style = bold] +"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" -> "probe_complete 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" ] diff --git a/pengine/test10/stonith-0.dot b/pengine/test10/stonith-0.dot index db60eb9..29cdd59 100644 --- a/pengine/test10/stonith-0.dot +++ b/pengine/test10/stonith-0.dot @@ -66,19 +66,19 @@ digraph "g" { "rsc_c001n07_stop_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n07_stop_0 c001n03" -> "rsc_c001n07_start_0 c001n07" [ style = bold] "rsc_c001n07_stop_0 c001n03" [ style=bold color="green" fontcolor="orange" ] -"stonith c001n03" -> "group-1_stop_0" [ style = bold] -"stonith c001n03" -> "heartbeat_192.168.100.182_stop_0 c001n03" [ style = bold] -"stonith c001n03" -> "ocf_192.168.100.181_stop_0 c001n03" [ style = bold] -"stonith c001n03" -> "ocf_192.168.100.183_stop_0 c001n03" [ style = bold] -"stonith c001n03" -> "rsc_c001n07_stop_0 c001n03" [ style = bold] -"stonith c001n03" [ style=bold color="green" fontcolor="black" ] -"stonith c001n05" -> "group-1_stop_0" [ style = bold] -"stonith c001n05" -> "ocf_192.168.100.181_stop_0 c001n05" [ style = bold] -"stonith c001n05" -> "ocf_192.168.100.183_stop_0 c001n05" [ style = bold] -"stonith c001n05" -> "rsc_c001n05_stop_0 c001n05" [ style = bold] -"stonith c001n05" -> "stonith c001n03" [ style = bold] -"stonith c001n05" -> "stonith_complete" [ style = bold] -"stonith c001n05" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' c001n03" -> "group-1_stop_0" [ style = bold] +"stonith 'reboot' c001n03" -> "heartbeat_192.168.100.182_stop_0 c001n03" [ style = bold] +"stonith 'reboot' c001n03" -> "ocf_192.168.100.181_stop_0 c001n03" [ style = bold] +"stonith 'reboot' c001n03" -> "ocf_192.168.100.183_stop_0 c001n03" [ style = bold] +"stonith 'reboot' c001n03" -> "rsc_c001n07_stop_0 c001n03" [ style = bold] +"stonith 'reboot' c001n03" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' c001n05" -> "group-1_stop_0" [ style = bold] +"stonith 'reboot' c001n05" -> "ocf_192.168.100.181_stop_0 c001n05" [ style = bold] +"stonith 'reboot' c001n05" -> "ocf_192.168.100.183_stop_0 c001n05" [ style = bold] +"stonith 'reboot' c001n05" -> "rsc_c001n05_stop_0 c001n05" [ style = bold] +"stonith 'reboot' c001n05" -> "stonith 'reboot' c001n03" [ style = bold] +"stonith 'reboot' c001n05" -> "stonith_complete" [ style = bold] +"stonith 'reboot' c001n05" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold] "stonith_complete" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold] diff --git a/pengine/test10/stonith-1.dot b/pengine/test10/stonith-1.dot index 5ee6c1b..d64edcf 100644 --- a/pengine/test10/stonith-1.dot +++ b/pengine/test10/stonith-1.dot @@ -88,15 +88,15 @@ digraph "g" { "rsc_sles-3_stop_0 sles-3" -> "rsc_sles-3_start_0 sles-4" [ style = bold] "rsc_sles-3_stop_0 sles-3" [ style=bold color="green" fontcolor="orange" ] "rsc_sles-4_monitor_5000 sles-4" [ style=bold color="green" fontcolor="black" ] -"stonith sles-3" -> "DoFencing_stop_0" [ style = bold] -"stonith sles-3" -> "child_DoFencing:2_stop_0 sles-3" [ style = bold] -"stonith sles-3" -> "master_rsc_1_stop_0" [ style = bold] -"stonith sles-3" -> "migrator_stop_0 sles-3" [ style = bold] -"stonith sles-3" -> "ocf_msdummy:2_stop_0 sles-3" [ style = bold] -"stonith sles-3" -> "ocf_msdummy:5_stop_0 sles-3" [ style = bold] -"stonith sles-3" -> "rsc_sles-3_stop_0 sles-3" [ style = bold] -"stonith sles-3" -> "stonith_complete" [ style = bold] -"stonith sles-3" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' sles-3" -> "DoFencing_stop_0" [ style = bold] +"stonith 'reboot' sles-3" -> "child_DoFencing:2_stop_0 sles-3" [ style = bold] +"stonith 'reboot' sles-3" -> "master_rsc_1_stop_0" [ style = bold] +"stonith 'reboot' sles-3" -> "migrator_stop_0 sles-3" [ style = bold] +"stonith 'reboot' sles-3" -> "ocf_msdummy:2_stop_0 sles-3" [ style = bold] +"stonith 'reboot' sles-3" -> "ocf_msdummy:5_stop_0 sles-3" [ style = bold] +"stonith 'reboot' sles-3" -> "rsc_sles-3_stop_0 sles-3" [ style = bold] +"stonith 'reboot' sles-3" -> "stonith_complete" [ style = bold] +"stonith 'reboot' sles-3" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" -> "migrator_start_0 sles-4" [ style = bold] "stonith_complete" -> "ocf_msdummy:0_start_0 sles-4" [ style = bold] diff --git a/pengine/test10/stonith-2.dot b/pengine/test10/stonith-2.dot index c5626c7..2e9420b 100644 --- a/pengine/test10/stonith-2.dot +++ b/pengine/test10/stonith-2.dot @@ -3,8 +3,8 @@ digraph "g" { "rsc_sles-5_monitor_5000 sles-6" [ style=bold color="green" fontcolor="black" ] "rsc_sles-5_start_0 sles-6" -> "rsc_sles-5_monitor_5000 sles-6" [ style = bold] "rsc_sles-5_start_0 sles-6" [ style=bold color="green" fontcolor="black" ] -"stonith sles-5" -> "stonith_complete" [ style = bold] -"stonith sles-5" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' sles-5" -> "stonith_complete" [ style = bold] +"stonith 'reboot' sles-5" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" -> "rsc_sles-5_start_0 sles-6" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange" ] diff --git a/pengine/test10/stonith-3.dot b/pengine/test10/stonith-3.dot index f93ef79..df5f607 100644 --- a/pengine/test10/stonith-3.dot +++ b/pengine/test10/stonith-3.dot @@ -23,8 +23,8 @@ digraph "g" { "probe_complete" -> "prmIpPostgreSQLDB_start_0 rh5node2" [ style = bold] "probe_complete" -> "prmStonith:0_start_0 rh5node2" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] -"stonith rh5node1" -> "stonith_complete" [ style = bold] -"stonith rh5node1" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' rh5node1" -> "stonith_complete" [ style = bold] +"stonith 'reboot' rh5node1" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" -> "prmIpPostgreSQLDB_start_0 rh5node2" [ style = bold] "stonith_complete" -> "prmStonith:0_start_0 rh5node2" [ style = bold] diff --git a/pengine/test10/stonith-4.dot b/pengine/test10/stonith-4.dot index 1508fc8..24243d8 100644 --- a/pengine/test10/stonith-4.dot +++ b/pengine/test10/stonith-4.dot @@ -15,14 +15,14 @@ digraph "g" { "probe_complete pcmk-3" [ style=dashed color="red" fontcolor="black"] "probe_complete" -> "Fencing_start_0 pcmk-1" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange"] -"stonith pcmk-10" -> "stonith pcmk-5" [ style = bold] -"stonith pcmk-10" [ style=bold color="green" fontcolor="black"] -"stonith pcmk-5" -> "stonith pcmk-7" [ style = bold] -"stonith pcmk-5" [ style=bold color="green" fontcolor="black"] -"stonith pcmk-7" -> "stonith pcmk-8" [ style = bold] -"stonith pcmk-7" [ style=bold color="green" fontcolor="black"] -"stonith pcmk-8" -> "stonith_complete" [ style = bold] -"stonith pcmk-8" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' pcmk-10" -> "stonith 'reboot' pcmk-5" [ style = bold] +"stonith 'reboot' pcmk-10" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' pcmk-5" -> "stonith 'reboot' pcmk-7" [ style = bold] +"stonith 'reboot' pcmk-5" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' pcmk-7" -> "stonith 'reboot' pcmk-8" [ style = bold] +"stonith 'reboot' pcmk-7" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' pcmk-8" -> "stonith_complete" [ style = bold] +"stonith 'reboot' pcmk-8" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "Fencing_start_0 pcmk-1" [ style = bold] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange"] diff --git a/pengine/test10/stop-failure-no-quorum.dot b/pengine/test10/stop-failure-no-quorum.dot index 55faa45..e00258d 100644 --- a/pengine/test10/stop-failure-no-quorum.dot +++ b/pengine/test10/stop-failure-no-quorum.dot @@ -10,10 +10,10 @@ digraph "g" { "clvm_stop_0 pcmk-2" -> "clvm-clone_stopped_0" [ style = bold] "clvm_stop_0 pcmk-2" [ style=bold color="green" fontcolor="orange"] "dlm_monitor_60000 pcmk-1" [ style=dashed color="red" fontcolor="black"] -"stonith pcmk-2" -> "clvm-clone_stop_0" [ style = bold] -"stonith pcmk-2" -> "clvm_stop_0 pcmk-2" [ style = bold] -"stonith pcmk-2" -> "stonith_complete" [ style = bold] -"stonith pcmk-2" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' pcmk-2" -> "clvm-clone_stop_0" [ style = bold] +"stonith 'reboot' pcmk-2" -> "clvm_stop_0 pcmk-2" [ style = bold] +"stonith 'reboot' pcmk-2" -> "stonith_complete" [ style = bold] +"stonith 'reboot' pcmk-2" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/stop-failure-with-fencing.dot b/pengine/test10/stop-failure-with-fencing.dot index a4dd5f8..cd5c089 100644 --- a/pengine/test10/stop-failure-with-fencing.dot +++ b/pengine/test10/stop-failure-with-fencing.dot @@ -15,10 +15,10 @@ digraph "g" { "probe_complete pcmk-1" -> "probe_complete" [ style = bold] "probe_complete pcmk-1" [ style=bold color="green" fontcolor="black"] "probe_complete" [ style=bold color="green" fontcolor="orange"] -"stonith pcmk-2" -> "clvm-clone_stop_0" [ style = bold] -"stonith pcmk-2" -> "clvm_stop_0 pcmk-2" [ style = bold] -"stonith pcmk-2" -> "stonith_complete" [ style = bold] -"stonith pcmk-2" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' pcmk-2" -> "clvm-clone_stop_0" [ style = bold] +"stonith 'reboot' pcmk-2" -> "clvm_stop_0 pcmk-2" [ style = bold] +"stonith 'reboot' pcmk-2" -> "stonith_complete" [ style = bold] +"stonith 'reboot' pcmk-2" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/systemhealth1.dot b/pengine/test10/systemhealth1.dot index c47ce24..28841b7 100644 --- a/pengine/test10/systemhealth1.dot +++ b/pengine/test10/systemhealth1.dot @@ -1,9 +1,9 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] -"stonith hs21c" [ style=bold color="green" fontcolor="black" ] -"stonith hs21d" -> "stonith hs21c" [ style = bold] -"stonith hs21d" -> "stonith_complete" [ style = bold] -"stonith hs21d" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' hs21c" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' hs21d" -> "stonith 'reboot' hs21c" [ style = bold] +"stonith 'reboot' hs21d" -> "stonith_complete" [ style = bold] +"stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/systemhealth2.dot b/pengine/test10/systemhealth2.dot index a3d05c0..dcf49eb 100644 --- a/pengine/test10/systemhealth2.dot +++ b/pengine/test10/systemhealth2.dot @@ -16,8 +16,8 @@ digraph "g" { "probe_complete" -> "nfs_1_start_0 hs21c" [ style = bold] "probe_complete" -> "stonith-1_start_0 hs21c" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] -"stonith hs21d" -> "stonith_complete" [ style = bold] -"stonith hs21d" [ 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" -> "probe_complete 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" ] diff --git a/pengine/test10/systemhealth3.dot b/pengine/test10/systemhealth3.dot index a3d05c0..dcf49eb 100644 --- a/pengine/test10/systemhealth3.dot +++ b/pengine/test10/systemhealth3.dot @@ -16,8 +16,8 @@ digraph "g" { "probe_complete" -> "nfs_1_start_0 hs21c" [ style = bold] "probe_complete" -> "stonith-1_start_0 hs21c" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] -"stonith hs21d" -> "stonith_complete" [ style = bold] -"stonith hs21d" [ 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" -> "probe_complete 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" ] diff --git a/pengine/test10/systemhealthm1.dot b/pengine/test10/systemhealthm1.dot index c47ce24..28841b7 100644 --- a/pengine/test10/systemhealthm1.dot +++ b/pengine/test10/systemhealthm1.dot @@ -1,9 +1,9 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] -"stonith hs21c" [ style=bold color="green" fontcolor="black" ] -"stonith hs21d" -> "stonith hs21c" [ style = bold] -"stonith hs21d" -> "stonith_complete" [ style = bold] -"stonith hs21d" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' hs21c" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' hs21d" -> "stonith 'reboot' hs21c" [ style = bold] +"stonith 'reboot' hs21d" -> "stonith_complete" [ style = bold] +"stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/systemhealthm2.dot b/pengine/test10/systemhealthm2.dot index a3d05c0..dcf49eb 100644 --- a/pengine/test10/systemhealthm2.dot +++ b/pengine/test10/systemhealthm2.dot @@ -16,8 +16,8 @@ digraph "g" { "probe_complete" -> "nfs_1_start_0 hs21c" [ style = bold] "probe_complete" -> "stonith-1_start_0 hs21c" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] -"stonith hs21d" -> "stonith_complete" [ style = bold] -"stonith hs21d" [ 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" -> "probe_complete 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" ] diff --git a/pengine/test10/systemhealthm3.dot b/pengine/test10/systemhealthm3.dot index 987de92..2980e3f 100644 --- a/pengine/test10/systemhealthm3.dot +++ b/pengine/test10/systemhealthm3.dot @@ -7,8 +7,8 @@ digraph "g" { "probe_complete hs21c" -> "probe_complete" [ style = bold] "probe_complete hs21c" [ style=bold color="green" fontcolor="black" ] "probe_complete" [ style=bold color="green" fontcolor="orange" ] -"stonith hs21d" -> "stonith_complete" [ style = bold] -"stonith hs21d" [ 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" -> "probe_complete hs21c" [ style = bold] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith_complete" -> "all_stopped" [ style = bold] diff --git a/pengine/test10/systemhealthn1.dot b/pengine/test10/systemhealthn1.dot index c47ce24..28841b7 100644 --- a/pengine/test10/systemhealthn1.dot +++ b/pengine/test10/systemhealthn1.dot @@ -1,9 +1,9 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] -"stonith hs21c" [ style=bold color="green" fontcolor="black" ] -"stonith hs21d" -> "stonith hs21c" [ style = bold] -"stonith hs21d" -> "stonith_complete" [ style = bold] -"stonith hs21d" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' hs21c" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' hs21d" -> "stonith 'reboot' hs21c" [ style = bold] +"stonith 'reboot' hs21d" -> "stonith_complete" [ style = bold] +"stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/systemhealthn2.dot b/pengine/test10/systemhealthn2.dot index a3d05c0..dcf49eb 100644 --- a/pengine/test10/systemhealthn2.dot +++ b/pengine/test10/systemhealthn2.dot @@ -16,8 +16,8 @@ digraph "g" { "probe_complete" -> "nfs_1_start_0 hs21c" [ style = bold] "probe_complete" -> "stonith-1_start_0 hs21c" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] -"stonith hs21d" -> "stonith_complete" [ style = bold] -"stonith hs21d" [ 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" -> "probe_complete 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" ] diff --git a/pengine/test10/systemhealthn3.dot b/pengine/test10/systemhealthn3.dot index a3d05c0..dcf49eb 100644 --- a/pengine/test10/systemhealthn3.dot +++ b/pengine/test10/systemhealthn3.dot @@ -16,8 +16,8 @@ digraph "g" { "probe_complete" -> "nfs_1_start_0 hs21c" [ style = bold] "probe_complete" -> "stonith-1_start_0 hs21c" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] -"stonith hs21d" -> "stonith_complete" [ style = bold] -"stonith hs21d" [ 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" -> "probe_complete 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" ] diff --git a/pengine/test10/systemhealtho1.dot b/pengine/test10/systemhealtho1.dot index c47ce24..28841b7 100644 --- a/pengine/test10/systemhealtho1.dot +++ b/pengine/test10/systemhealtho1.dot @@ -1,9 +1,9 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] -"stonith hs21c" [ style=bold color="green" fontcolor="black" ] -"stonith hs21d" -> "stonith hs21c" [ style = bold] -"stonith hs21d" -> "stonith_complete" [ style = bold] -"stonith hs21d" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' hs21c" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' hs21d" -> "stonith 'reboot' hs21c" [ style = bold] +"stonith 'reboot' hs21d" -> "stonith_complete" [ style = bold] +"stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/systemhealtho2.dot b/pengine/test10/systemhealtho2.dot index 987de92..2980e3f 100644 --- a/pengine/test10/systemhealtho2.dot +++ b/pengine/test10/systemhealtho2.dot @@ -7,8 +7,8 @@ digraph "g" { "probe_complete hs21c" -> "probe_complete" [ style = bold] "probe_complete hs21c" [ style=bold color="green" fontcolor="black" ] "probe_complete" [ style=bold color="green" fontcolor="orange" ] -"stonith hs21d" -> "stonith_complete" [ style = bold] -"stonith hs21d" [ 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" -> "probe_complete hs21c" [ style = bold] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith_complete" -> "all_stopped" [ style = bold] diff --git a/pengine/test10/systemhealtho3.dot b/pengine/test10/systemhealtho3.dot index 987de92..2980e3f 100644 --- a/pengine/test10/systemhealtho3.dot +++ b/pengine/test10/systemhealtho3.dot @@ -7,8 +7,8 @@ digraph "g" { "probe_complete hs21c" -> "probe_complete" [ style = bold] "probe_complete hs21c" [ style=bold color="green" fontcolor="black" ] "probe_complete" [ style=bold color="green" fontcolor="orange" ] -"stonith hs21d" -> "stonith_complete" [ style = bold] -"stonith hs21d" [ 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" -> "probe_complete hs21c" [ style = bold] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith_complete" -> "all_stopped" [ style = bold] diff --git a/pengine/test10/systemhealthp1.dot b/pengine/test10/systemhealthp1.dot index c47ce24..28841b7 100644 --- a/pengine/test10/systemhealthp1.dot +++ b/pengine/test10/systemhealthp1.dot @@ -1,9 +1,9 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] -"stonith hs21c" [ style=bold color="green" fontcolor="black" ] -"stonith hs21d" -> "stonith hs21c" [ style = bold] -"stonith hs21d" -> "stonith_complete" [ style = bold] -"stonith hs21d" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' hs21c" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' hs21d" -> "stonith 'reboot' hs21c" [ style = bold] +"stonith 'reboot' hs21d" -> "stonith_complete" [ style = bold] +"stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/systemhealthp2.dot b/pengine/test10/systemhealthp2.dot index 8100587..bb9d914 100644 --- a/pengine/test10/systemhealthp2.dot +++ b/pengine/test10/systemhealthp2.dot @@ -15,8 +15,8 @@ digraph "g" { "probe_complete" -> "apache_1_start_0 hs21c" [ style = bold] "probe_complete" -> "nfs_1_start_0 hs21c" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] -"stonith hs21d" -> "stonith_complete" [ style = bold] -"stonith hs21d" [ 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" -> "probe_complete hs21c" [ style = bold] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith_complete" -> "all_stopped" [ style = bold] diff --git a/pengine/test10/systemhealthp3.dot b/pengine/test10/systemhealthp3.dot index 987de92..2980e3f 100644 --- a/pengine/test10/systemhealthp3.dot +++ b/pengine/test10/systemhealthp3.dot @@ -7,8 +7,8 @@ digraph "g" { "probe_complete hs21c" -> "probe_complete" [ style = bold] "probe_complete hs21c" [ style=bold color="green" fontcolor="black" ] "probe_complete" [ style=bold color="green" fontcolor="orange" ] -"stonith hs21d" -> "stonith_complete" [ style = bold] -"stonith hs21d" [ 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" -> "probe_complete hs21c" [ style = bold] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith_complete" -> "all_stopped" [ style = bold] diff --git a/pengine/test10/ticket-clone-21.dot b/pengine/test10/ticket-clone-21.dot index 44a702e..c26817e 100644 --- a/pengine/test10/ticket-clone-21.dot +++ b/pengine/test10/ticket-clone-21.dot @@ -13,15 +13,15 @@ digraph "g" { "rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="orange"] "rsc_stonith_stop_0 node1" -> "all_stopped" [ style = bold] "rsc_stonith_stop_0 node1" [ style=bold color="green" fontcolor="orange"] -"stonith node1" -> "clone1_stop_0" [ style = bold] -"stonith node1" -> "rsc1:1_stop_0 node1" [ style = bold] -"stonith node1" -> "rsc_stonith_stop_0 node1" [ style = bold] -"stonith node1" -> "stonith node2" [ style = bold] -"stonith node1" [ style=bold color="green" fontcolor="black"] -"stonith node2" -> "clone1_stop_0" [ style = bold] -"stonith node2" -> "rsc1:0_stop_0 node2" [ style = bold] -"stonith node2" -> "stonith_complete" [ style = bold] -"stonith node2" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' node1" -> "clone1_stop_0" [ style = bold] +"stonith 'reboot' node1" -> "rsc1:1_stop_0 node1" [ style = bold] +"stonith 'reboot' node1" -> "rsc_stonith_stop_0 node1" [ style = bold] +"stonith 'reboot' node1" -> "stonith 'reboot' node2" [ style = bold] +"stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' node2" -> "clone1_stop_0" [ style = bold] +"stonith 'reboot' node2" -> "rsc1:0_stop_0 node2" [ style = bold] +"stonith 'reboot' node2" -> "stonith_complete" [ style = bold] +"stonith 'reboot' node2" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/ticket-clone-9.dot b/pengine/test10/ticket-clone-9.dot index 20066c8..8abddd4 100644 --- a/pengine/test10/ticket-clone-9.dot +++ b/pengine/test10/ticket-clone-9.dot @@ -13,15 +13,15 @@ digraph "g" { "rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="orange" ] "rsc_stonith_stop_0 node1" -> "all_stopped" [ style = bold] "rsc_stonith_stop_0 node1" [ style=bold color="green" fontcolor="orange"] -"stonith node1" -> "clone1_stop_0" [ style = bold] -"stonith node1" -> "rsc1:1_stop_0 node1" [ style = bold] -"stonith node1" -> "rsc_stonith_stop_0 node1" [ style = bold] -"stonith node1" -> "stonith node2" [ style = bold] -"stonith node1" [ style=bold color="green" fontcolor="black" ] -"stonith node2" -> "clone1_stop_0" [ style = bold] -"stonith node2" -> "rsc1:0_stop_0 node2" [ style = bold] -"stonith node2" -> "stonith_complete" [ style = bold] -"stonith node2" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' node1" -> "clone1_stop_0" [ style = bold] +"stonith 'reboot' node1" -> "rsc1:1_stop_0 node1" [ style = bold] +"stonith 'reboot' node1" -> "rsc_stonith_stop_0 node1" [ style = bold] +"stonith 'reboot' node1" -> "stonith 'reboot' node2" [ style = bold] +"stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' node2" -> "clone1_stop_0" [ style = bold] +"stonith 'reboot' node2" -> "rsc1:0_stop_0 node2" [ style = bold] +"stonith 'reboot' node2" -> "stonith_complete" [ style = bold] +"stonith 'reboot' node2" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/ticket-group-21.dot b/pengine/test10/ticket-group-21.dot index aeebada..cac1fc7 100644 --- a/pengine/test10/ticket-group-21.dot +++ b/pengine/test10/ticket-group-21.dot @@ -13,11 +13,11 @@ digraph "g" { "rsc2_stop_0 node2" -> "group1_stopped_0" [ style = bold] "rsc2_stop_0 node2" -> "rsc1_stop_0 node2" [ style = bold] "rsc2_stop_0 node2" [ style=bold color="green" fontcolor="orange"] -"stonith node2" -> "group1_stop_0" [ style = bold] -"stonith node2" -> "rsc1_stop_0 node2" [ style = bold] -"stonith node2" -> "rsc2_stop_0 node2" [ style = bold] -"stonith node2" -> "stonith_complete" [ style = bold] -"stonith node2" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' node2" -> "group1_stop_0" [ style = bold] +"stonith 'reboot' node2" -> "rsc1_stop_0 node2" [ style = bold] +"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_complete" -> "all_stopped" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/ticket-group-9.dot b/pengine/test10/ticket-group-9.dot index 9991946..1649e62 100644 --- a/pengine/test10/ticket-group-9.dot +++ b/pengine/test10/ticket-group-9.dot @@ -13,11 +13,11 @@ digraph "g" { "rsc2_stop_0 node2" -> "group1_stopped_0" [ style = bold] "rsc2_stop_0 node2" -> "rsc1_stop_0 node2" [ style = bold] "rsc2_stop_0 node2" [ style=bold color="green" fontcolor="orange" ] -"stonith node2" -> "group1_stop_0" [ style = bold] -"stonith node2" -> "rsc1_stop_0 node2" [ style = bold] -"stonith node2" -> "rsc2_stop_0 node2" [ style = bold] -"stonith node2" -> "stonith_complete" [ style = bold] -"stonith node2" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' node2" -> "group1_stop_0" [ style = bold] +"stonith 'reboot' node2" -> "rsc1_stop_0 node2" [ style = bold] +"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_complete" -> "all_stopped" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/ticket-master-21.dot b/pengine/test10/ticket-master-21.dot index 9f04de9..e1abd95 100644 --- a/pengine/test10/ticket-master-21.dot +++ b/pengine/test10/ticket-master-21.dot @@ -20,12 +20,12 @@ digraph "g" { "rsc_stonith_stop_0 node1" -> "all_stopped" [ style = bold] "rsc_stonith_stop_0 node1" -> "rsc_stonith_start_0 node2" [ style = bold] "rsc_stonith_stop_0 node1" [ style=bold color="green" fontcolor="orange"] -"stonith node1" -> "ms1_stop_0" [ style = bold] -"stonith node1" -> "rsc1:1_demote_0 node1" [ style = bold] -"stonith node1" -> "rsc1:1_stop_0 node1" [ style = bold] -"stonith node1" -> "rsc_stonith_stop_0 node1" [ style = bold] -"stonith node1" -> "stonith_complete" [ style = bold] -"stonith node1" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' node1" -> "ms1_stop_0" [ style = bold] +"stonith 'reboot' node1" -> "rsc1:1_demote_0 node1" [ style = bold] +"stonith 'reboot' node1" -> "rsc1:1_stop_0 node1" [ style = bold] +"stonith 'reboot' node1" -> "rsc_stonith_stop_0 node1" [ style = bold] +"stonith 'reboot' node1" -> "stonith_complete" [ style = bold] +"stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" -> "rsc_stonith_start_0 node2" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange"] diff --git a/pengine/test10/ticket-master-9.dot b/pengine/test10/ticket-master-9.dot index 91a833a..40c2e7f 100644 --- a/pengine/test10/ticket-master-9.dot +++ b/pengine/test10/ticket-master-9.dot @@ -20,12 +20,12 @@ digraph "g" { "rsc_stonith_stop_0 node1" -> "all_stopped" [ style = bold] "rsc_stonith_stop_0 node1" -> "rsc_stonith_start_0 node2" [ style = bold] "rsc_stonith_stop_0 node1" [ style=bold color="green" fontcolor="orange"] -"stonith node1" -> "ms1_stop_0" [ style = bold] -"stonith node1" -> "rsc1:1_demote_0 node1" [ style = bold] -"stonith node1" -> "rsc1:1_stop_0 node1" [ style = bold] -"stonith node1" -> "rsc_stonith_stop_0 node1" [ style = bold] -"stonith node1" -> "stonith_complete" [ style = bold] -"stonith node1" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' node1" -> "ms1_stop_0" [ style = bold] +"stonith 'reboot' node1" -> "rsc1:1_demote_0 node1" [ style = bold] +"stonith 'reboot' node1" -> "rsc1:1_stop_0 node1" [ style = bold] +"stonith 'reboot' node1" -> "rsc_stonith_stop_0 node1" [ style = bold] +"stonith 'reboot' node1" -> "stonith_complete" [ style = bold] +"stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" -> "rsc_stonith_start_0 node2" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange" ] diff --git a/pengine/test10/ticket-primitive-21.dot b/pengine/test10/ticket-primitive-21.dot index f54e0f0..ba07df3 100644 --- a/pengine/test10/ticket-primitive-21.dot +++ b/pengine/test10/ticket-primitive-21.dot @@ -3,9 +3,9 @@ digraph "g" { "probe_complete node1" [ style=bold color="green" fontcolor="black"] "rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="orange"] -"stonith node2" -> "rsc1_stop_0 node2" [ style = bold] -"stonith node2" -> "stonith_complete" [ style = bold] -"stonith node2" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' node2" -> "rsc1_stop_0 node2" [ style = bold] +"stonith 'reboot' node2" -> "stonith_complete" [ style = bold] +"stonith 'reboot' node2" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/ticket-primitive-9.dot b/pengine/test10/ticket-primitive-9.dot index 40a69d7..0036a23 100644 --- a/pengine/test10/ticket-primitive-9.dot +++ b/pengine/test10/ticket-primitive-9.dot @@ -3,9 +3,9 @@ digraph "g" { "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="orange" ] -"stonith node2" -> "rsc1_stop_0 node2" [ style = bold] -"stonith node2" -> "stonith_complete" [ style = bold] -"stonith node2" [ style=bold color="green" fontcolor="black" ] +"stonith 'reboot' node2" -> "rsc1_stop_0 node2" [ style = bold] +"stonith 'reboot' node2" -> "stonith_complete" [ style = bold] +"stonith 'reboot' node2" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/tools/crm_simulate.c b/tools/crm_simulate.c index 2eb68f1..9d20cdd 100644 --- a/tools/crm_simulate.c +++ b/tools/crm_simulate.c @@ -758,7 +758,9 @@ create_action_name(action_t * action) free(key); } else if (safe_str_eq(action->task, CRM_OP_FENCE)) { - action_name = g_strdup_printf("%s%s %s", prefix ? prefix : "", action->task, action_host); + const char *op = g_hash_table_lookup(action->meta, "stonith_action"); + + action_name = g_strdup_printf("%s%s '%s' %s", prefix ? prefix : "", action->task, op, action_host); } else if (action->rsc && action_host) { action_name = g_strdup_printf("%s%s %s", prefix ? prefix : "", action->uuid, action_host);