diff --git a/pengine/test10/bug-cl-5247.dot b/pengine/test10/bug-cl-5247.dot
index 0ab78932e5..44f788dcef 100644
--- a/pengine/test10/bug-cl-5247.dot
+++ b/pengine/test10/bug-cl-5247.dot
@@ -1,145 +1,148 @@
digraph "g" {
"all_stopped" -> "prmStonith1-2_start_0 bl460g8n4" [ style = bold]
"all_stopped" -> "prmStonith2-2_start_0 bl460g8n3" [ style = bold]
"all_stopped" [ style=bold color="green" fontcolor="orange"]
"grpStonith1_running_0" [ style=bold color="green" fontcolor="orange"]
"grpStonith1_start_0" -> "grpStonith1_running_0" [ style = bold]
"grpStonith1_start_0" -> "prmStonith1-2_start_0 bl460g8n4" [ style = bold]
"grpStonith1_start_0" [ style=bold color="green" fontcolor="orange"]
"grpStonith1_stop_0" -> "grpStonith1_stopped_0" [ style = bold]
"grpStonith1_stop_0" -> "prmStonith1-2_stop_0 bl460g8n4" [ style = bold]
"grpStonith1_stop_0" [ style=bold color="green" fontcolor="orange"]
"grpStonith1_stopped_0" -> "grpStonith1_start_0" [ style = bold]
"grpStonith1_stopped_0" [ style=bold color="green" fontcolor="orange"]
"grpStonith2_running_0" [ style=bold color="green" fontcolor="orange"]
"grpStonith2_start_0" -> "grpStonith2_running_0" [ style = bold]
"grpStonith2_start_0" -> "prmStonith2-2_start_0 bl460g8n3" [ style = bold]
"grpStonith2_start_0" [ style=bold color="green" fontcolor="orange"]
"grpStonith2_stop_0" -> "grpStonith2_stopped_0" [ style = bold]
"grpStonith2_stop_0" -> "prmStonith2-2_stop_0 bl460g8n3" [ style = bold]
"grpStonith2_stop_0" [ style=bold color="green" fontcolor="orange"]
"grpStonith2_stopped_0" -> "grpStonith2_start_0" [ style = bold]
"grpStonith2_stopped_0" [ style=bold color="green" fontcolor="orange"]
"master-group_running_0" [ style=bold color="green" fontcolor="orange"]
"master-group_start_0" -> "master-group_running_0" [ style = bold]
"master-group_start_0" -> "vip-master_start_0 pgsr01" [ style = bold]
"master-group_start_0" -> "vip-rep_start_0 pgsr01" [ style = bold]
"master-group_start_0" [ style=bold color="green" fontcolor="orange"]
"master-group_stop_0" -> "master-group_stopped_0" [ style = bold]
"master-group_stop_0" -> "vip-master_stop_0 pgsr02" [ style = bold]
"master-group_stop_0" -> "vip-rep_stop_0 pgsr02" [ style = bold]
"master-group_stop_0" [ style=bold color="green" fontcolor="orange"]
"master-group_stopped_0" -> "master-group_start_0" [ style = bold]
"master-group_stopped_0" [ style=bold color="green" fontcolor="orange"]
"msPostgresql_confirmed-post_notify_demoted_0" -> "master-group_stop_0" [ style = bold]
"msPostgresql_confirmed-post_notify_demoted_0" -> "msPostgresql_pre_notify_stop_0" [ style = bold]
"msPostgresql_confirmed-post_notify_demoted_0" -> "pgsql_monitor_9000 pgsr01" [ style = bold]
"msPostgresql_confirmed-post_notify_demoted_0" [ style=bold color="green" fontcolor="orange"]
"msPostgresql_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold]
"msPostgresql_confirmed-post_notify_stopped_0" -> "pgsql_monitor_9000 pgsr01" [ style = bold]
"msPostgresql_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"]
"msPostgresql_confirmed-pre_notify_demote_0" -> "msPostgresql_demote_0" [ style = bold]
"msPostgresql_confirmed-pre_notify_demote_0" -> "msPostgresql_post_notify_demoted_0" [ style = bold]
"msPostgresql_confirmed-pre_notify_demote_0" [ style=bold color="green" fontcolor="orange"]
"msPostgresql_confirmed-pre_notify_stop_0" -> "msPostgresql_post_notify_stopped_0" [ style = bold]
"msPostgresql_confirmed-pre_notify_stop_0" -> "msPostgresql_stop_0" [ style = bold]
"msPostgresql_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"]
"msPostgresql_demote_0" -> "msPostgresql_demoted_0" [ style = bold]
"msPostgresql_demote_0" -> "pgsql_demote_0 pgsr02" [ style = bold]
"msPostgresql_demote_0" [ style=bold color="green" fontcolor="orange"]
"msPostgresql_demoted_0" -> "msPostgresql_post_notify_demoted_0" [ style = bold]
"msPostgresql_demoted_0" -> "msPostgresql_stop_0" [ style = bold]
"msPostgresql_demoted_0" [ style=bold color="green" fontcolor="orange"]
"msPostgresql_post_notify_demoted_0" -> "msPostgresql_confirmed-post_notify_demoted_0" [ style = bold]
"msPostgresql_post_notify_demoted_0" -> "pgsql_post_notify_demoted_0 pgsr01" [ style = bold]
"msPostgresql_post_notify_demoted_0" [ style=bold color="green" fontcolor="orange"]
"msPostgresql_post_notify_stopped_0" -> "msPostgresql_confirmed-post_notify_stopped_0" [ style = bold]
"msPostgresql_post_notify_stopped_0" -> "pgsql_post_notify_stonith_0 pgsr01" [ style = bold]
"msPostgresql_post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"]
"msPostgresql_pre_notify_demote_0" -> "msPostgresql_confirmed-pre_notify_demote_0" [ style = bold]
"msPostgresql_pre_notify_demote_0" -> "pgsql_pre_notify_demote_0 pgsr01" [ style = bold]
"msPostgresql_pre_notify_demote_0" [ style=bold color="green" fontcolor="orange"]
"msPostgresql_pre_notify_stop_0" -> "msPostgresql_confirmed-pre_notify_stop_0" [ style = bold]
"msPostgresql_pre_notify_stop_0" -> "pgsql_pre_notify_stop_0 pgsr01" [ style = bold]
"msPostgresql_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"]
"msPostgresql_stop_0" -> "msPostgresql_stopped_0" [ style = bold]
"msPostgresql_stop_0" -> "pgsql_stop_0 pgsr02" [ style = bold]
"msPostgresql_stop_0" [ style=bold color="green" fontcolor="orange"]
"msPostgresql_stopped_0" -> "msPostgresql_post_notify_stopped_0" [ style = bold]
"msPostgresql_stopped_0" [ style=bold color="green" fontcolor="orange"]
"pgsql_confirmed-post_notify_stonith_0" -> "all_stopped" [ style = bold]
"pgsql_confirmed-post_notify_stonith_0" -> "pgsql_monitor_9000 pgsr01" [ style = bold]
"pgsql_confirmed-post_notify_stonith_0" [ style=bold color="green" fontcolor="orange"]
"pgsql_demote_0 pgsr02" -> "msPostgresql_demoted_0" [ style = bold]
"pgsql_demote_0 pgsr02" -> "pgsql_stop_0 pgsr02" [ style = bold]
"pgsql_demote_0 pgsr02" [ style=bold color="green" fontcolor="orange"]
"pgsql_monitor_9000 pgsr01" [ style=bold color="green" fontcolor="black"]
"pgsql_post_notify_demoted_0 pgsr01" -> "msPostgresql_confirmed-post_notify_demoted_0" [ style = bold]
"pgsql_post_notify_demoted_0 pgsr01" [ style=bold color="green" fontcolor="black"]
"pgsql_post_notify_stonith_0 pgsr01" -> "msPostgresql_confirmed-post_notify_stopped_0" [ style = bold]
"pgsql_post_notify_stonith_0 pgsr01" -> "pgsql_confirmed-post_notify_stonith_0" [ style = bold]
"pgsql_post_notify_stonith_0 pgsr01" [ style=bold color="green" fontcolor="black"]
"pgsql_post_notify_stonith_0" -> "pgsql_confirmed-post_notify_stonith_0" [ style = bold]
"pgsql_post_notify_stonith_0" -> "pgsql_post_notify_stonith_0 pgsr01" [ style = bold]
"pgsql_post_notify_stonith_0" [ style=bold color="green" fontcolor="orange"]
"pgsql_pre_notify_demote_0 pgsr01" -> "msPostgresql_confirmed-pre_notify_demote_0" [ style = bold]
"pgsql_pre_notify_demote_0 pgsr01" [ style=bold color="green" fontcolor="black"]
"pgsql_pre_notify_stop_0 pgsr01" -> "msPostgresql_confirmed-pre_notify_stop_0" [ style = bold]
"pgsql_pre_notify_stop_0 pgsr01" [ style=bold color="green" fontcolor="black"]
"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" [ style=bold color="green" fontcolor="black"]
+"pgsr02_monitor_0 bl460g8n3" -> "pgsr02_stop_0 bl460g8n4" [ 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]
"pgsr02_stop_0 bl460g8n4" [ style=bold color="green" fontcolor="black"]
"prmDB2_stop_0 bl460g8n4" -> "all_stopped" [ style = bold]
"prmDB2_stop_0 bl460g8n4" -> "stonith 'off' pgsr02" [ style = bold]
"prmDB2_stop_0 bl460g8n4" [ style=bold color="green" fontcolor="black"]
"prmStonith1-2_monitor_3600000 bl460g8n4" [ style=bold color="green" fontcolor="black"]
"prmStonith1-2_start_0 bl460g8n4" -> "grpStonith1_running_0" [ style = bold]
"prmStonith1-2_start_0 bl460g8n4" -> "prmStonith1-2_monitor_3600000 bl460g8n4" [ style = bold]
"prmStonith1-2_start_0 bl460g8n4" [ style=bold color="green" fontcolor="black"]
"prmStonith1-2_stop_0 bl460g8n4" -> "all_stopped" [ style = bold]
"prmStonith1-2_stop_0 bl460g8n4" -> "grpStonith1_stopped_0" [ style = bold]
"prmStonith1-2_stop_0 bl460g8n4" -> "prmStonith1-2_start_0 bl460g8n4" [ style = bold]
"prmStonith1-2_stop_0 bl460g8n4" [ style=bold color="green" fontcolor="black"]
"prmStonith2-2_monitor_3600000 bl460g8n3" [ style=bold color="green" fontcolor="black"]
"prmStonith2-2_start_0 bl460g8n3" -> "grpStonith2_running_0" [ style = bold]
"prmStonith2-2_start_0 bl460g8n3" -> "prmStonith2-2_monitor_3600000 bl460g8n3" [ style = bold]
"prmStonith2-2_start_0 bl460g8n3" [ style=bold color="green" fontcolor="black"]
"prmStonith2-2_stop_0 bl460g8n3" -> "all_stopped" [ style = bold]
"prmStonith2-2_stop_0 bl460g8n3" -> "grpStonith2_stopped_0" [ style = bold]
"prmStonith2-2_stop_0 bl460g8n3" -> "prmStonith2-2_start_0 bl460g8n3" [ style = bold]
"prmStonith2-2_stop_0 bl460g8n3" [ style=bold color="green" fontcolor="black"]
"stonith 'off' pgsr02" -> "master-group_stop_0" [ style = bold]
"stonith 'off' pgsr02" -> "msPostgresql_stop_0" [ style = bold]
"stonith 'off' pgsr02" -> "pgsql_demote_0 pgsr02" [ style = bold]
"stonith 'off' pgsr02" -> "pgsql_post_notify_stonith_0" [ style = bold]
"stonith 'off' pgsr02" -> "pgsql_stop_0 pgsr02" [ style = bold]
"stonith 'off' pgsr02" -> "stonith_complete" [ style = bold]
"stonith 'off' pgsr02" -> "vip-master_stop_0 pgsr02" [ style = bold]
"stonith 'off' pgsr02" -> "vip-rep_stop_0 pgsr02" [ style = bold]
"stonith 'off' pgsr02" [ style=bold color="green" fontcolor="orange"]
"stonith_complete" -> "all_stopped" [ style = bold]
"stonith_complete" -> "vip-master_start_0 pgsr01" [ style = bold]
"stonith_complete" -> "vip-rep_start_0 pgsr01" [ style = bold]
"stonith_complete" [ style=bold color="green" fontcolor="orange"]
"vip-master_monitor_10000 pgsr01" [ style=bold color="green" fontcolor="black"]
"vip-master_start_0 pgsr01" -> "master-group_running_0" [ style = bold]
"vip-master_start_0 pgsr01" -> "vip-master_monitor_10000 pgsr01" [ style = bold]
"vip-master_start_0 pgsr01" -> "vip-rep_start_0 pgsr01" [ style = bold]
"vip-master_start_0 pgsr01" [ style=bold color="green" fontcolor="black"]
"vip-master_stop_0 pgsr02" -> "all_stopped" [ style = bold]
"vip-master_stop_0 pgsr02" -> "master-group_stopped_0" [ style = bold]
"vip-master_stop_0 pgsr02" -> "vip-master_start_0 pgsr01" [ style = bold]
"vip-master_stop_0 pgsr02" [ style=bold color="green" fontcolor="orange"]
"vip-rep_monitor_10000 pgsr01" [ style=bold color="green" fontcolor="black"]
"vip-rep_start_0 pgsr01" -> "master-group_running_0" [ style = bold]
"vip-rep_start_0 pgsr01" -> "vip-rep_monitor_10000 pgsr01" [ style = bold]
"vip-rep_start_0 pgsr01" [ style=bold color="green" fontcolor="black"]
"vip-rep_stop_0 pgsr02" -> "all_stopped" [ style = bold]
"vip-rep_stop_0 pgsr02" -> "master-group_stopped_0" [ style = bold]
"vip-rep_stop_0 pgsr02" -> "vip-master_stop_0 pgsr02" [ style = bold]
"vip-rep_stop_0 pgsr02" -> "vip-rep_start_0 pgsr01" [ style = bold]
"vip-rep_stop_0 pgsr02" [ style=bold color="green" fontcolor="orange"]
}
diff --git a/pengine/test10/bug-cl-5247.exp b/pengine/test10/bug-cl-5247.exp
index 8ef8b9d2c7..e7bac9c683 100644
--- a/pengine/test10/bug-cl-5247.exp
+++ b/pengine/test10/bug-cl-5247.exp
@@ -1,750 +1,772 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/bug-cl-5247.summary b/pengine/test10/bug-cl-5247.summary
index 91ed8db53c..a13754f979 100644
--- a/pengine/test10/bug-cl-5247.summary
+++ b/pengine/test10/bug-cl-5247.summary
@@ -1,98 +1,100 @@
Using the original execution date of: 2015-08-12 02:53:40Z
Current cluster status:
Online: [ bl460g8n3 bl460g8n4 ]
Containers: [ pgsr01:prmDB1 ]
prmDB1 (ocf::heartbeat:VirtualDomain): Started bl460g8n3
prmDB2 (ocf::heartbeat:VirtualDomain): FAILED bl460g8n4
Resource Group: grpStonith1
prmStonith1-2 (stonith:external/ipmi): Started bl460g8n4
Resource Group: grpStonith2
prmStonith2-2 (stonith:external/ipmi): Started bl460g8n3
Resource Group: master-group
vip-master (ocf::heartbeat:Dummy): FAILED pgsr02
vip-rep (ocf::heartbeat:Dummy): FAILED pgsr02
Master/Slave Set: msPostgresql [pgsql]
Masters: [ pgsr01 ]
Stopped: [ bl460g8n3 bl460g8n4 ]
Transition Summary:
* Stop prmDB2 (bl460g8n4)
* Restart prmStonith1-2 (Started bl460g8n4)
* Restart prmStonith2-2 (Started bl460g8n3)
* Recover vip-master (Started pgsr02 -> pgsr01)
* Recover vip-rep (Started pgsr02 -> pgsr01)
* Demote pgsql:0 (Master -> Stopped pgsr02)
* Stop pgsr02 (bl460g8n4)
Executing cluster transition:
* Pseudo action: grpStonith1_stop_0
* Resource action: prmStonith1-2 stop on bl460g8n4
* Pseudo action: grpStonith2_stop_0
* Resource action: prmStonith2-2 stop on bl460g8n3
* Pseudo action: msPostgresql_pre_notify_demote_0
- * Resource action: pgsr02 stop on bl460g8n4
- * Resource action: prmDB2 stop on bl460g8n4
+ * Resource action: pgsr01 monitor on bl460g8n4
+ * Resource action: pgsr02 monitor on bl460g8n3
* Pseudo action: grpStonith1_stopped_0
* Pseudo action: grpStonith1_start_0
* Pseudo action: grpStonith2_stopped_0
* Pseudo action: grpStonith2_start_0
* Resource action: pgsql notify on pgsr01
* Pseudo action: msPostgresql_confirmed-pre_notify_demote_0
* Pseudo action: msPostgresql_demote_0
+ * Resource action: pgsr02 stop on bl460g8n4
+ * Resource action: prmDB2 stop on bl460g8n4
* Pseudo action: stonith-pgsr02-off on pgsr02
* Pseudo action: stonith_complete
* Pseudo action: pgsql_post_notify_stop_0
* Pseudo action: pgsql_demote_0
* Pseudo action: msPostgresql_demoted_0
* Pseudo action: msPostgresql_post_notify_demoted_0
* Resource action: pgsql notify on pgsr01
* Pseudo action: msPostgresql_confirmed-post_notify_demoted_0
* Pseudo action: msPostgresql_pre_notify_stop_0
* Pseudo action: master-group_stop_0
* Pseudo action: vip-rep_stop_0
* Resource action: pgsql notify on pgsr01
* Pseudo action: msPostgresql_confirmed-pre_notify_stop_0
* Pseudo action: msPostgresql_stop_0
* Pseudo action: vip-master_stop_0
* Pseudo action: pgsql_stop_0
* Pseudo action: msPostgresql_stopped_0
* Pseudo action: master-group_stopped_0
* Pseudo action: master-group_start_0
* Resource action: vip-master start on pgsr01
* Resource action: vip-rep start on pgsr01
* Pseudo action: msPostgresql_post_notify_stopped_0
* Pseudo action: master-group_running_0
* Resource action: vip-master monitor=10000 on pgsr01
* Resource action: vip-rep monitor=10000 on pgsr01
* Resource action: pgsql notify on pgsr01
* Pseudo action: msPostgresql_confirmed-post_notify_stopped_0
* Pseudo action: pgsql_notified_0
* Resource action: pgsql monitor=9000 on pgsr01
* Pseudo action: all_stopped
* Resource action: prmStonith1-2 start on bl460g8n4
* Resource action: prmStonith1-2 monitor=3600000 on bl460g8n4
* Resource action: prmStonith2-2 start on bl460g8n3
* Resource action: prmStonith2-2 monitor=3600000 on bl460g8n3
* Pseudo action: grpStonith1_running_0
* Pseudo action: grpStonith2_running_0
Using the original execution date of: 2015-08-12 02:53:40Z
Revised cluster status:
Online: [ bl460g8n3 bl460g8n4 ]
Containers: [ pgsr01:prmDB1 ]
prmDB1 (ocf::heartbeat:VirtualDomain): Started bl460g8n3
prmDB2 (ocf::heartbeat:VirtualDomain): FAILED
Resource Group: grpStonith1
prmStonith1-2 (stonith:external/ipmi): Started bl460g8n4
Resource Group: grpStonith2
prmStonith2-2 (stonith:external/ipmi): Started bl460g8n3
Resource Group: master-group
vip-master (ocf::heartbeat:Dummy): FAILED[ pgsr01 pgsr02 ]
vip-rep (ocf::heartbeat:Dummy): FAILED[ pgsr01 pgsr02 ]
Master/Slave Set: msPostgresql [pgsql]
Masters: [ pgsr01 ]
Stopped: [ bl460g8n3 bl460g8n4 ]
diff --git a/pengine/test10/guest-node-host-dies.dot b/pengine/test10/guest-node-host-dies.dot
index c1ced9411c..1fdec7b6c3 100644
--- a/pengine/test10/guest-node-host-dies.dot
+++ b/pengine/test10/guest-node-host-dies.dot
@@ -1,116 +1,134 @@
digraph "g" {
"Fencing_monitor_120000 rhel7-4" [ style=bold color="green" fontcolor="black"]
"Fencing_start_0 rhel7-4" -> "Fencing_monitor_120000 rhel7-4" [ style = bold]
"Fencing_start_0 rhel7-4" [ style=bold color="green" fontcolor="black"]
"Fencing_stop_0 rhel7-4" -> "Fencing_start_0 rhel7-4" [ style = bold]
"Fencing_stop_0 rhel7-4" -> "all_stopped" [ style = bold]
"Fencing_stop_0 rhel7-4" [ style=bold color="green" fontcolor="black"]
"all_stopped" -> "Fencing_start_0 rhel7-4" [ style = bold]
"all_stopped" [ style=bold color="green" fontcolor="orange"]
"container1_start_0 rhel7-2" -> "lxc1_start_0 rhel7-2" [ style = bold]
"container1_start_0 rhel7-2" [ style=bold color="green" fontcolor="black"]
"container1_stop_0 rhel7-1" -> "all_stopped" [ style = bold]
"container1_stop_0 rhel7-1" -> "container1_start_0 rhel7-2" [ style = bold]
"container1_stop_0 rhel7-1" -> "stonith 'reboot' lxc1" [ style = bold]
"container1_stop_0 rhel7-1" [ style=bold color="green" fontcolor="orange"]
"container2_start_0 rhel7-3" -> "lxc2_start_0 rhel7-3" [ style = bold]
"container2_start_0 rhel7-3" [ style=bold color="green" fontcolor="black"]
"container2_stop_0 rhel7-1" -> "all_stopped" [ style = bold]
"container2_stop_0 rhel7-1" -> "container2_start_0 rhel7-3" [ style = bold]
"container2_stop_0 rhel7-1" -> "stonith 'reboot' lxc2" [ style = bold]
"container2_stop_0 rhel7-1" [ style=bold color="green" fontcolor="orange"]
"lxc-ms-master_demote_0" -> "lxc-ms-master_demoted_0" [ style = bold]
"lxc-ms-master_demote_0" -> "lxc-ms_demote_0 lxc1" [ style = bold]
"lxc-ms-master_demote_0" [ style=bold color="green" fontcolor="orange"]
"lxc-ms-master_demoted_0" -> "lxc-ms-master_promote_0" [ style = bold]
"lxc-ms-master_demoted_0" -> "lxc-ms-master_start_0" [ style = bold]
"lxc-ms-master_demoted_0" -> "lxc-ms-master_stop_0" [ style = bold]
"lxc-ms-master_demoted_0" [ style=bold color="green" fontcolor="orange"]
"lxc-ms-master_promote_0" -> "lxc-ms_promote_0 lxc1" [ style = bold]
"lxc-ms-master_promote_0" [ style=bold color="green" fontcolor="orange"]
"lxc-ms-master_promoted_0" [ style=bold color="green" fontcolor="orange"]
"lxc-ms-master_running_0" -> "lxc-ms-master_promote_0" [ style = bold]
"lxc-ms-master_running_0" [ style=bold color="green" fontcolor="orange"]
"lxc-ms-master_start_0" -> "lxc-ms-master_running_0" [ style = bold]
"lxc-ms-master_start_0" -> "lxc-ms_start_0 lxc1" [ style = bold]
"lxc-ms-master_start_0" -> "lxc-ms_start_0 lxc2" [ style = bold]
"lxc-ms-master_start_0" [ style=bold color="green" fontcolor="orange"]
"lxc-ms-master_stop_0" -> "lxc-ms-master_stopped_0" [ style = bold]
"lxc-ms-master_stop_0" -> "lxc-ms_stop_0 lxc1" [ style = bold]
"lxc-ms-master_stop_0" -> "lxc-ms_stop_0 lxc2" [ style = bold]
"lxc-ms-master_stop_0" [ style=bold color="green" fontcolor="orange"]
"lxc-ms-master_stopped_0" -> "lxc-ms-master_promote_0" [ style = bold]
"lxc-ms-master_stopped_0" -> "lxc-ms-master_start_0" [ style = bold]
"lxc-ms-master_stopped_0" [ style=bold color="green" fontcolor="orange"]
"lxc-ms_demote_0 lxc1" -> "lxc-ms-master_demoted_0" [ style = bold]
"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_10000 lxc2" [ style=bold color="green" fontcolor="black"]
"lxc-ms_promote_0 lxc1" -> "lxc-ms-master_promoted_0" [ style = bold]
"lxc-ms_promote_0 lxc1" [ style=bold color="green" fontcolor="black"]
"lxc-ms_start_0 lxc1" -> "lxc-ms-master_running_0" [ style = bold]
"lxc-ms_start_0 lxc1" -> "lxc-ms_promote_0 lxc1" [ style = bold]
"lxc-ms_start_0 lxc1" [ style=bold color="green" fontcolor="black"]
"lxc-ms_start_0 lxc2" -> "lxc-ms-master_running_0" [ style = bold]
"lxc-ms_start_0 lxc2" -> "lxc-ms_monitor_10000 lxc2" [ style = bold]
"lxc-ms_start_0 lxc2" [ style=bold color="green" fontcolor="black"]
"lxc-ms_stop_0 lxc1" -> "all_stopped" [ style = bold]
"lxc-ms_stop_0 lxc1" -> "lxc-ms-master_stopped_0" [ style = bold]
"lxc-ms_stop_0 lxc1" -> "lxc-ms_start_0 lxc1" [ style = bold]
"lxc-ms_stop_0 lxc1" [ style=bold color="green" fontcolor="orange"]
"lxc-ms_stop_0 lxc2" -> "all_stopped" [ style = bold]
"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" -> "lxc1_start_0 rhel7-2" [ style = bold]
+"lxc1_monitor_0 rhel7-3" -> "lxc1_stop_0 rhel7-1" [ style = bold]
+"lxc1_monitor_0 rhel7-3" [ style=bold color="green" fontcolor="black"]
+"lxc1_monitor_0 rhel7-4" -> "lxc1_start_0 rhel7-2" [ style = bold]
+"lxc1_monitor_0 rhel7-4" -> "lxc1_stop_0 rhel7-1" [ style = bold]
+"lxc1_monitor_0 rhel7-4" [ style=bold color="green" fontcolor="black"]
+"lxc1_monitor_0 rhel7-5" -> "lxc1_start_0 rhel7-2" [ style = bold]
+"lxc1_monitor_0 rhel7-5" -> "lxc1_stop_0 rhel7-1" [ style = bold]
+"lxc1_monitor_0 rhel7-5" [ style=bold color="green" fontcolor="black"]
"lxc1_monitor_30000 rhel7-2" [ style=bold color="green" fontcolor="black"]
"lxc1_start_0 rhel7-2" -> "lxc-ms_promote_0 lxc1" [ style = bold]
"lxc1_start_0 rhel7-2" -> "lxc-ms_start_0 lxc1" [ style = bold]
"lxc1_start_0 rhel7-2" -> "lxc1_monitor_30000 rhel7-2" [ style = bold]
"lxc1_start_0 rhel7-2" [ style=bold color="green" fontcolor="black"]
"lxc1_stop_0 rhel7-1" -> "all_stopped" [ style = bold]
"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" -> "lxc2_start_0 rhel7-3" [ style = bold]
+"lxc2_monitor_0 rhel7-2" -> "lxc2_stop_0 rhel7-1" [ style = bold]
+"lxc2_monitor_0 rhel7-2" [ style=bold color="green" fontcolor="black"]
+"lxc2_monitor_0 rhel7-4" -> "lxc2_start_0 rhel7-3" [ style = bold]
+"lxc2_monitor_0 rhel7-4" -> "lxc2_stop_0 rhel7-1" [ style = bold]
+"lxc2_monitor_0 rhel7-4" [ style=bold color="green" fontcolor="black"]
+"lxc2_monitor_0 rhel7-5" -> "lxc2_start_0 rhel7-3" [ style = bold]
+"lxc2_monitor_0 rhel7-5" -> "lxc2_stop_0 rhel7-1" [ style = bold]
+"lxc2_monitor_0 rhel7-5" [ style=bold color="green" fontcolor="black"]
"lxc2_monitor_30000 rhel7-3" [ style=bold color="green" fontcolor="black"]
"lxc2_start_0 rhel7-3" -> "lxc-ms_monitor_10000 lxc2" [ style = bold]
"lxc2_start_0 rhel7-3" -> "lxc-ms_start_0 lxc2" [ style = bold]
"lxc2_start_0 rhel7-3" -> "lxc2_monitor_30000 rhel7-3" [ style = bold]
"lxc2_start_0 rhel7-3" [ style=bold color="green" fontcolor="black"]
"lxc2_stop_0 rhel7-1" -> "all_stopped" [ style = bold]
"lxc2_stop_0 rhel7-1" -> "container2_stop_0 rhel7-1" [ style = bold]
"lxc2_stop_0 rhel7-1" -> "lxc2_start_0 rhel7-3" [ style = bold]
"lxc2_stop_0 rhel7-1" [ style=bold color="green" fontcolor="orange"]
"rsc_rhel7-1_monitor_5000 rhel7-5" [ style=bold color="green" fontcolor="black"]
"rsc_rhel7-1_start_0 rhel7-5" -> "rsc_rhel7-1_monitor_5000 rhel7-5" [ style = bold]
"rsc_rhel7-1_start_0 rhel7-5" [ style=bold color="green" fontcolor="black"]
"rsc_rhel7-1_stop_0 rhel7-1" -> "all_stopped" [ style = bold]
"rsc_rhel7-1_stop_0 rhel7-1" -> "rsc_rhel7-1_start_0 rhel7-5" [ style = bold]
"rsc_rhel7-1_stop_0 rhel7-1" [ style=bold color="green" fontcolor="orange"]
"stonith 'reboot' lxc1" -> "lxc-ms-master_stop_0" [ style = bold]
"stonith 'reboot' lxc1" -> "lxc-ms_demote_0 lxc1" [ style = bold]
"stonith 'reboot' lxc1" -> "lxc-ms_stop_0 lxc1" [ style = bold]
"stonith 'reboot' lxc1" -> "stonith_complete" [ style = bold]
"stonith 'reboot' lxc1" [ style=bold color="green" fontcolor="orange"]
"stonith 'reboot' lxc2" -> "lxc-ms-master_stop_0" [ style = bold]
"stonith 'reboot' lxc2" -> "lxc-ms_stop_0 lxc2" [ style = bold]
"stonith 'reboot' lxc2" -> "stonith_complete" [ style = bold]
"stonith 'reboot' lxc2" [ style=bold color="green" fontcolor="orange"]
"stonith 'reboot' rhel7-1" -> "container1_stop_0 rhel7-1" [ style = bold]
"stonith 'reboot' rhel7-1" -> "container2_stop_0 rhel7-1" [ style = bold]
"stonith 'reboot' rhel7-1" -> "lxc1_stop_0 rhel7-1" [ style = bold]
"stonith 'reboot' rhel7-1" -> "lxc2_stop_0 rhel7-1" [ style = bold]
"stonith 'reboot' rhel7-1" -> "rsc_rhel7-1_stop_0 rhel7-1" [ style = bold]
"stonith 'reboot' rhel7-1" -> "stonith_complete" [ style = bold]
"stonith 'reboot' rhel7-1" [ style=bold color="green" fontcolor="black"]
"stonith_complete" -> "all_stopped" [ style = bold]
"stonith_complete" -> "container1_start_0 rhel7-2" [ style = bold]
"stonith_complete" -> "container2_start_0 rhel7-3" [ style = bold]
"stonith_complete" -> "lxc-ms_promote_0 lxc1" [ style = bold]
"stonith_complete" -> "lxc-ms_start_0 lxc1" [ style = bold]
"stonith_complete" -> "lxc-ms_start_0 lxc2" [ style = bold]
"stonith_complete" -> "lxc1_start_0 rhel7-2" [ style = bold]
"stonith_complete" -> "lxc2_start_0 rhel7-3" [ style = bold]
"stonith_complete" -> "rsc_rhel7-1_start_0 rhel7-5" [ style = bold]
"stonith_complete" [ style=bold color="green" fontcolor="orange"]
}
diff --git a/pengine/test10/guest-node-host-dies.exp b/pengine/test10/guest-node-host-dies.exp
index 2029b60ed8..5f49eb1bec 100644
--- a/pengine/test10/guest-node-host-dies.exp
+++ b/pengine/test10/guest-node-host-dies.exp
@@ -1,583 +1,673 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
+
+
+
+
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/guest-node-host-dies.summary b/pengine/test10/guest-node-host-dies.summary
index 83af5cebc3..c6180caae1 100644
--- a/pengine/test10/guest-node-host-dies.summary
+++ b/pengine/test10/guest-node-host-dies.summary
@@ -1,73 +1,79 @@
Current cluster status:
Node rhel7-1 (1): UNCLEAN (offline)
Online: [ rhel7-2 rhel7-3 rhel7-4 rhel7-5 ]
Fencing (stonith:fence_xvm): Started rhel7-4
rsc_rhel7-1 (ocf::heartbeat:IPaddr2): Started rhel7-1 ( UNCLEAN )
container1 (ocf::heartbeat:VirtualDomain): FAILED rhel7-1 (UNCLEAN)
container2 (ocf::heartbeat:VirtualDomain): FAILED rhel7-1 (UNCLEAN)
Master/Slave Set: lxc-ms-master [lxc-ms]
Stopped: [ rhel7-1 rhel7-2 rhel7-3 rhel7-4 rhel7-5 ]
Transition Summary:
* Restart Fencing (Started rhel7-4)
* Move rsc_rhel7-1 (Started rhel7-1 -> rhel7-5)
* Recover container1 (Started rhel7-1 -> rhel7-2)
* Recover container2 (Started rhel7-1 -> rhel7-3)
* Recover lxc-ms:0 (Master lxc1)
* Recover lxc-ms:1 (Slave lxc2)
* Move lxc1 (Started rhel7-1 -> rhel7-2)
* Move lxc2 (Started rhel7-1 -> rhel7-3)
Executing cluster transition:
* Resource action: Fencing stop on rhel7-4
* Pseudo action: lxc-ms-master_demote_0
+ * Resource action: lxc1 monitor on rhel7-5
+ * Resource action: lxc1 monitor on rhel7-4
+ * Resource action: lxc1 monitor on rhel7-3
+ * Resource action: lxc2 monitor on rhel7-5
+ * Resource action: lxc2 monitor on rhel7-4
+ * Resource action: lxc2 monitor on rhel7-2
* Fencing rhel7-1 (reboot)
* Pseudo action: rsc_rhel7-1_stop_0
* Pseudo action: lxc1_stop_0
* Pseudo action: lxc2_stop_0
* Pseudo action: container1_stop_0
* Pseudo action: container2_stop_0
* Pseudo action: stonith-lxc2-reboot on lxc2
* Pseudo action: stonith-lxc1-reboot on lxc1
* Pseudo action: stonith_complete
* Resource action: rsc_rhel7-1 start on rhel7-5
* Resource action: container1 start on rhel7-2
* Resource action: container2 start on rhel7-3
* Pseudo action: lxc-ms_demote_0
* Pseudo action: lxc-ms-master_demoted_0
* Pseudo action: lxc-ms-master_stop_0
* Resource action: lxc1 start on rhel7-2
* Resource action: lxc2 start on rhel7-3
* Resource action: rsc_rhel7-1 monitor=5000 on rhel7-5
* Pseudo action: lxc-ms_stop_0
* Pseudo action: lxc-ms_stop_0
* Pseudo action: lxc-ms-master_stopped_0
* Pseudo action: lxc-ms-master_start_0
* Resource action: lxc1 monitor=30000 on rhel7-2
* Resource action: lxc2 monitor=30000 on rhel7-3
* Pseudo action: all_stopped
* Resource action: Fencing start on rhel7-4
* Resource action: Fencing monitor=120000 on rhel7-4
* Resource action: lxc-ms start on lxc1
* Resource action: lxc-ms start on lxc2
* Pseudo action: lxc-ms-master_running_0
* Resource action: lxc-ms monitor=10000 on lxc2
* Pseudo action: lxc-ms-master_promote_0
* Resource action: lxc-ms promote on lxc1
* Pseudo action: lxc-ms-master_promoted_0
Revised cluster status:
Online: [ rhel7-2 rhel7-3 rhel7-4 rhel7-5 ]
OFFLINE: [ rhel7-1 ]
Containers: [ lxc1:container1 lxc2:container2 ]
Fencing (stonith:fence_xvm): Started rhel7-4
rsc_rhel7-1 (ocf::heartbeat:IPaddr2): Started rhel7-5
container1 (ocf::heartbeat:VirtualDomain): Started rhel7-2
container2 (ocf::heartbeat:VirtualDomain): Started rhel7-3
Master/Slave Set: lxc-ms-master [lxc-ms]
Masters: [ lxc1 ]
Slaves: [ lxc2 ]
diff --git a/pengine/test10/whitebox-fail3.dot b/pengine/test10/whitebox-fail3.dot
index 123acd0ef0..b3c1535ccc 100644
--- a/pengine/test10/whitebox-fail3.dot
+++ b/pengine/test10/whitebox-fail3.dot
@@ -1,33 +1,35 @@
digraph "g" {
+"18builder_monitor_0 dvossel-laptop2" -> "18builder_start_0 dvossel-laptop2" [ 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]
"18builder_start_0 dvossel-laptop2" -> "FAKE_start_0 18builder" [ style = bold]
"18builder_start_0 dvossel-laptop2" -> "W:1_monitor_10000 18builder" [ style = bold]
"18builder_start_0 dvossel-laptop2" -> "W:1_start_0 18builder" [ style = bold]
"18builder_start_0 dvossel-laptop2" -> "X:1_monitor_10000 18builder" [ style = bold]
"18builder_start_0 dvossel-laptop2" -> "X:1_start_0 18builder" [ style = bold]
"18builder_start_0 dvossel-laptop2" [ style=bold color="green" fontcolor="black"]
"FAKE_start_0 18builder" [ style=bold color="green" fontcolor="black"]
"FAKE_stop_0 dvossel-laptop2" -> "FAKE_start_0 18builder" [ style = bold]
"FAKE_stop_0 dvossel-laptop2" -> "all_stopped" [ style = bold]
"FAKE_stop_0 dvossel-laptop2" [ style=bold color="green" fontcolor="black"]
"W-master_running_0" [ style=bold color="green" fontcolor="orange"]
"W-master_start_0" -> "W-master_running_0" [ style = bold]
"W-master_start_0" -> "W:1_start_0 18builder" [ style = bold]
"W-master_start_0" [ style=bold color="green" fontcolor="orange"]
"W:1_monitor_10000 18builder" [ style=bold color="green" fontcolor="black"]
"W:1_start_0 18builder" -> "W-master_running_0" [ style = bold]
"W:1_start_0 18builder" -> "W:1_monitor_10000 18builder" [ style = bold]
"W:1_start_0 18builder" [ style=bold color="green" fontcolor="black"]
"X-master_running_0" [ style=bold color="green" fontcolor="orange"]
"X-master_start_0" -> "X-master_running_0" [ style = bold]
"X-master_start_0" -> "X:1_start_0 18builder" [ style = bold]
"X-master_start_0" [ style=bold color="green" fontcolor="orange"]
"X:1_monitor_10000 18builder" [ style=bold color="green" fontcolor="black"]
"X:1_start_0 18builder" -> "X-master_running_0" [ style = bold]
"X:1_start_0 18builder" -> "X:1_monitor_10000 18builder" [ style = bold]
"X:1_start_0 18builder" [ style=bold color="green" fontcolor="black"]
"all_stopped" [ style=bold color="green" fontcolor="orange"]
"vm_start_0 dvossel-laptop2" -> "18builder_start_0 dvossel-laptop2" [ style = bold]
"vm_start_0 dvossel-laptop2" [ style=bold color="green" fontcolor="black"]
}
diff --git a/pengine/test10/whitebox-fail3.exp b/pengine/test10/whitebox-fail3.exp
index 1cbd24ad17..8ddaba0643 100644
--- a/pengine/test10/whitebox-fail3.exp
+++ b/pengine/test10/whitebox-fail3.exp
@@ -1,185 +1,197 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/pengine/test10/whitebox-fail3.summary b/pengine/test10/whitebox-fail3.summary
index 7acf1b6c8d..19b2e3d11c 100644
--- a/pengine/test10/whitebox-fail3.summary
+++ b/pengine/test10/whitebox-fail3.summary
@@ -1,53 +1,54 @@
Current cluster status:
Online: [ dvossel-laptop2 ]
vm (ocf::heartbeat:VirtualDomain): Stopped
vm2 (ocf::heartbeat:VirtualDomain): Stopped
FAKE (ocf::pacemaker:Dummy): Started dvossel-laptop2
Master/Slave Set: W-master [W]
Masters: [ dvossel-laptop2 ]
Stopped: [ 18builder 18node1 ]
Master/Slave Set: X-master [X]
Masters: [ dvossel-laptop2 ]
Stopped: [ 18builder 18node1 ]
Transition Summary:
* Start vm (dvossel-laptop2)
* Move FAKE (Started dvossel-laptop2 -> 18builder)
* Start W:1 (18builder)
* Start X:1 (18builder)
* Start 18builder (dvossel-laptop2)
Executing cluster transition:
* Resource action: vm start on dvossel-laptop2
* Resource action: FAKE stop on dvossel-laptop2
* Pseudo action: W-master_start_0
* Pseudo action: X-master_start_0
- * Resource action: 18builder start on dvossel-laptop2
+ * Resource action: 18builder monitor on dvossel-laptop2
* Pseudo action: all_stopped
+ * Resource action: 18builder start on dvossel-laptop2
* Resource action: FAKE start on 18builder
* Resource action: W start on 18builder
* Pseudo action: W-master_running_0
* Resource action: X start on 18builder
* Pseudo action: X-master_running_0
* Resource action: 18builder monitor=30000 on dvossel-laptop2
* Resource action: W monitor=10000 on 18builder
* Resource action: X monitor=10000 on 18builder
Revised cluster status:
Online: [ dvossel-laptop2 ]
Containers: [ 18builder:vm ]
vm (ocf::heartbeat:VirtualDomain): Started dvossel-laptop2
vm2 (ocf::heartbeat:VirtualDomain): Stopped
FAKE (ocf::pacemaker:Dummy): Started 18builder
Master/Slave Set: W-master [W]
Masters: [ dvossel-laptop2 ]
Slaves: [ 18builder ]
Stopped: [ 18node1 ]
Master/Slave Set: X-master [X]
Masters: [ dvossel-laptop2 ]
Slaves: [ 18builder ]
Stopped: [ 18node1 ]
diff --git a/pengine/test10/whitebox-migrate1.dot b/pengine/test10/whitebox-migrate1.dot
index b00e272ccf..e54df2c1d1 100644
--- a/pengine/test10/whitebox-migrate1.dot
+++ b/pengine/test10/whitebox-migrate1.dot
@@ -1,42 +1,46 @@
digraph "g" {
"FAKE3_monitor_10000 rhel7-node2" [ style=bold color="green" fontcolor="black"]
"FAKE3_start_0 rhel7-node2" -> "FAKE3_monitor_10000 rhel7-node2" [ style = bold]
"FAKE3_start_0 rhel7-node2" [ style=bold color="green" fontcolor="black"]
"FAKE3_stop_0 rhel7-node3" -> "FAKE3_start_0 rhel7-node2" [ style = bold]
"FAKE3_stop_0 rhel7-node3" -> "all_stopped" [ style = bold]
"FAKE3_stop_0 rhel7-node3" [ style=bold color="green" fontcolor="black"]
"all_stopped" [ style=bold color="green" fontcolor="orange"]
"remote-rsc_migrate_from_0 rhel7-node3" -> "remote-rsc_start_0 rhel7-node3" [ style = bold]
"remote-rsc_migrate_from_0 rhel7-node3" -> "remote-rsc_stop_0 rhel7-node2" [ style = bold]
"remote-rsc_migrate_from_0 rhel7-node3" -> "rhel7-node1_migrate_to_0 rhel7-node2" [ style = bold]
"remote-rsc_migrate_from_0 rhel7-node3" [ style=bold color="green" fontcolor="black"]
"remote-rsc_migrate_to_0 rhel7-node2" -> "remote-rsc_migrate_from_0 rhel7-node3" [ style = bold]
"remote-rsc_migrate_to_0 rhel7-node2" [ style=bold color="green" fontcolor="black"]
"remote-rsc_monitor_10000 rhel7-node3" [ style=bold color="green" fontcolor="black"]
"remote-rsc_start_0 rhel7-node3" -> "remote-rsc_monitor_10000 rhel7-node3" [ style = bold]
"remote-rsc_start_0 rhel7-node3" -> "rhel7-node1_migrate_to_0 rhel7-node2" [ style = dashed]
"remote-rsc_start_0 rhel7-node3" -> "rhel7-node1_start_0 rhel7-node3" [ style = bold]
"remote-rsc_start_0 rhel7-node3" [ style=bold color="green" fontcolor="orange"]
"remote-rsc_stop_0 rhel7-node2" -> "all_stopped" [ style = bold]
"remote-rsc_stop_0 rhel7-node2" -> "remote-rsc_start_0 rhel7-node3" [ style = bold]
"remote-rsc_stop_0 rhel7-node2" [ style=bold color="green" fontcolor="black"]
"rhel7-node1_migrate_from_0 rhel7-node3" -> "rhel7-node1_start_0 rhel7-node3" [ style = bold]
"rhel7-node1_migrate_from_0 rhel7-node3" -> "rhel7-node1_stop_0 rhel7-node2" [ style = bold]
"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" -> "rhel7-node1_migrate_to_0 rhel7-node2" [ style = bold]
+"rhel7-node1_monitor_0 rhel7-node3" -> "rhel7-node1_start_0 rhel7-node3" [ style = bold]
+"rhel7-node1_monitor_0 rhel7-node3" -> "rhel7-node1_stop_0 rhel7-node2" [ style = bold]
+"rhel7-node1_monitor_0 rhel7-node3" [ style=bold color="green" fontcolor="black"]
"rhel7-node1_monitor_30000 rhel7-node3" [ style=bold color="green" fontcolor="black"]
"rhel7-node1_start_0 rhel7-node3" -> "rhel7-node1_monitor_30000 rhel7-node3" [ style = bold]
"rhel7-node1_start_0 rhel7-node3" [ style=bold color="green" fontcolor="orange"]
"rhel7-node1_stop_0 rhel7-node2" -> "all_stopped" [ style = bold]
"rhel7-node1_stop_0 rhel7-node2" -> "remote-rsc_migrate_to_0 rhel7-node2" [ style = dashed]
"rhel7-node1_stop_0 rhel7-node2" -> "remote-rsc_stop_0 rhel7-node2" [ style = bold]
"rhel7-node1_stop_0 rhel7-node2" -> "rhel7-node1_start_0 rhel7-node3" [ style = bold]
"rhel7-node1_stop_0 rhel7-node2" [ style=bold color="green" fontcolor="black"]
"shooter1_monitor_60000 rhel7-node2" [ style=bold color="green" fontcolor="black"]
"shooter1_start_0 rhel7-node2" -> "shooter1_monitor_60000 rhel7-node2" [ style = bold]
"shooter1_start_0 rhel7-node2" [ style=bold color="green" fontcolor="black"]
"shooter1_stop_0 rhel7-node3" -> "all_stopped" [ style = bold]
"shooter1_stop_0 rhel7-node3" -> "shooter1_start_0 rhel7-node2" [ style = bold]
"shooter1_stop_0 rhel7-node3" [ style=bold color="green" fontcolor="black"]
}
diff --git a/pengine/test10/whitebox-migrate1.exp b/pengine/test10/whitebox-migrate1.exp
index 6ce29eb30c..1b6c451dcc 100644
--- a/pengine/test10/whitebox-migrate1.exp
+++ b/pengine/test10/whitebox-migrate1.exp
@@ -1,229 +1,247 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/whitebox-migrate1.summary b/pengine/test10/whitebox-migrate1.summary
index 7cbe03d2e7..a6e4c00d75 100644
--- a/pengine/test10/whitebox-migrate1.summary
+++ b/pengine/test10/whitebox-migrate1.summary
@@ -1,54 +1,55 @@
Current cluster status:
Online: [ rhel7-node2 rhel7-node3 ]
Containers: [ rhel7-node1:remote-rsc ]
shooter1 (stonith:fence_xvm): Started rhel7-node3
FAKE1 (ocf::heartbeat:Dummy): Started rhel7-node1
FAKE2 (ocf::heartbeat:Dummy): Started rhel7-node1
FAKE3 (ocf::heartbeat:Dummy): Started rhel7-node3
FAKE4 (ocf::heartbeat:Dummy): Started rhel7-node3
FAKE5 (ocf::heartbeat:Dummy): Started rhel7-node2
FAKE6 (ocf::heartbeat:Dummy): Started rhel7-node1
FAKE7 (ocf::heartbeat:Dummy): Started rhel7-node3
remote-rsc (ocf::heartbeat:Dummy): Started rhel7-node2
Transition Summary:
* Move shooter1 (Started rhel7-node3 -> rhel7-node2)
* Move FAKE3 (Started rhel7-node3 -> rhel7-node2)
* Migrate remote-rsc (Started rhel7-node2 -> rhel7-node3)
* Migrate rhel7-node1 (Started rhel7-node2 -> rhel7-node3)
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: shooter1 monitor=60000 on rhel7-node2
* Resource action: FAKE3 monitor=10000 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
* Pseudo action: all_stopped
* Pseudo action: remote-rsc_start_0
* Pseudo action: rhel7-node1_start_0
* Resource action: remote-rsc monitor=10000 on rhel7-node3
* Resource action: rhel7-node1 monitor=30000 on rhel7-node3
Revised cluster status:
Online: [ rhel7-node2 rhel7-node3 ]
Containers: [ rhel7-node1:remote-rsc ]
shooter1 (stonith:fence_xvm): Started rhel7-node2
FAKE1 (ocf::heartbeat:Dummy): Started rhel7-node1
FAKE2 (ocf::heartbeat:Dummy): Started rhel7-node1
FAKE3 (ocf::heartbeat:Dummy): Started rhel7-node2
FAKE4 (ocf::heartbeat:Dummy): Started rhel7-node3
FAKE5 (ocf::heartbeat:Dummy): Started rhel7-node2
FAKE6 (ocf::heartbeat:Dummy): Started rhel7-node1
FAKE7 (ocf::heartbeat:Dummy): Started rhel7-node3
remote-rsc (ocf::heartbeat:Dummy): Started rhel7-node3
diff --git a/pengine/test10/whitebox-ms-ordering-move.dot b/pengine/test10/whitebox-ms-ordering-move.dot
index 0e4df3c96b..fe0b0e8010 100644
--- a/pengine/test10/whitebox-ms-ordering-move.dot
+++ b/pengine/test10/whitebox-ms-ordering-move.dot
@@ -1,52 +1,68 @@
digraph "g" {
"all_stopped" [ style=bold color="green" fontcolor="orange"]
"container1_start_0 rhel7-2" -> "lxc1_start_0 rhel7-2" [ style = bold]
"container1_start_0 rhel7-2" [ style=bold color="green" fontcolor="black"]
"container1_stop_0 rhel7-1" -> "all_stopped" [ style = bold]
"container1_stop_0 rhel7-1" -> "container1_start_0 rhel7-2" [ style = bold]
"container1_stop_0 rhel7-1" [ style=bold color="green" fontcolor="black"]
"lxc-ms-master_demote_0" -> "lxc-ms-master_demoted_0" [ style = bold]
"lxc-ms-master_demote_0" -> "lxc-ms_demote_0 lxc1" [ style = bold]
"lxc-ms-master_demote_0" [ style=bold color="green" fontcolor="orange"]
"lxc-ms-master_demoted_0" -> "lxc-ms-master_promote_0" [ style = bold]
"lxc-ms-master_demoted_0" -> "lxc-ms-master_start_0" [ style = bold]
"lxc-ms-master_demoted_0" -> "lxc-ms-master_stop_0" [ style = bold]
"lxc-ms-master_demoted_0" [ style=bold color="green" fontcolor="orange"]
"lxc-ms-master_promote_0" -> "lxc-ms_promote_0 lxc1" [ style = bold]
"lxc-ms-master_promote_0" [ style=bold color="green" fontcolor="orange"]
"lxc-ms-master_promoted_0" [ style=bold color="green" fontcolor="orange"]
"lxc-ms-master_running_0" -> "lxc-ms-master_promote_0" [ style = bold]
"lxc-ms-master_running_0" [ style=bold color="green" fontcolor="orange"]
"lxc-ms-master_start_0" -> "lxc-ms-master_running_0" [ style = bold]
"lxc-ms-master_start_0" -> "lxc-ms_start_0 lxc1" [ style = bold]
"lxc-ms-master_start_0" [ style=bold color="green" fontcolor="orange"]
"lxc-ms-master_stop_0" -> "lxc-ms-master_stopped_0" [ style = bold]
"lxc-ms-master_stop_0" -> "lxc-ms_stop_0 lxc1" [ style = bold]
"lxc-ms-master_stop_0" [ style=bold color="green" fontcolor="orange"]
"lxc-ms-master_stopped_0" -> "lxc-ms-master_promote_0" [ style = bold]
"lxc-ms-master_stopped_0" -> "lxc-ms-master_start_0" [ style = bold]
"lxc-ms-master_stopped_0" [ style=bold color="green" fontcolor="orange"]
"lxc-ms_demote_0 lxc1" -> "lxc-ms-master_demoted_0" [ style = bold]
"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="black"]
"lxc-ms_promote_0 lxc1" -> "lxc-ms-master_promoted_0" [ style = bold]
"lxc-ms_promote_0 lxc1" [ style=bold color="green" fontcolor="black"]
"lxc-ms_start_0 lxc1" -> "lxc-ms-master_running_0" [ style = bold]
"lxc-ms_start_0 lxc1" -> "lxc-ms_promote_0 lxc1" [ style = bold]
"lxc-ms_start_0 lxc1" [ style=bold color="green" fontcolor="black"]
"lxc-ms_stop_0 lxc1" -> "all_stopped" [ style = bold]
"lxc-ms_stop_0 lxc1" -> "lxc-ms-master_stopped_0" [ style = bold]
"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" -> "lxc1_start_0 rhel7-2" [ style = bold]
+"lxc1_monitor_0 rhel7-2" -> "lxc1_stop_0 rhel7-1" [ style = bold]
+"lxc1_monitor_0 rhel7-2" [ style=bold color="green" fontcolor="black"]
+"lxc1_monitor_0 rhel7-3" -> "lxc1_start_0 rhel7-2" [ style = bold]
+"lxc1_monitor_0 rhel7-3" -> "lxc1_stop_0 rhel7-1" [ style = bold]
+"lxc1_monitor_0 rhel7-3" [ style=bold color="green" fontcolor="black"]
+"lxc1_monitor_0 rhel7-4" -> "lxc1_start_0 rhel7-2" [ style = bold]
+"lxc1_monitor_0 rhel7-4" -> "lxc1_stop_0 rhel7-1" [ style = bold]
+"lxc1_monitor_0 rhel7-4" [ style=bold color="green" fontcolor="black"]
+"lxc1_monitor_0 rhel7-5" -> "lxc1_start_0 rhel7-2" [ style = bold]
+"lxc1_monitor_0 rhel7-5" -> "lxc1_stop_0 rhel7-1" [ style = bold]
+"lxc1_monitor_0 rhel7-5" [ style=bold color="green" fontcolor="black"]
"lxc1_monitor_30000 rhel7-2" [ style=bold color="green" fontcolor="black"]
"lxc1_start_0 rhel7-2" -> "lxc-ms_promote_0 lxc1" [ style = bold]
"lxc1_start_0 rhel7-2" -> "lxc-ms_start_0 lxc1" [ style = bold]
"lxc1_start_0 rhel7-2" -> "lxc1_monitor_30000 rhel7-2" [ style = bold]
"lxc1_start_0 rhel7-2" [ style=bold color="green" fontcolor="black"]
"lxc1_stop_0 rhel7-1" -> "all_stopped" [ style = bold]
"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" [ style=bold color="green" fontcolor="black"]
+"lxc2_monitor_0 rhel7-3" [ style=bold color="green" fontcolor="black"]
+"lxc2_monitor_0 rhel7-4" [ style=bold color="green" fontcolor="black"]
+"lxc2_monitor_0 rhel7-5" [ style=bold color="green" fontcolor="black"]
}
diff --git a/pengine/test10/whitebox-ms-ordering-move.exp b/pengine/test10/whitebox-ms-ordering-move.exp
index 54067f0c0a..f8718de338 100644
--- a/pengine/test10/whitebox-ms-ordering-move.exp
+++ b/pengine/test10/whitebox-ms-ordering-move.exp
@@ -1,271 +1,367 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
diff --git a/pengine/test10/whitebox-ms-ordering-move.summary b/pengine/test10/whitebox-ms-ordering-move.summary
index 5777b84f0f..d5f133b62e 100644
--- a/pengine/test10/whitebox-ms-ordering-move.summary
+++ b/pengine/test10/whitebox-ms-ordering-move.summary
@@ -1,86 +1,94 @@
Current cluster status:
Online: [ rhel7-1 rhel7-2 rhel7-3 rhel7-4 rhel7-5 ]
Containers: [ lxc1:container1 lxc2:container2 ]
Fencing (stonith:fence_xvm): Started rhel7-3
FencingPass (stonith:fence_dummy): Started rhel7-4
FencingFail (stonith:fence_dummy): Started rhel7-5
rsc_rhel7-1 (ocf::heartbeat:IPaddr2): Started rhel7-1
rsc_rhel7-2 (ocf::heartbeat:IPaddr2): Started rhel7-2
rsc_rhel7-3 (ocf::heartbeat:IPaddr2): Started rhel7-3
rsc_rhel7-4 (ocf::heartbeat:IPaddr2): Started rhel7-4
rsc_rhel7-5 (ocf::heartbeat:IPaddr2): Started rhel7-5
migrator (ocf::pacemaker:Dummy): Started rhel7-4
Clone Set: Connectivity [ping-1]
Started: [ rhel7-1 rhel7-2 rhel7-3 rhel7-4 rhel7-5 ]
Stopped: [ lxc1 lxc2 ]
Master/Slave Set: master-1 [stateful-1]
Masters: [ rhel7-3 ]
Slaves: [ rhel7-1 rhel7-2 rhel7-4 rhel7-5 ]
Resource Group: group-1
r192.168.122.207 (ocf::heartbeat:IPaddr2): Started rhel7-3
petulant (service:DummySD): Started rhel7-3
r192.168.122.208 (ocf::heartbeat:IPaddr2): Started rhel7-3
lsb-dummy (lsb:/usr/share/pacemaker/tests/cts/LSBDummy): Started rhel7-3
container1 (ocf::heartbeat:VirtualDomain): Started rhel7-1
container2 (ocf::heartbeat:VirtualDomain): Started rhel7-1
Master/Slave Set: lxc-ms-master [lxc-ms]
Masters: [ lxc1 ]
Slaves: [ lxc2 ]
Transition Summary:
* Move container1 (Started rhel7-1 -> rhel7-2)
* Restart lxc-ms:0 (Master lxc1)
* Move lxc1 (Started rhel7-1 -> rhel7-2)
Executing cluster transition:
* Pseudo action: lxc-ms-master_demote_0
+ * Resource action: lxc1 monitor on rhel7-5
+ * Resource action: lxc1 monitor on rhel7-4
+ * Resource action: lxc1 monitor on rhel7-3
+ * Resource action: lxc1 monitor on rhel7-2
+ * Resource action: lxc2 monitor on rhel7-5
+ * Resource action: lxc2 monitor on rhel7-4
+ * Resource action: lxc2 monitor on rhel7-3
+ * Resource action: lxc2 monitor on rhel7-2
* Resource action: lxc-ms demote on lxc1
* Pseudo action: lxc-ms-master_demoted_0
* Pseudo action: lxc-ms-master_stop_0
* Resource action: lxc-ms stop on lxc1
* Pseudo action: lxc-ms-master_stopped_0
* Pseudo action: lxc-ms-master_start_0
* Resource action: lxc1 stop on rhel7-1
* Resource action: container1 stop on rhel7-1
* Pseudo action: all_stopped
* Resource action: container1 start on rhel7-2
* Resource action: lxc1 start on rhel7-2
* Resource action: lxc-ms start on lxc1
* Pseudo action: lxc-ms-master_running_0
* Resource action: lxc1 monitor=30000 on rhel7-2
* Pseudo action: lxc-ms-master_promote_0
* Resource action: lxc-ms promote on lxc1
* Pseudo action: lxc-ms-master_promoted_0
Revised cluster status:
Online: [ rhel7-1 rhel7-2 rhel7-3 rhel7-4 rhel7-5 ]
Containers: [ lxc1:container1 lxc2:container2 ]
Fencing (stonith:fence_xvm): Started rhel7-3
FencingPass (stonith:fence_dummy): Started rhel7-4
FencingFail (stonith:fence_dummy): Started rhel7-5
rsc_rhel7-1 (ocf::heartbeat:IPaddr2): Started rhel7-1
rsc_rhel7-2 (ocf::heartbeat:IPaddr2): Started rhel7-2
rsc_rhel7-3 (ocf::heartbeat:IPaddr2): Started rhel7-3
rsc_rhel7-4 (ocf::heartbeat:IPaddr2): Started rhel7-4
rsc_rhel7-5 (ocf::heartbeat:IPaddr2): Started rhel7-5
migrator (ocf::pacemaker:Dummy): Started rhel7-4
Clone Set: Connectivity [ping-1]
Started: [ rhel7-1 rhel7-2 rhel7-3 rhel7-4 rhel7-5 ]
Stopped: [ lxc1 lxc2 ]
Master/Slave Set: master-1 [stateful-1]
Masters: [ rhel7-3 ]
Slaves: [ rhel7-1 rhel7-2 rhel7-4 rhel7-5 ]
Resource Group: group-1
r192.168.122.207 (ocf::heartbeat:IPaddr2): Started rhel7-3
petulant (service:DummySD): Started rhel7-3
r192.168.122.208 (ocf::heartbeat:IPaddr2): Started rhel7-3
lsb-dummy (lsb:/usr/share/pacemaker/tests/cts/LSBDummy): Started rhel7-3
container1 (ocf::heartbeat:VirtualDomain): Started rhel7-2
container2 (ocf::heartbeat:VirtualDomain): Started rhel7-1
Master/Slave Set: lxc-ms-master [lxc-ms]
Masters: [ lxc1 ]
Slaves: [ lxc2 ]
diff --git a/pengine/test10/whitebox-ms-ordering.dot b/pengine/test10/whitebox-ms-ordering.dot
index bd773634ee..1a942f4931 100644
--- a/pengine/test10/whitebox-ms-ordering.dot
+++ b/pengine/test10/whitebox-ms-ordering.dot
@@ -1,100 +1,112 @@
digraph "g" {
"all_stopped" [ style=bold color="green" fontcolor="orange"]
"container1_monitor_0 18node1" -> "container1_start_0 18node1" [ style = bold]
"container1_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
"container1_monitor_0 18node2" -> "container1_start_0 18node1" [ style = bold]
"container1_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
"container1_monitor_0 18node3" -> "container1_start_0 18node1" [ style = bold]
"container1_monitor_0 18node3" [ style=bold color="green" fontcolor="black"]
"container1_start_0 18node1" -> "lxc1_start_0 18node1" [ style = bold]
"container1_start_0 18node1" [ style=bold color="green" fontcolor="black"]
"container2_monitor_0 18node1" -> "container2_start_0 18node1" [ style = bold]
"container2_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
"container2_monitor_0 18node2" -> "container2_start_0 18node1" [ style = bold]
"container2_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
"container2_monitor_0 18node3" -> "container2_start_0 18node1" [ style = bold]
"container2_monitor_0 18node3" [ style=bold color="green" fontcolor="black"]
"container2_start_0 18node1" -> "lxc2_start_0 18node1" [ style = bold]
"container2_start_0 18node1" [ style=bold color="green" fontcolor="black"]
"lxc-ms-master_demote_0" -> "lxc-ms-master_demoted_0" [ style = bold]
"lxc-ms-master_demote_0" -> "lxc-ms_demote_0 lxc1" [ style = bold]
"lxc-ms-master_demote_0" [ style=bold color="green" fontcolor="orange"]
"lxc-ms-master_demoted_0" -> "lxc-ms-master_promote_0" [ style = bold]
"lxc-ms-master_demoted_0" -> "lxc-ms-master_start_0" [ style = bold]
"lxc-ms-master_demoted_0" -> "lxc-ms-master_stop_0" [ style = bold]
"lxc-ms-master_demoted_0" [ style=bold color="green" fontcolor="orange"]
"lxc-ms-master_promote_0" -> "lxc-ms_promote_0 lxc1" [ style = bold]
"lxc-ms-master_promote_0" [ style=bold color="green" fontcolor="orange"]
"lxc-ms-master_promoted_0" [ style=bold color="green" fontcolor="orange"]
"lxc-ms-master_running_0" -> "lxc-ms-master_promote_0" [ style = bold]
"lxc-ms-master_running_0" [ style=bold color="green" fontcolor="orange"]
"lxc-ms-master_start_0" -> "lxc-ms-master_running_0" [ style = bold]
"lxc-ms-master_start_0" -> "lxc-ms_start_0 lxc1" [ style = bold]
"lxc-ms-master_start_0" -> "lxc-ms_start_0 lxc2" [ style = bold]
"lxc-ms-master_start_0" [ style=bold color="green" fontcolor="orange"]
"lxc-ms-master_stop_0" -> "lxc-ms-master_stopped_0" [ style = bold]
"lxc-ms-master_stop_0" -> "lxc-ms_stop_0 lxc1" [ style = bold]
"lxc-ms-master_stop_0" -> "lxc-ms_stop_0 lxc2" [ style = bold]
"lxc-ms-master_stop_0" [ style=bold color="green" fontcolor="orange"]
"lxc-ms-master_stopped_0" -> "lxc-ms-master_promote_0" [ style = bold]
"lxc-ms-master_stopped_0" -> "lxc-ms-master_start_0" [ style = bold]
"lxc-ms-master_stopped_0" [ style=bold color="green" fontcolor="orange"]
"lxc-ms_demote_0 lxc1" -> "lxc-ms-master_demoted_0" [ style = bold]
"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" -> "lxc-ms-master_start_0" [ style = bold]
"lxc-ms_monitor_0 18node1" -> "lxc-ms_stop_0 lxc1" [ style = bold]
"lxc-ms_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
"lxc-ms_monitor_0 18node2" -> "lxc-ms-master_start_0" [ style = bold]
"lxc-ms_monitor_0 18node2" -> "lxc-ms_stop_0 lxc1" [ style = bold]
"lxc-ms_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
"lxc-ms_monitor_0 18node3" -> "lxc-ms-master_start_0" [ style = bold]
"lxc-ms_monitor_0 18node3" -> "lxc-ms_stop_0 lxc1" [ 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]
"lxc-ms_promote_0 lxc1" [ style=bold color="green" fontcolor="black"]
"lxc-ms_start_0 lxc1" -> "lxc-ms-master_running_0" [ style = bold]
"lxc-ms_start_0 lxc1" -> "lxc-ms_promote_0 lxc1" [ style = bold]
"lxc-ms_start_0 lxc1" [ style=bold color="green" fontcolor="black"]
"lxc-ms_start_0 lxc2" -> "lxc-ms-master_running_0" [ style = bold]
"lxc-ms_start_0 lxc2" -> "lxc-ms_monitor_10000 lxc2" [ style = bold]
"lxc-ms_start_0 lxc2" [ style=bold color="green" fontcolor="black"]
"lxc-ms_stop_0 lxc1" -> "all_stopped" [ style = bold]
"lxc-ms_stop_0 lxc1" -> "lxc-ms-master_stopped_0" [ style = bold]
"lxc-ms_stop_0 lxc1" -> "lxc-ms_start_0 lxc1" [ style = bold]
"lxc-ms_stop_0 lxc1" [ style=bold color="green" fontcolor="orange"]
"lxc-ms_stop_0 lxc2" -> "all_stopped" [ style = bold]
"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" -> "lxc1_start_0 18node1" [ style = bold]
+"lxc1_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
+"lxc1_monitor_0 18node2" -> "lxc1_start_0 18node1" [ style = bold]
+"lxc1_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
+"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"]
"lxc1_start_0 18node1" -> "lxc-ms_promote_0 lxc1" [ style = bold]
"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" -> "lxc2_start_0 18node1" [ style = bold]
+"lxc2_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
+"lxc2_monitor_0 18node2" -> "lxc2_start_0 18node1" [ style = bold]
+"lxc2_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
+"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"]
"lxc2_start_0 18node1" -> "lxc-ms_monitor_10000 lxc2" [ style = bold]
"lxc2_start_0 18node1" -> "lxc-ms_start_0 lxc2" [ style = bold]
"lxc2_start_0 18node1" -> "lxc2_monitor_30000 18node1" [ style = bold]
"lxc2_start_0 18node1" [ style=bold color="green" fontcolor="black"]
"stonith 'reboot' lxc1" -> "lxc-ms-master_stop_0" [ style = bold]
"stonith 'reboot' lxc1" -> "lxc-ms_demote_0 lxc1" [ style = bold]
"stonith 'reboot' lxc1" -> "lxc-ms_stop_0 lxc1" [ style = bold]
"stonith 'reboot' lxc1" -> "stonith_complete" [ style = bold]
"stonith 'reboot' lxc1" [ style=bold color="green" fontcolor="orange"]
"stonith 'reboot' lxc2" -> "lxc-ms-master_stop_0" [ style = bold]
"stonith 'reboot' lxc2" -> "lxc-ms_stop_0 lxc2" [ style = bold]
"stonith 'reboot' lxc2" -> "stonith_complete" [ style = bold]
"stonith 'reboot' lxc2" [ style=bold color="green" fontcolor="orange"]
"stonith_complete" -> "all_stopped" [ style = bold]
"stonith_complete" -> "container1_start_0 18node1" [ style = bold]
"stonith_complete" -> "container2_start_0 18node1" [ style = bold]
"stonith_complete" -> "lxc-ms_promote_0 lxc1" [ style = bold]
"stonith_complete" -> "lxc-ms_start_0 lxc1" [ style = bold]
"stonith_complete" -> "lxc-ms_start_0 lxc2" [ style = bold]
"stonith_complete" -> "lxc1_start_0 18node1" [ style = bold]
"stonith_complete" -> "lxc2_start_0 18node1" [ style = bold]
"stonith_complete" [ style=bold color="green" fontcolor="orange"]
}
diff --git a/pengine/test10/whitebox-ms-ordering.exp b/pengine/test10/whitebox-ms-ordering.exp
index 5d32d6fc66..de4f4d052c 100644
--- a/pengine/test10/whitebox-ms-ordering.exp
+++ b/pengine/test10/whitebox-ms-ordering.exp
@@ -1,513 +1,585 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/whitebox-ms-ordering.summary b/pengine/test10/whitebox-ms-ordering.summary
index 5d7c042bbe..365cf8d6d2 100644
--- a/pengine/test10/whitebox-ms-ordering.summary
+++ b/pengine/test10/whitebox-ms-ordering.summary
@@ -1,65 +1,71 @@
Current cluster status:
Online: [ 18node1 18node2 18node3 ]
shooter (stonith:fence_xvm): Started 18node2
container1 (ocf::heartbeat:VirtualDomain): FAILED
container2 (ocf::heartbeat:VirtualDomain): FAILED
Master/Slave Set: lxc-ms-master [lxc-ms]
Stopped: [ 18node1 18node2 18node3 ]
Transition Summary:
* Start container1 (18node1)
* Start container2 (18node1)
* Recover lxc-ms:0 (Master lxc1)
* Recover lxc-ms:1 (Slave lxc2)
* Start lxc1 (18node1)
* Start lxc2 (18node1)
Executing cluster transition:
* Resource action: container1 monitor on 18node3
* Resource action: container1 monitor on 18node2
* Resource action: container1 monitor on 18node1
* Resource action: container2 monitor on 18node3
* Resource action: container2 monitor on 18node2
* Resource action: container2 monitor on 18node1
* Resource action: lxc-ms monitor on 18node3
* Resource action: lxc-ms monitor on 18node2
* Resource action: lxc-ms monitor on 18node1
* Pseudo action: lxc-ms-master_demote_0
+ * Resource action: lxc1 monitor on 18node3
+ * Resource action: lxc1 monitor on 18node2
+ * Resource action: lxc1 monitor on 18node1
+ * Resource action: lxc2 monitor on 18node3
+ * Resource action: lxc2 monitor on 18node2
+ * Resource action: lxc2 monitor on 18node1
* Pseudo action: stonith-lxc2-reboot on lxc2
* Pseudo action: stonith-lxc1-reboot on lxc1
* Pseudo action: stonith_complete
* Resource action: container1 start on 18node1
* Resource action: container2 start on 18node1
* Pseudo action: lxc-ms_demote_0
* Pseudo action: lxc-ms-master_demoted_0
* Pseudo action: lxc-ms-master_stop_0
* Resource action: lxc1 start on 18node1
* Resource action: lxc2 start on 18node1
* Pseudo action: lxc-ms_stop_0
* Pseudo action: lxc-ms_stop_0
* Pseudo action: lxc-ms-master_stopped_0
* Pseudo action: lxc-ms-master_start_0
* Resource action: lxc1 monitor=30000 on 18node1
* Resource action: lxc2 monitor=30000 on 18node1
* Pseudo action: all_stopped
* Resource action: lxc-ms start on lxc1
* Resource action: lxc-ms start on lxc2
* Pseudo action: lxc-ms-master_running_0
* Resource action: lxc-ms monitor=10000 on lxc2
* Pseudo action: lxc-ms-master_promote_0
* Resource action: lxc-ms promote on lxc1
* Pseudo action: lxc-ms-master_promoted_0
Revised cluster status:
Online: [ 18node1 18node2 18node3 ]
Containers: [ lxc1:container1 lxc2:container2 ]
shooter (stonith:fence_xvm): Started 18node2
container1 (ocf::heartbeat:VirtualDomain): Started 18node1
container2 (ocf::heartbeat:VirtualDomain): Started 18node1
Master/Slave Set: lxc-ms-master [lxc-ms]
Masters: [ lxc1 ]
Slaves: [ lxc2 ]
diff --git a/pengine/test10/whitebox-nested-group.dot b/pengine/test10/whitebox-nested-group.dot
index 2e41e3e991..e149f9aaca 100644
--- a/pengine/test10/whitebox-nested-group.dot
+++ b/pengine/test10/whitebox-nested-group.dot
@@ -1,106 +1,112 @@
digraph "g" {
+"c7auto4_monitor_0 c7auto1" -> "c7auto4_start_0 c7auto1" [ style = bold]
+"c7auto4_monitor_0 c7auto1" [ style=bold color="green" fontcolor="black"]
+"c7auto4_monitor_0 c7auto2" -> "c7auto4_start_0 c7auto1" [ style = bold]
+"c7auto4_monitor_0 c7auto2" [ style=bold color="green" fontcolor="black"]
+"c7auto4_monitor_0 c7auto3" -> "c7auto4_start_0 c7auto1" [ style = bold]
+"c7auto4_monitor_0 c7auto3" [ style=bold color="green" fontcolor="black"]
"c7auto4_monitor_30000 c7auto1" [ style=bold color="green" fontcolor="black"]
"c7auto4_start_0 c7auto1" -> "c7auto4_monitor_30000 c7auto1" [ style = bold]
"c7auto4_start_0 c7auto1" -> "fake2_monitor_10000 c7auto4" [ style = bold]
"c7auto4_start_0 c7auto1" -> "fake2_start_0 c7auto4" [ style = bold]
"c7auto4_start_0 c7auto1" -> "fake5_monitor_10000 c7auto4" [ style = bold]
"c7auto4_start_0 c7auto1" -> "fake5_start_0 c7auto4" [ style = bold]
"c7auto4_start_0 c7auto1" -> "fake:2_monitor_10000 c7auto4" [ style = bold]
"c7auto4_start_0 c7auto1" -> "fake:2_start_0 c7auto4" [ style = bold]
"c7auto4_start_0 c7auto1" [ style=bold color="green" fontcolor="black"]
"container_monitor_10000 c7auto1" [ style=bold color="green" fontcolor="black"]
"container_start_0 c7auto1" -> "c7auto4_start_0 c7auto1" [ style = bold]
"container_start_0 c7auto1" -> "container_monitor_10000 c7auto1" [ style = bold]
"container_start_0 c7auto1" -> "fake_group_running_0" [ style = bold]
"container_start_0 c7auto1" [ style=bold color="green" fontcolor="black"]
"fake1_monitor_0 c7auto1" -> "fake1_start_0 c7auto3" [ style = bold]
"fake1_monitor_0 c7auto1" [ style=bold color="green" fontcolor="black"]
"fake1_monitor_0 c7auto2" -> "fake1_start_0 c7auto3" [ style = bold]
"fake1_monitor_0 c7auto2" [ style=bold color="green" fontcolor="black"]
"fake1_monitor_0 c7auto3" -> "fake1_start_0 c7auto3" [ style = bold]
"fake1_monitor_0 c7auto3" [ style=bold color="green" fontcolor="black"]
"fake1_monitor_10000 c7auto3" [ style=bold color="green" fontcolor="black"]
"fake1_start_0 c7auto3" -> "fake1_monitor_10000 c7auto3" [ style = bold]
"fake1_start_0 c7auto3" [ style=bold color="green" fontcolor="black"]
"fake2_monitor_0 c7auto1" -> "fake2_start_0 c7auto4" [ style = bold]
"fake2_monitor_0 c7auto1" [ style=bold color="green" fontcolor="black"]
"fake2_monitor_0 c7auto2" -> "fake2_start_0 c7auto4" [ style = bold]
"fake2_monitor_0 c7auto2" [ style=bold color="green" fontcolor="black"]
"fake2_monitor_0 c7auto3" -> "fake2_start_0 c7auto4" [ style = bold]
"fake2_monitor_0 c7auto3" [ style=bold color="green" fontcolor="black"]
"fake2_monitor_10000 c7auto4" [ style=bold color="green" fontcolor="black"]
"fake2_start_0 c7auto4" -> "fake2_monitor_10000 c7auto4" [ style = bold]
"fake2_start_0 c7auto4" [ style=bold color="green" fontcolor="black"]
"fake3_monitor_0 c7auto1" -> "fake3_start_0 c7auto2" [ style = bold]
"fake3_monitor_0 c7auto1" [ style=bold color="green" fontcolor="black"]
"fake3_monitor_0 c7auto2" -> "fake3_start_0 c7auto2" [ style = bold]
"fake3_monitor_0 c7auto2" [ style=bold color="green" fontcolor="black"]
"fake3_monitor_0 c7auto3" -> "fake3_start_0 c7auto2" [ style = bold]
"fake3_monitor_0 c7auto3" [ style=bold color="green" fontcolor="black"]
"fake3_monitor_10000 c7auto2" [ style=bold color="green" fontcolor="black"]
"fake3_start_0 c7auto2" -> "fake3_monitor_10000 c7auto2" [ style = bold]
"fake3_start_0 c7auto2" [ style=bold color="green" fontcolor="black"]
"fake4_monitor_0 c7auto1" -> "fake4_start_0 c7auto3" [ style = bold]
"fake4_monitor_0 c7auto1" [ style=bold color="green" fontcolor="black"]
"fake4_monitor_0 c7auto2" -> "fake4_start_0 c7auto3" [ style = bold]
"fake4_monitor_0 c7auto2" [ style=bold color="green" fontcolor="black"]
"fake4_monitor_0 c7auto3" -> "fake4_start_0 c7auto3" [ style = bold]
"fake4_monitor_0 c7auto3" [ style=bold color="green" fontcolor="black"]
"fake4_monitor_10000 c7auto3" [ style=bold color="green" fontcolor="black"]
"fake4_start_0 c7auto3" -> "fake4_monitor_10000 c7auto3" [ style = bold]
"fake4_start_0 c7auto3" [ style=bold color="green" fontcolor="black"]
"fake5_monitor_0 c7auto1" -> "fake5_start_0 c7auto4" [ style = bold]
"fake5_monitor_0 c7auto1" [ style=bold color="green" fontcolor="black"]
"fake5_monitor_0 c7auto2" -> "fake5_start_0 c7auto4" [ style = bold]
"fake5_monitor_0 c7auto2" [ style=bold color="green" fontcolor="black"]
"fake5_monitor_0 c7auto3" -> "fake5_start_0 c7auto4" [ style = bold]
"fake5_monitor_0 c7auto3" [ style=bold color="green" fontcolor="black"]
"fake5_monitor_10000 c7auto4" [ style=bold color="green" fontcolor="black"]
"fake5_start_0 c7auto4" -> "fake5_monitor_10000 c7auto4" [ style = bold]
"fake5_start_0 c7auto4" [ style=bold color="green" fontcolor="black"]
"fake:0_monitor_0 c7auto2" -> "fake_clone_start_0" [ style = bold]
"fake:0_monitor_0 c7auto2" [ style=bold color="green" fontcolor="black"]
"fake:0_monitor_10000 c7auto2" [ style=bold color="green" fontcolor="black"]
"fake:0_start_0 c7auto2" -> "fake:0_monitor_10000 c7auto2" [ style = bold]
"fake:0_start_0 c7auto2" -> "fake_clone_running_0" [ style = bold]
"fake:0_start_0 c7auto2" [ style=bold color="green" fontcolor="black"]
"fake:1_monitor_0 c7auto3" -> "fake_clone_start_0" [ style = bold]
"fake:1_monitor_0 c7auto3" [ style=bold color="green" fontcolor="black"]
"fake:1_monitor_10000 c7auto3" [ style=bold color="green" fontcolor="black"]
"fake:1_start_0 c7auto3" -> "fake:1_monitor_10000 c7auto3" [ style = bold]
"fake:1_start_0 c7auto3" -> "fake_clone_running_0" [ style = bold]
"fake:1_start_0 c7auto3" [ style=bold color="green" fontcolor="black"]
"fake:2_monitor_10000 c7auto4" [ style=bold color="green" fontcolor="black"]
"fake:2_start_0 c7auto4" -> "fake:2_monitor_10000 c7auto4" [ style = bold]
"fake:2_start_0 c7auto4" -> "fake_clone_running_0" [ style = bold]
"fake:2_start_0 c7auto4" [ style=bold color="green" fontcolor="black"]
"fake:3_monitor_0 c7auto1" -> "fake_clone_start_0" [ style = bold]
"fake:3_monitor_0 c7auto1" [ style=bold color="green" fontcolor="black"]
"fake:3_monitor_10000 c7auto1" [ style=bold color="green" fontcolor="black"]
"fake:3_start_0 c7auto1" -> "fake:3_monitor_10000 c7auto1" [ style = bold]
"fake:3_start_0 c7auto1" -> "fake_clone_running_0" [ style = bold]
"fake:3_start_0 c7auto1" [ style=bold color="green" fontcolor="black"]
"fake_clone_running_0" [ style=bold color="green" fontcolor="orange"]
"fake_clone_start_0" -> "fake:0_start_0 c7auto2" [ style = bold]
"fake_clone_start_0" -> "fake:1_start_0 c7auto3" [ style = bold]
"fake_clone_start_0" -> "fake:2_start_0 c7auto4" [ style = bold]
"fake_clone_start_0" -> "fake:3_start_0 c7auto1" [ style = bold]
"fake_clone_start_0" -> "fake_clone_running_0" [ style = bold]
"fake_clone_start_0" [ style=bold color="green" fontcolor="orange"]
"fake_fs_monitor_0 c7auto1" -> "fake_fs_start_0 c7auto1" [ style = bold]
"fake_fs_monitor_0 c7auto1" [ style=bold color="green" fontcolor="black"]
"fake_fs_monitor_0 c7auto2" -> "fake_fs_start_0 c7auto1" [ style = bold]
"fake_fs_monitor_0 c7auto2" [ style=bold color="green" fontcolor="black"]
"fake_fs_monitor_0 c7auto3" -> "fake_fs_start_0 c7auto1" [ style = bold]
"fake_fs_monitor_0 c7auto3" [ style=bold color="green" fontcolor="black"]
"fake_fs_monitor_10000 c7auto1" [ style=bold color="green" fontcolor="black"]
"fake_fs_start_0 c7auto1" -> "container_start_0 c7auto1" [ style = bold]
"fake_fs_start_0 c7auto1" -> "fake_fs_monitor_10000 c7auto1" [ style = bold]
"fake_fs_start_0 c7auto1" -> "fake_group_running_0" [ style = bold]
"fake_fs_start_0 c7auto1" [ style=bold color="green" fontcolor="black"]
"fake_group_running_0" [ style=bold color="green" fontcolor="orange"]
"fake_group_start_0" -> "container_start_0 c7auto1" [ style = bold]
"fake_group_start_0" -> "fake_fs_start_0 c7auto1" [ style = bold]
"fake_group_start_0" -> "fake_group_running_0" [ style = bold]
"fake_group_start_0" [ style=bold color="green" fontcolor="orange"]
}
diff --git a/pengine/test10/whitebox-nested-group.exp b/pengine/test10/whitebox-nested-group.exp
index 67767d3fdb..e6b68f237b 100644
--- a/pengine/test10/whitebox-nested-group.exp
+++ b/pengine/test10/whitebox-nested-group.exp
@@ -1,631 +1,667 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pengine/test10/whitebox-nested-group.summary b/pengine/test10/whitebox-nested-group.summary
index 6e6287ace1..ca9c47f13e 100644
--- a/pengine/test10/whitebox-nested-group.summary
+++ b/pengine/test10/whitebox-nested-group.summary
@@ -1,97 +1,100 @@
Current cluster status:
Online: [ c7auto1 c7auto2 c7auto3 ]
shooter (stonith:fence_phd_kvm): Started c7auto2
fake1 (ocf::heartbeat:Dummy): Stopped
fake2 (ocf::heartbeat:Dummy): Stopped
fake3 (ocf::heartbeat:Dummy): Stopped
fake4 (ocf::heartbeat:Dummy): Stopped
fake5 (ocf::heartbeat:Dummy): Stopped
Clone Set: fake_clone [fake]
Stopped: [ c7auto1 c7auto2 c7auto3 c7auto4 ]
Resource Group: fake_group
fake_fs (ocf::heartbeat:Dummy): Stopped
container (ocf::heartbeat:Dummy): Stopped
Transition Summary:
* Start fake1 (c7auto3)
* Start fake2 (c7auto4)
* Start fake3 (c7auto2)
* Start fake4 (c7auto3)
* Start fake5 (c7auto4)
* Start fake:0 (c7auto2)
* Start fake:1 (c7auto3)
* Start fake:2 (c7auto4)
* Start fake:3 (c7auto1)
* Start fake_fs (c7auto1)
* Start container (c7auto1)
* Start c7auto4 (c7auto1)
Executing cluster transition:
* Resource action: fake1 monitor on c7auto3
* Resource action: fake1 monitor on c7auto2
* Resource action: fake1 monitor on c7auto1
* Resource action: fake2 monitor on c7auto3
* Resource action: fake2 monitor on c7auto2
* Resource action: fake2 monitor on c7auto1
* Resource action: fake3 monitor on c7auto3
* Resource action: fake3 monitor on c7auto2
* Resource action: fake3 monitor on c7auto1
* Resource action: fake4 monitor on c7auto3
* Resource action: fake4 monitor on c7auto2
* Resource action: fake4 monitor on c7auto1
* Resource action: fake5 monitor on c7auto3
* Resource action: fake5 monitor on c7auto2
* Resource action: fake5 monitor on c7auto1
* Resource action: fake:0 monitor on c7auto2
* Resource action: fake:1 monitor on c7auto3
* Resource action: fake:3 monitor on c7auto1
* Pseudo action: fake_clone_start_0
* Pseudo action: fake_group_start_0
* Resource action: fake_fs monitor on c7auto3
* Resource action: fake_fs monitor on c7auto2
* Resource action: fake_fs monitor on c7auto1
+ * Resource action: c7auto4 monitor on c7auto3
+ * Resource action: c7auto4 monitor on c7auto2
+ * Resource action: c7auto4 monitor on c7auto1
* Resource action: fake1 start on c7auto3
* Resource action: fake3 start on c7auto2
* Resource action: fake4 start on c7auto3
* Resource action: fake:0 start on c7auto2
* Resource action: fake:1 start on c7auto3
* Resource action: fake:3 start on c7auto1
* Resource action: fake_fs start on c7auto1
* Resource action: container start on c7auto1
* Resource action: c7auto4 start on c7auto1
* Resource action: fake1 monitor=10000 on c7auto3
* Resource action: fake2 start on c7auto4
* Resource action: fake3 monitor=10000 on c7auto2
* Resource action: fake4 monitor=10000 on c7auto3
* Resource action: fake5 start on c7auto4
* Resource action: fake:0 monitor=10000 on c7auto2
* Resource action: fake:1 monitor=10000 on c7auto3
* Resource action: fake:2 start on c7auto4
* Resource action: fake:3 monitor=10000 on c7auto1
* Pseudo action: fake_clone_running_0
* Pseudo action: fake_group_running_0
* Resource action: fake_fs monitor=10000 on c7auto1
* Resource action: container monitor=10000 on c7auto1
* Resource action: c7auto4 monitor=30000 on c7auto1
* Resource action: fake2 monitor=10000 on c7auto4
* Resource action: fake5 monitor=10000 on c7auto4
* Resource action: fake:2 monitor=10000 on c7auto4
Revised cluster status:
Online: [ c7auto1 c7auto2 c7auto3 ]
Containers: [ c7auto4:container ]
shooter (stonith:fence_phd_kvm): Started c7auto2
fake1 (ocf::heartbeat:Dummy): Started c7auto3
fake2 (ocf::heartbeat:Dummy): Started c7auto4
fake3 (ocf::heartbeat:Dummy): Started c7auto2
fake4 (ocf::heartbeat:Dummy): Started c7auto3
fake5 (ocf::heartbeat:Dummy): Started c7auto4
Clone Set: fake_clone [fake]
Started: [ c7auto1 c7auto2 c7auto3 c7auto4 ]
Resource Group: fake_group
fake_fs (ocf::heartbeat:Dummy): Started c7auto1
container (ocf::heartbeat:Dummy): Started c7auto1
diff --git a/pengine/test10/whitebox-unexpectedly-running.dot b/pengine/test10/whitebox-unexpectedly-running.dot
index 2915d776ee..0e2e5bb62a 100644
--- a/pengine/test10/whitebox-unexpectedly-running.dot
+++ b/pengine/test10/whitebox-unexpectedly-running.dot
@@ -1,18 +1,20 @@
digraph "g" {
"FAKE_monitor_60000 18builder" [ style=bold color="green" fontcolor="black"]
"FAKE_start_0 18builder" -> "FAKE_monitor_60000 18builder" [ style = bold]
"FAKE_start_0 18builder" -> "remote1_start_0 18builder" [ style = bold]
"FAKE_start_0 18builder" [ style=bold color="green" fontcolor="black"]
"FAKE_stop_0 18builder" -> "FAKE_start_0 18builder" [ style = bold]
"FAKE_stop_0 18builder" -> "all_stopped" [ style = bold]
"FAKE_stop_0 18builder" -> "stonith 'reboot' remote1" [ style = bold]
"FAKE_stop_0 18builder" [ style=bold color="green" fontcolor="black"]
"all_stopped" [ style=bold color="green" fontcolor="orange"]
+"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"]
"remote1_start_0 18builder" -> "remote1_monitor_30000 18builder" [ style = bold]
"remote1_start_0 18builder" [ style=bold color="green" fontcolor="black"]
"stonith 'reboot' remote1" -> "stonith_complete" [ style = bold]
"stonith 'reboot' remote1" [ style=bold color="green" fontcolor="orange"]
"stonith_complete" -> "all_stopped" [ style = bold]
"stonith_complete" [ style=bold color="green" fontcolor="orange"]
}
diff --git a/pengine/test10/whitebox-unexpectedly-running.exp b/pengine/test10/whitebox-unexpectedly-running.exp
index 17606ce033..a0e5caed79 100644
--- a/pengine/test10/whitebox-unexpectedly-running.exp
+++ b/pengine/test10/whitebox-unexpectedly-running.exp
@@ -1,105 +1,117 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/whitebox-unexpectedly-running.summary b/pengine/test10/whitebox-unexpectedly-running.summary
index 7d5b90817b..0b5ca423c0 100644
--- a/pengine/test10/whitebox-unexpectedly-running.summary
+++ b/pengine/test10/whitebox-unexpectedly-running.summary
@@ -1,26 +1,27 @@
Current cluster status:
Online: [ 18builder ]
FAKE (ocf::pacemaker:Dummy): FAILED 18builder
Transition Summary:
* Recover FAKE (Started 18builder)
* Start remote1 (18builder)
Executing cluster transition:
* Resource action: FAKE stop on 18builder
+ * Resource action: remote1 monitor on 18builder
* Pseudo action: stonith-remote1-reboot on remote1
* Pseudo action: stonith_complete
* Pseudo action: all_stopped
* Resource action: FAKE start on 18builder
* Resource action: remote1 start on 18builder
* Resource action: FAKE monitor=60000 on 18builder
* Resource action: remote1 monitor=30000 on 18builder
Revised cluster status:
Online: [ 18builder ]
Containers: [ remote1:FAKE ]
FAKE (ocf::pacemaker:Dummy): Started 18builder