diff --git a/pengine/test10/bug-cl-5247.dot b/pengine/test10/bug-cl-5247.dot
index ed728ac029..0ab78932e5 100644
--- a/pengine/test10/bug-cl-5247.dot
+++ b/pengine/test10/bug-cl-5247.dot
@@ -1,136 +1,145 @@
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_stop_0 pgsr01" [ 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_stop_0" -> "all_stopped" [ style = bold]
-"pgsql_confirmed-post_notify_stop_0" -> "pgsql_monitor_9000 pgsr01" [ style = bold]
-"pgsql_confirmed-post_notify_stop_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_stop_0 pgsr01" -> "msPostgresql_confirmed-post_notify_stopped_0" [ style = bold]
-"pgsql_post_notify_stop_0 pgsr01" -> "pgsql_confirmed-post_notify_stop_0" [ style = bold]
-"pgsql_post_notify_stop_0 pgsr01" [ style=bold color="green" fontcolor="black"]
-"pgsql_post_notify_stop_0" -> "pgsql_confirmed-post_notify_stop_0" [ style = bold]
-"pgsql_post_notify_stop_0" -> "pgsql_post_notify_stop_0 pgsr01" [ style = bold]
-"pgsql_post_notify_stop_0" [ style=bold color="green" fontcolor="orange"]
+"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"]
"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" -> "master-group_stop_0" [ style = bold]
-"prmDB2_stop_0 bl460g8n4" -> "msPostgresql_stop_0" [ style = bold]
-"prmDB2_stop_0 bl460g8n4" -> "pgsql_demote_0 pgsr02" [ style = bold]
-"prmDB2_stop_0 bl460g8n4" -> "pgsql_post_notify_stop_0" [ style = bold]
-"prmDB2_stop_0 bl460g8n4" -> "pgsql_stop_0 pgsr02" [ style = bold]
-"prmDB2_stop_0 bl460g8n4" -> "vip-master_stop_0 pgsr02" [ style = bold]
-"prmDB2_stop_0 bl460g8n4" -> "vip-rep_stop_0 pgsr02" [ 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="orange"]
+"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 24bccdd81a..59a62af73f 100644
--- a/pengine/test10/bug-cl-5247.exp
+++ b/pengine/test10/bug-cl-5247.exp
@@ -1,707 +1,750 @@
-
+
-
+
+
-
+
-
+
+
+
+
+
+
+
-
+
-
+
+
+
+
-
-
-
+
+
+
+
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
diff --git a/pengine/test10/bug-cl-5247.summary b/pengine/test10/bug-cl-5247.summary
index 5564286fe8..09dc301139 100644
--- a/pengine/test10/bug-cl-5247.summary
+++ b/pengine/test10/bug-cl-5247.summary
@@ -1,96 +1,98 @@
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
- * Pseudo action: prmStonith1-2_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
* Pseudo action: grpStonith1_stopped_0
* Pseudo action: grpStonith1_start_0
- * Resource action: prmStonith1-2 start on bl460g8n4
- * Resource action: prmStonith1-2 monitor=3600000 on bl460g8n4
* Pseudo action: grpStonith2_stopped_0
* Pseudo action: grpStonith2_start_0
- * Resource action: prmStonith2-2 start on bl460g8n3
- * Resource action: prmStonith2-2 monitor=3600000 on bl460g8n3
- * Pseudo action: pgsql_post_notify_stop_0
* Resource action: pgsql notify on pgsr01
* Pseudo action: msPostgresql_confirmed-pre_notify_demote_0
* Pseudo action: msPostgresql_demote_0
- * Pseudo action: grpStonith1_running_0
- * Pseudo action: grpStonith2_running_0
+ * 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[ pgsr02 pgsr01 ]
vip-rep (ocf::heartbeat:Dummy): FAILED[ pgsr02 pgsr01 ]
Master/Slave Set: msPostgresql [pgsql]
Masters: [ pgsr01 ]
Stopped: [ bl460g8n3 bl460g8n4 ]
diff --git a/pengine/test10/bug-rh-1097457.dot b/pengine/test10/bug-rh-1097457.dot
index 078d17730c..ece2834791 100644
--- a/pengine/test10/bug-rh-1097457.dot
+++ b/pengine/test10/bug-rh-1097457.dot
@@ -1,86 +1,97 @@
digraph "g" {
"FAKE4-IP_monitor_30000 lamaVM2" [ style=bold color="green" fontcolor="black"]
"FAKE4-IP_start_0 lamaVM2" -> "FAKE4-IP_monitor_30000 lamaVM2" [ style = bold]
"FAKE4-IP_start_0 lamaVM2" -> "lamaVM2-G4_running_0" [ style = bold]
"FAKE4-IP_start_0 lamaVM2" [ style=bold color="green" fontcolor="black"]
"FAKE4-IP_stop_0 lamaVM2" -> "FAKE4-IP_start_0 lamaVM2" [ style = bold]
"FAKE4-IP_stop_0 lamaVM2" -> "FAKE4_stop_0 lamaVM2" [ style = bold]
"FAKE4-IP_stop_0 lamaVM2" -> "all_stopped" [ style = bold]
"FAKE4-IP_stop_0 lamaVM2" -> "lamaVM2-G4_stopped_0" [ style = bold]
"FAKE4-IP_stop_0 lamaVM2" [ style=bold color="green" fontcolor="orange"]
"FAKE4_monitor_30000 lamaVM2" [ style=bold color="green" fontcolor="black"]
"FAKE4_start_0 lamaVM2" -> "FAKE4-IP_start_0 lamaVM2" [ style = bold]
"FAKE4_start_0 lamaVM2" -> "FAKE4_monitor_30000 lamaVM2" [ style = bold]
"FAKE4_start_0 lamaVM2" -> "lamaVM2-G4_running_0" [ style = bold]
"FAKE4_start_0 lamaVM2" [ style=bold color="green" fontcolor="black"]
"FAKE4_stop_0 lamaVM2" -> "FAKE4_start_0 lamaVM2" [ style = bold]
"FAKE4_stop_0 lamaVM2" -> "all_stopped" [ style = bold]
"FAKE4_stop_0 lamaVM2" -> "lamaVM2-G4_stopped_0" [ style = bold]
"FAKE4_stop_0 lamaVM2" [ style=bold color="green" fontcolor="orange"]
"FAKE6-clone_running_0" [ style=bold color="green" fontcolor="orange"]
"FAKE6-clone_start_0" -> "FAKE6-clone_running_0" [ style = bold]
"FAKE6-clone_start_0" -> "FAKE6_start_0 lamaVM2" [ style = bold]
"FAKE6-clone_start_0" [ style=bold color="green" fontcolor="orange"]
"FAKE6-clone_stop_0" -> "FAKE6-clone_stopped_0" [ style = bold]
"FAKE6-clone_stop_0" -> "FAKE6_stop_0 lamaVM2" [ style = bold]
"FAKE6-clone_stop_0" [ style=bold color="green" fontcolor="orange"]
"FAKE6-clone_stopped_0" -> "FAKE6-clone_start_0" [ style = bold]
"FAKE6-clone_stopped_0" [ style=bold color="green" fontcolor="orange"]
"FAKE6_monitor_30000 lamaVM2" [ style=bold color="green" fontcolor="black"]
"FAKE6_start_0 lamaVM2" -> "FAKE6-clone_running_0" [ style = bold]
"FAKE6_start_0 lamaVM2" -> "FAKE6_monitor_30000 lamaVM2" [ style = bold]
"FAKE6_start_0 lamaVM2" [ style=bold color="green" fontcolor="black"]
"FAKE6_stop_0 lamaVM2" -> "FAKE6-clone_stopped_0" [ style = bold]
"FAKE6_stop_0 lamaVM2" -> "FAKE6_start_0 lamaVM2" [ style = bold]
"FAKE6_stop_0 lamaVM2" -> "all_stopped" [ style = bold]
"FAKE6_stop_0 lamaVM2" [ style=bold color="green" fontcolor="orange"]
"FSlun3_monitor_10000 lama2" [ style=bold color="green" fontcolor="black"]
"FSlun3_monitor_10000 lamaVM2" [ style=bold color="green" fontcolor="black"]
"FSlun3_start_0 lama2" -> "FSlun3_monitor_10000 lama2" [ style = bold]
"FSlun3_start_0 lama2" -> "lamaVM2-G4_start_0" [ style = bold]
"FSlun3_start_0 lama2" [ style=bold color="green" fontcolor="black"]
"FSlun3_stop_0 lamaVM2" -> "FSlun3_start_0 lama2" [ style = bold]
"FSlun3_stop_0 lamaVM2" -> "all_stopped" [ style = bold]
"FSlun3_stop_0 lamaVM2" [ style=bold color="green" fontcolor="orange"]
"VM2_monitor_10000 lama3" [ style=bold color="green" fontcolor="black"]
"VM2_start_0 lama3" -> "FSlun3_start_0 lama2" [ style = bold]
"VM2_start_0 lama3" -> "VM2_monitor_10000 lama3" [ style = bold]
"VM2_start_0 lama3" -> "lamaVM2_start_0 lama3" [ style = bold]
"VM2_start_0 lama3" [ style=bold color="green" fontcolor="black"]
-"VM2_stop_0 lama3" -> "FAKE4-IP_stop_0 lamaVM2" [ style = bold]
-"VM2_stop_0 lama3" -> "FAKE4_stop_0 lamaVM2" [ style = bold]
-"VM2_stop_0 lama3" -> "FAKE6-clone_stop_0" [ style = bold]
-"VM2_stop_0 lama3" -> "FAKE6_stop_0 lamaVM2" [ style = bold]
-"VM2_stop_0 lama3" -> "FSlun3_stop_0 lamaVM2" [ style = bold]
"VM2_stop_0 lama3" -> "VM2_start_0 lama3" [ style = bold]
"VM2_stop_0 lama3" -> "all_stopped" [ style = bold]
-"VM2_stop_0 lama3" -> "lamaVM2-G4_stop_0" [ style = bold]
+"VM2_stop_0 lama3" -> "stonith 'reboot' lamaVM2" [ style = bold]
"VM2_stop_0 lama3" [ style=bold color="green" fontcolor="black"]
"all_stopped" [ style=bold color="green" fontcolor="orange"]
"lamaVM2-G4_running_0" [ style=bold color="green" fontcolor="orange"]
"lamaVM2-G4_start_0" -> "FAKE4-IP_start_0 lamaVM2" [ style = bold]
"lamaVM2-G4_start_0" -> "FAKE4_start_0 lamaVM2" [ style = bold]
"lamaVM2-G4_start_0" -> "lamaVM2-G4_running_0" [ style = bold]
"lamaVM2-G4_start_0" [ style=bold color="green" fontcolor="orange"]
"lamaVM2-G4_stop_0" -> "FAKE4-IP_stop_0 lamaVM2" [ style = bold]
"lamaVM2-G4_stop_0" -> "FAKE4_stop_0 lamaVM2" [ style = bold]
"lamaVM2-G4_stop_0" -> "lamaVM2-G4_stopped_0" [ style = bold]
"lamaVM2-G4_stop_0" [ style=bold color="green" fontcolor="orange"]
"lamaVM2-G4_stopped_0" -> "FSlun3_stop_0 lamaVM2" [ style = bold]
"lamaVM2-G4_stopped_0" -> "lamaVM2-G4_start_0" [ style = bold]
"lamaVM2-G4_stopped_0" [ style=bold color="green" fontcolor="orange"]
"lamaVM2_monitor_30000 lama3" [ style=bold color="green" fontcolor="black"]
"lamaVM2_start_0 lama3" -> "FAKE4-IP_monitor_30000 lamaVM2" [ style = bold]
"lamaVM2_start_0 lama3" -> "FAKE4-IP_start_0 lamaVM2" [ style = bold]
"lamaVM2_start_0 lama3" -> "FAKE4_monitor_30000 lamaVM2" [ style = bold]
"lamaVM2_start_0 lama3" -> "FAKE4_start_0 lamaVM2" [ style = bold]
"lamaVM2_start_0 lama3" -> "FAKE6_monitor_30000 lamaVM2" [ style = bold]
"lamaVM2_start_0 lama3" -> "FAKE6_start_0 lamaVM2" [ style = bold]
"lamaVM2_start_0 lama3" -> "FSlun3_monitor_10000 lamaVM2" [ style = bold]
"lamaVM2_start_0 lama3" -> "lamaVM2_monitor_30000 lama3" [ style = bold]
"lamaVM2_start_0 lama3" [ style=bold color="green" fontcolor="black"]
"lamaVM2_stop_0 lama3" -> "VM2_stop_0 lama3" [ style = bold]
"lamaVM2_stop_0 lama3" -> "all_stopped" [ style = bold]
"lamaVM2_stop_0 lama3" -> "lamaVM2_start_0 lama3" [ style = bold]
"lamaVM2_stop_0 lama3" [ style=bold color="green" fontcolor="black"]
+"stonith 'reboot' lamaVM2" -> "FAKE4-IP_stop_0 lamaVM2" [ style = bold]
+"stonith 'reboot' lamaVM2" -> "FAKE4_stop_0 lamaVM2" [ style = bold]
+"stonith 'reboot' lamaVM2" -> "FAKE6-clone_stop_0" [ style = bold]
+"stonith 'reboot' lamaVM2" -> "FAKE6_stop_0 lamaVM2" [ style = bold]
+"stonith 'reboot' lamaVM2" -> "FSlun3_stop_0 lamaVM2" [ style = bold]
+"stonith 'reboot' lamaVM2" -> "lamaVM2-G4_stop_0" [ style = bold]
+"stonith 'reboot' lamaVM2" -> "stonith_complete" [ style = bold]
+"stonith 'reboot' lamaVM2" [ style=bold color="green" fontcolor="orange"]
+"stonith_complete" -> "FAKE4-IP_start_0 lamaVM2" [ style = bold]
+"stonith_complete" -> "FAKE4_start_0 lamaVM2" [ style = bold]
+"stonith_complete" -> "FAKE6_start_0 lamaVM2" [ style = bold]
+"stonith_complete" -> "FSlun3_start_0 lama2" [ style = bold]
+"stonith_complete" -> "VM2_start_0 lama3" [ style = bold]
+"stonith_complete" -> "all_stopped" [ style = bold]
+"stonith_complete" -> "lamaVM2_start_0 lama3" [ style = bold]
+"stonith_complete" [ style=bold color="green" fontcolor="orange"]
}
diff --git a/pengine/test10/bug-rh-1097457.exp b/pengine/test10/bug-rh-1097457.exp
index 94a4e8d3dc..0c3430c45c 100644
--- a/pengine/test10/bug-rh-1097457.exp
+++ b/pengine/test10/bug-rh-1097457.exp
@@ -1,439 +1,487 @@
+
+
+
+
+
+
-
+
-
+
-
+
+
+
+
-
-
-
+
+
+
+
+
+
-
+
-
+
+
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pengine/test10/bug-rh-1097457.summary b/pengine/test10/bug-rh-1097457.summary
index d78d951c17..f8d2c1446d 100644
--- a/pengine/test10/bug-rh-1097457.summary
+++ b/pengine/test10/bug-rh-1097457.summary
@@ -1,102 +1,104 @@
2 of 26 resources DISABLED and 0 BLOCKED from being started due to failures
Current cluster status:
Online: [ lama2 lama3 ]
Containers: [ lamaVM1:VM1 lamaVM2:VM2 lamaVM3:VM3 ]
restofencelama2 (stonith:fence_ipmilan): Started lama3
restofencelama3 (stonith:fence_ipmilan): Started lama2
VM1 (ocf::heartbeat:VirtualDomain): Started lama2
FSlun1 (ocf::heartbeat:Filesystem): Started lamaVM1
FSlun2 (ocf::heartbeat:Filesystem): Started lamaVM1
VM2 (ocf::heartbeat:VirtualDomain): FAILED lama3
VM3 (ocf::heartbeat:VirtualDomain): Started lama3
FSlun3 (ocf::heartbeat:Filesystem): FAILED lamaVM2
FSlun4 (ocf::heartbeat:Filesystem): Started lamaVM3
FAKE5-IP (ocf::heartbeat:IPaddr2): Stopped ( disabled )
FAKE6-IP (ocf::heartbeat:IPaddr2): Stopped ( disabled )
FAKE5 (ocf::heartbeat:Dummy): Started lamaVM3
Resource Group: lamaVM1-G1
FAKE1 (ocf::heartbeat:Dummy): Started lamaVM1
FAKE1-IP (ocf::heartbeat:IPaddr2): Started lamaVM1
Resource Group: lamaVM1-G2
FAKE2 (ocf::heartbeat:Dummy): Started lamaVM1
FAKE2-IP (ocf::heartbeat:IPaddr2): Started lamaVM1
Resource Group: lamaVM1-G3
FAKE3 (ocf::heartbeat:Dummy): Started lamaVM1
FAKE3-IP (ocf::heartbeat:IPaddr2): Started lamaVM1
Resource Group: lamaVM2-G4
FAKE4 (ocf::heartbeat:Dummy): Started lamaVM2
FAKE4-IP (ocf::heartbeat:IPaddr2): Started lamaVM2
Clone Set: FAKE6-clone [FAKE6]
Started: [ lamaVM1 lamaVM2 lamaVM3 ]
Transition Summary:
* Recover VM2 (Started lama3)
* Recover FSlun3 (Started lamaVM2 -> lama2)
* Restart FAKE4 (Started lamaVM2)
* Restart FAKE4-IP (Started lamaVM2)
* Restart FAKE6:2 (Started lamaVM2)
* Restart lamaVM2 (Started lama3)
Executing cluster transition:
* Resource action: lamaVM2 stop on lama3
* Resource action: VM2 stop on lama3
+ * Pseudo action: stonith-lamaVM2-reboot on lamaVM2
+ * Pseudo action: stonith_complete
+ * Resource action: VM2 start on lama3
+ * Resource action: VM2 monitor=10000 on lama3
* Pseudo action: lamaVM2-G4_stop_0
* Pseudo action: FAKE4-IP_stop_0
* Pseudo action: FAKE6-clone_stop_0
- * Resource action: VM2 start on lama3
- * Resource action: VM2 monitor=10000 on lama3
+ * Resource action: lamaVM2 start on lama3
+ * Resource action: lamaVM2 monitor=30000 on lama3
+ * Resource action: FSlun3 monitor=10000 on lamaVM2
* Pseudo action: FAKE4_stop_0
* Pseudo action: FAKE6_stop_0
* Pseudo action: FAKE6-clone_stopped_0
* Pseudo action: FAKE6-clone_start_0
- * Resource action: lamaVM2 start on lama3
- * Resource action: lamaVM2 monitor=30000 on lama3
- * Resource action: FSlun3 monitor=10000 on lamaVM2
* Pseudo action: lamaVM2-G4_stopped_0
* Resource action: FAKE6 start on lamaVM2
* Resource action: FAKE6 monitor=30000 on lamaVM2
* Pseudo action: FAKE6-clone_running_0
* Pseudo action: FSlun3_stop_0
* Pseudo action: all_stopped
* Resource action: FSlun3 start on lama2
* Pseudo action: lamaVM2-G4_start_0
* Resource action: FAKE4 start on lamaVM2
* Resource action: FAKE4 monitor=30000 on lamaVM2
* Resource action: FAKE4-IP start on lamaVM2
* Resource action: FAKE4-IP monitor=30000 on lamaVM2
* Resource action: FSlun3 monitor=10000 on lama2
* Pseudo action: lamaVM2-G4_running_0
Revised cluster status:
Online: [ lama2 lama3 ]
Containers: [ lamaVM1:VM1 lamaVM2:VM2 lamaVM3:VM3 ]
restofencelama2 (stonith:fence_ipmilan): Started lama3
restofencelama3 (stonith:fence_ipmilan): Started lama2
VM1 (ocf::heartbeat:VirtualDomain): Started lama2
FSlun1 (ocf::heartbeat:Filesystem): Started lamaVM1
FSlun2 (ocf::heartbeat:Filesystem): Started lamaVM1
VM2 (ocf::heartbeat:VirtualDomain): FAILED lama3
VM3 (ocf::heartbeat:VirtualDomain): Started lama3
FSlun3 (ocf::heartbeat:Filesystem): FAILED [ lama2 lamaVM2 ]
FSlun4 (ocf::heartbeat:Filesystem): Started lamaVM3
FAKE5-IP (ocf::heartbeat:IPaddr2): Stopped ( disabled )
FAKE6-IP (ocf::heartbeat:IPaddr2): Stopped ( disabled )
FAKE5 (ocf::heartbeat:Dummy): Started lamaVM3
Resource Group: lamaVM1-G1
FAKE1 (ocf::heartbeat:Dummy): Started lamaVM1
FAKE1-IP (ocf::heartbeat:IPaddr2): Started lamaVM1
Resource Group: lamaVM1-G2
FAKE2 (ocf::heartbeat:Dummy): Started lamaVM1
FAKE2-IP (ocf::heartbeat:IPaddr2): Started lamaVM1
Resource Group: lamaVM1-G3
FAKE3 (ocf::heartbeat:Dummy): Started lamaVM1
FAKE3-IP (ocf::heartbeat:IPaddr2): Started lamaVM1
Resource Group: lamaVM2-G4
FAKE4 (ocf::heartbeat:Dummy): Started lamaVM2
FAKE4-IP (ocf::heartbeat:IPaddr2): Started lamaVM2
Clone Set: FAKE6-clone [FAKE6]
Started: [ lamaVM1 lamaVM2 lamaVM3 ]
diff --git a/pengine/test10/guest-node-host-dies.dot b/pengine/test10/guest-node-host-dies.dot
index 01858b3100..c1ced9411c 100644
--- a/pengine/test10/guest-node-host-dies.dot
+++ b/pengine/test10/guest-node-host-dies.dot
@@ -1,107 +1,116 @@
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="black"]
+"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_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_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" -> "lxc-ms-master_stop_0" [ style = bold]
-"stonith 'reboot' rhel7-1" -> "lxc-ms_stop_0 lxc1" [ style = bold]
-"stonith 'reboot' rhel7-1" -> "lxc-ms_stop_0 lxc2" [ 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 b3c24be195..6bd7a60053 100644
--- a/pengine/test10/guest-node-host-dies.exp
+++ b/pengine/test10/guest-node-host-dies.exp
@@ -1,539 +1,583 @@
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
-
+
-
+
-
+
+
+
+
-
+
-
-
+
-
+
-
+
+
+
+
+
+
+
-
-
+
-
+
-
-
-
-
+
-
-
-
-
+
-
-
-
+
+
+
+
-
+
-
+
-
+
-
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/guest-node-host-dies.summary b/pengine/test10/guest-node-host-dies.summary
index 8a1bfd402f..83af5cebc3 100644
--- a/pengine/test10/guest-node-host-dies.summary
+++ b/pengine/test10/guest-node-host-dies.summary
@@ -1,73 +1,73 @@
Current cluster status:
Node rhel7-1 (1): UNCLEAN (offline)
Online: [ rhel7-2 rhel7-3 rhel7-4 rhel7-5 ]
-Containers: [ lxc1:container1 lxc2:container2 ]
Fencing (stonith:fence_xvm): Started rhel7-4
rsc_rhel7-1 (ocf::heartbeat:IPaddr2): Started rhel7-1 ( UNCLEAN )
- container1 (ocf::heartbeat:VirtualDomain): Started rhel7-1 ( UNCLEAN )
- container2 (ocf::heartbeat:VirtualDomain): 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]
- Masters: [ lxc1 ]
- Slaves: [ lxc2 ]
+ 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)
- * Move container1 (Started rhel7-1 -> rhel7-2)
- * Move container2 (Started rhel7-1 -> rhel7-3)
- * Restart lxc-ms:0 (Master lxc1)
- * Restart lxc-ms:1 (Slave lxc2)
+ * 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
- * Resource action: Fencing start on rhel7-4
- * Resource action: Fencing monitor=120000 on rhel7-4
* Pseudo action: lxc-ms-master_demote_0
* Fencing rhel7-1 (reboot)
- * Pseudo action: stonith_complete
* Pseudo action: rsc_rhel7-1_stop_0
- * Resource action: lxc-ms demote on lxc1
- * Pseudo action: lxc-ms-master_demoted_0
- * Pseudo action: lxc-ms-master_stop_0
* Pseudo action: lxc1_stop_0
* Pseudo action: lxc2_stop_0
- * Resource action: rsc_rhel7-1 start on rhel7-5
* 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: rsc_rhel7-1 monitor=5000 on rhel7-5
- * Resource action: container1 start on rhel7-2
- * Resource action: container2 start on rhel7-3
- * Resource action: lxc1 start on rhel7-2
- * Resource action: lxc2 start on rhel7-3
+ * 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
- * Resource action: lxc-ms monitor=10000 on lxc2
* Pseudo action: lxc-ms-master_running_0
- * Resource action: lxc1 monitor=30000 on rhel7-2
- * Resource action: lxc2 monitor=30000 on rhel7-3
+ * 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-fail1.dot b/pengine/test10/whitebox-fail1.dot
index 0f0fe26f61..c6380ea559 100644
--- a/pengine/test10/whitebox-fail1.dot
+++ b/pengine/test10/whitebox-fail1.dot
@@ -1,45 +1,54 @@
digraph "g" {
"B_monitor_10000 lxc1" [ style=bold color="green" fontcolor="black"]
"B_start_0 lxc1" -> "B_monitor_10000 lxc1" [ style = bold]
"B_start_0 lxc1" [ style=bold color="green" fontcolor="black"]
"B_stop_0 lxc1" -> "B_start_0 lxc1" [ style = bold]
"B_stop_0 lxc1" -> "all_stopped" [ style = bold]
"B_stop_0 lxc1" [ style=bold color="green" fontcolor="orange"]
"M-clone_running_0" [ style=bold color="green" fontcolor="orange"]
"M-clone_start_0" -> "M-clone_running_0" [ style = bold]
"M-clone_start_0" -> "M_start_0 lxc1" [ style = bold]
"M-clone_start_0" [ style=bold color="green" fontcolor="orange"]
"M-clone_stop_0" -> "M-clone_stopped_0" [ style = bold]
"M-clone_stop_0" -> "M_stop_0 lxc1" [ style = bold]
"M-clone_stop_0" [ style=bold color="green" fontcolor="orange"]
"M-clone_stopped_0" -> "M-clone_start_0" [ style = bold]
"M-clone_stopped_0" [ style=bold color="green" fontcolor="orange"]
"M_monitor_10000 lxc1" [ style=bold color="green" fontcolor="black"]
"M_start_0 lxc1" -> "M-clone_running_0" [ style = bold]
"M_start_0 lxc1" -> "M_monitor_10000 lxc1" [ style = bold]
"M_start_0 lxc1" [ style=bold color="green" fontcolor="black"]
"M_stop_0 lxc1" -> "M-clone_stopped_0" [ style = bold]
"M_stop_0 lxc1" -> "M_start_0 lxc1" [ style = bold]
"M_stop_0 lxc1" -> "all_stopped" [ style = bold]
"M_stop_0 lxc1" [ style=bold color="green" fontcolor="orange"]
"all_stopped" [ style=bold color="green" fontcolor="orange"]
"container1_start_0 18node2" -> "lxc1_start_0 18node2" [ style = bold]
"container1_start_0 18node2" [ style=bold color="green" fontcolor="black"]
-"container1_stop_0 18node2" -> "B_stop_0 lxc1" [ style = bold]
-"container1_stop_0 18node2" -> "M-clone_stop_0" [ style = bold]
-"container1_stop_0 18node2" -> "M_stop_0 lxc1" [ style = bold]
"container1_stop_0 18node2" -> "all_stopped" [ style = bold]
"container1_stop_0 18node2" -> "container1_start_0 18node2" [ style = bold]
+"container1_stop_0 18node2" -> "stonith 'reboot' lxc1" [ style = bold]
"container1_stop_0 18node2" [ style=bold color="green" fontcolor="black"]
"lxc1_monitor_30000 18node2" [ style=bold color="green" fontcolor="black"]
"lxc1_start_0 18node2" -> "B_monitor_10000 lxc1" [ style = bold]
"lxc1_start_0 18node2" -> "B_start_0 lxc1" [ style = bold]
"lxc1_start_0 18node2" -> "M_monitor_10000 lxc1" [ style = bold]
"lxc1_start_0 18node2" -> "M_start_0 lxc1" [ style = bold]
"lxc1_start_0 18node2" -> "lxc1_monitor_30000 18node2" [ style = bold]
"lxc1_start_0 18node2" [ style=bold color="green" fontcolor="black"]
"lxc1_stop_0 18node2" -> "all_stopped" [ style = bold]
"lxc1_stop_0 18node2" -> "container1_stop_0 18node2" [ style = bold]
"lxc1_stop_0 18node2" -> "lxc1_start_0 18node2" [ style = bold]
"lxc1_stop_0 18node2" [ style=bold color="green" fontcolor="black"]
+"stonith 'reboot' lxc1" -> "B_stop_0 lxc1" [ style = bold]
+"stonith 'reboot' lxc1" -> "M-clone_stop_0" [ style = bold]
+"stonith 'reboot' lxc1" -> "M_stop_0 lxc1" [ style = bold]
+"stonith 'reboot' lxc1" -> "stonith_complete" [ style = bold]
+"stonith 'reboot' lxc1" [ style=bold color="green" fontcolor="orange"]
+"stonith_complete" -> "B_start_0 lxc1" [ style = bold]
+"stonith_complete" -> "M_start_0 lxc1" [ style = bold]
+"stonith_complete" -> "all_stopped" [ style = bold]
+"stonith_complete" -> "container1_start_0 18node2" [ style = bold]
+"stonith_complete" -> "lxc1_start_0 18node2" [ style = bold]
+"stonith_complete" [ style=bold color="green" fontcolor="orange"]
}
diff --git a/pengine/test10/whitebox-fail1.exp b/pengine/test10/whitebox-fail1.exp
index 9629a76afe..03e83c3b5f 100644
--- a/pengine/test10/whitebox-fail1.exp
+++ b/pengine/test10/whitebox-fail1.exp
@@ -1,239 +1,281 @@
+
+
+
+
+
+
-
+
-
+
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pengine/test10/whitebox-fail1.summary b/pengine/test10/whitebox-fail1.summary
index 158640750d..1872e9a8b9 100644
--- a/pengine/test10/whitebox-fail1.summary
+++ b/pengine/test10/whitebox-fail1.summary
@@ -1,53 +1,55 @@
Current cluster status:
Online: [ 18node1 18node2 18node3 ]
Containers: [ lxc2:container2 ]
container1 (ocf::heartbeat:VirtualDomain): FAILED 18node2
container2 (ocf::heartbeat:VirtualDomain): Started 18node2
shoot1 (stonith:fence_xvm): Started 18node3
Clone Set: M-clone [M]
Started: [ 18node1 18node2 18node3 lxc2 ]
A (ocf::pacemaker:Dummy): Started 18node1
B (ocf::pacemaker:Dummy): FAILED lxc1
C (ocf::pacemaker:Dummy): Started lxc2
D (ocf::pacemaker:Dummy): Started 18node1
Transition Summary:
* Recover container1 (Started 18node2)
* Recover M:4 (Started lxc1)
* Recover B (Started lxc1)
* Restart lxc1 (Started 18node2)
Executing cluster transition:
* Resource action: lxc1 stop on 18node2
* Resource action: container1 stop on 18node2
+ * Pseudo action: stonith-lxc1-reboot on lxc1
+ * Pseudo action: stonith_complete
+ * Resource action: container1 start on 18node2
* Pseudo action: M-clone_stop_0
* Pseudo action: B_stop_0
- * Resource action: container1 start on 18node2
+ * Resource action: lxc1 start on 18node2
+ * Resource action: lxc1 monitor=30000 on 18node2
* Pseudo action: M_stop_0
* Pseudo action: M-clone_stopped_0
* Pseudo action: M-clone_start_0
- * Resource action: lxc1 start on 18node2
- * Resource action: lxc1 monitor=30000 on 18node2
+ * Resource action: B start on lxc1
* Pseudo action: all_stopped
* Resource action: M start on lxc1
* Pseudo action: M-clone_running_0
- * Resource action: B start on lxc1
- * Resource action: M monitor=10000 on lxc1
* Resource action: B monitor=10000 on lxc1
+ * Resource action: M monitor=10000 on lxc1
Revised cluster status:
Online: [ 18node1 18node2 18node3 ]
Containers: [ lxc1:container1 lxc2:container2 ]
container1 (ocf::heartbeat:VirtualDomain): Started 18node2
container2 (ocf::heartbeat:VirtualDomain): Started 18node2
shoot1 (stonith:fence_xvm): Started 18node3
Clone Set: M-clone [M]
Started: [ 18node1 18node2 18node3 lxc1 lxc2 ]
A (ocf::pacemaker:Dummy): Started 18node1
B (ocf::pacemaker:Dummy): Started lxc1
C (ocf::pacemaker:Dummy): Started lxc2
D (ocf::pacemaker:Dummy): Started 18node1
diff --git a/pengine/test10/whitebox-fail2.dot b/pengine/test10/whitebox-fail2.dot
index 0f0fe26f61..c6380ea559 100644
--- a/pengine/test10/whitebox-fail2.dot
+++ b/pengine/test10/whitebox-fail2.dot
@@ -1,45 +1,54 @@
digraph "g" {
"B_monitor_10000 lxc1" [ style=bold color="green" fontcolor="black"]
"B_start_0 lxc1" -> "B_monitor_10000 lxc1" [ style = bold]
"B_start_0 lxc1" [ style=bold color="green" fontcolor="black"]
"B_stop_0 lxc1" -> "B_start_0 lxc1" [ style = bold]
"B_stop_0 lxc1" -> "all_stopped" [ style = bold]
"B_stop_0 lxc1" [ style=bold color="green" fontcolor="orange"]
"M-clone_running_0" [ style=bold color="green" fontcolor="orange"]
"M-clone_start_0" -> "M-clone_running_0" [ style = bold]
"M-clone_start_0" -> "M_start_0 lxc1" [ style = bold]
"M-clone_start_0" [ style=bold color="green" fontcolor="orange"]
"M-clone_stop_0" -> "M-clone_stopped_0" [ style = bold]
"M-clone_stop_0" -> "M_stop_0 lxc1" [ style = bold]
"M-clone_stop_0" [ style=bold color="green" fontcolor="orange"]
"M-clone_stopped_0" -> "M-clone_start_0" [ style = bold]
"M-clone_stopped_0" [ style=bold color="green" fontcolor="orange"]
"M_monitor_10000 lxc1" [ style=bold color="green" fontcolor="black"]
"M_start_0 lxc1" -> "M-clone_running_0" [ style = bold]
"M_start_0 lxc1" -> "M_monitor_10000 lxc1" [ style = bold]
"M_start_0 lxc1" [ style=bold color="green" fontcolor="black"]
"M_stop_0 lxc1" -> "M-clone_stopped_0" [ style = bold]
"M_stop_0 lxc1" -> "M_start_0 lxc1" [ style = bold]
"M_stop_0 lxc1" -> "all_stopped" [ style = bold]
"M_stop_0 lxc1" [ style=bold color="green" fontcolor="orange"]
"all_stopped" [ style=bold color="green" fontcolor="orange"]
"container1_start_0 18node2" -> "lxc1_start_0 18node2" [ style = bold]
"container1_start_0 18node2" [ style=bold color="green" fontcolor="black"]
-"container1_stop_0 18node2" -> "B_stop_0 lxc1" [ style = bold]
-"container1_stop_0 18node2" -> "M-clone_stop_0" [ style = bold]
-"container1_stop_0 18node2" -> "M_stop_0 lxc1" [ style = bold]
"container1_stop_0 18node2" -> "all_stopped" [ style = bold]
"container1_stop_0 18node2" -> "container1_start_0 18node2" [ style = bold]
+"container1_stop_0 18node2" -> "stonith 'reboot' lxc1" [ style = bold]
"container1_stop_0 18node2" [ style=bold color="green" fontcolor="black"]
"lxc1_monitor_30000 18node2" [ style=bold color="green" fontcolor="black"]
"lxc1_start_0 18node2" -> "B_monitor_10000 lxc1" [ style = bold]
"lxc1_start_0 18node2" -> "B_start_0 lxc1" [ style = bold]
"lxc1_start_0 18node2" -> "M_monitor_10000 lxc1" [ style = bold]
"lxc1_start_0 18node2" -> "M_start_0 lxc1" [ style = bold]
"lxc1_start_0 18node2" -> "lxc1_monitor_30000 18node2" [ style = bold]
"lxc1_start_0 18node2" [ style=bold color="green" fontcolor="black"]
"lxc1_stop_0 18node2" -> "all_stopped" [ style = bold]
"lxc1_stop_0 18node2" -> "container1_stop_0 18node2" [ style = bold]
"lxc1_stop_0 18node2" -> "lxc1_start_0 18node2" [ style = bold]
"lxc1_stop_0 18node2" [ style=bold color="green" fontcolor="black"]
+"stonith 'reboot' lxc1" -> "B_stop_0 lxc1" [ style = bold]
+"stonith 'reboot' lxc1" -> "M-clone_stop_0" [ style = bold]
+"stonith 'reboot' lxc1" -> "M_stop_0 lxc1" [ style = bold]
+"stonith 'reboot' lxc1" -> "stonith_complete" [ style = bold]
+"stonith 'reboot' lxc1" [ style=bold color="green" fontcolor="orange"]
+"stonith_complete" -> "B_start_0 lxc1" [ style = bold]
+"stonith_complete" -> "M_start_0 lxc1" [ style = bold]
+"stonith_complete" -> "all_stopped" [ style = bold]
+"stonith_complete" -> "container1_start_0 18node2" [ style = bold]
+"stonith_complete" -> "lxc1_start_0 18node2" [ style = bold]
+"stonith_complete" [ style=bold color="green" fontcolor="orange"]
}
diff --git a/pengine/test10/whitebox-fail2.exp b/pengine/test10/whitebox-fail2.exp
index 9629a76afe..03e83c3b5f 100644
--- a/pengine/test10/whitebox-fail2.exp
+++ b/pengine/test10/whitebox-fail2.exp
@@ -1,239 +1,281 @@
+
+
+
+
+
+
-
+
-
+
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pengine/test10/whitebox-fail2.summary b/pengine/test10/whitebox-fail2.summary
index ab40d99fed..5db6588f87 100644
--- a/pengine/test10/whitebox-fail2.summary
+++ b/pengine/test10/whitebox-fail2.summary
@@ -1,53 +1,55 @@
Current cluster status:
Online: [ 18node1 18node2 18node3 ]
Containers: [ lxc2:container2 ]
container1 (ocf::heartbeat:VirtualDomain): FAILED 18node2
container2 (ocf::heartbeat:VirtualDomain): Started 18node2
shoot1 (stonith:fence_xvm): Started 18node3
Clone Set: M-clone [M]
Started: [ 18node1 18node2 18node3 lxc2 ]
A (ocf::pacemaker:Dummy): Started 18node1
B (ocf::pacemaker:Dummy): FAILED lxc1
C (ocf::pacemaker:Dummy): Started lxc2
D (ocf::pacemaker:Dummy): Started 18node1
Transition Summary:
* Recover container1 (Started 18node2)
* Recover M:4 (Started lxc1)
* Recover B (Started lxc1)
* Recover lxc1 (Started 18node2)
Executing cluster transition:
* Resource action: lxc1 stop on 18node2
* Resource action: container1 stop on 18node2
+ * Pseudo action: stonith-lxc1-reboot on lxc1
+ * Pseudo action: stonith_complete
+ * Resource action: container1 start on 18node2
* Pseudo action: M-clone_stop_0
* Pseudo action: B_stop_0
- * Resource action: container1 start on 18node2
+ * Resource action: lxc1 start on 18node2
+ * Resource action: lxc1 monitor=30000 on 18node2
* Pseudo action: M_stop_0
* Pseudo action: M-clone_stopped_0
* Pseudo action: M-clone_start_0
- * Resource action: lxc1 start on 18node2
- * Resource action: lxc1 monitor=30000 on 18node2
+ * Resource action: B start on lxc1
* Pseudo action: all_stopped
* Resource action: M start on lxc1
* Pseudo action: M-clone_running_0
- * Resource action: B start on lxc1
- * Resource action: M monitor=10000 on lxc1
* Resource action: B monitor=10000 on lxc1
+ * Resource action: M monitor=10000 on lxc1
Revised cluster status:
Online: [ 18node1 18node2 18node3 ]
Containers: [ lxc1:container1 lxc2:container2 ]
container1 (ocf::heartbeat:VirtualDomain): Started 18node2
container2 (ocf::heartbeat:VirtualDomain): Started 18node2
shoot1 (stonith:fence_xvm): Started 18node3
Clone Set: M-clone [M]
Started: [ 18node1 18node2 18node3 lxc1 lxc2 ]
A (ocf::pacemaker:Dummy): Started 18node1
B (ocf::pacemaker:Dummy): Started lxc1
C (ocf::pacemaker:Dummy): Started lxc2
D (ocf::pacemaker:Dummy): Started 18node1
diff --git a/pengine/test10/whitebox-imply-stop-on-fence.dot b/pengine/test10/whitebox-imply-stop-on-fence.dot
index b3fd40be2c..0e17a165e1 100644
--- a/pengine/test10/whitebox-imply-stop-on-fence.dot
+++ b/pengine/test10/whitebox-imply-stop-on-fence.dot
@@ -1,92 +1,99 @@
digraph "g" {
"R-lxc-01_kiff-01_monitor_10000 kiff-02" [ style=bold color="green" fontcolor="black"]
"R-lxc-01_kiff-01_start_0 kiff-02" -> "R-lxc-01_kiff-01_monitor_10000 kiff-02" [ style = bold]
"R-lxc-01_kiff-01_start_0 kiff-02" -> "lxc-01_kiff-01_start_0 kiff-02" [ style = bold]
"R-lxc-01_kiff-01_start_0 kiff-02" [ style=bold color="green" fontcolor="black"]
"R-lxc-01_kiff-01_stop_0 kiff-01" -> "R-lxc-01_kiff-01_start_0 kiff-02" [ style = bold]
"R-lxc-01_kiff-01_stop_0 kiff-01" -> "all_stopped" [ style = bold]
"R-lxc-01_kiff-01_stop_0 kiff-01" -> "shared0-clone_stop_0" [ style = bold]
+"R-lxc-01_kiff-01_stop_0 kiff-01" -> "stonith 'reboot' lxc-01_kiff-01" [ style = bold]
"R-lxc-01_kiff-01_stop_0 kiff-01" [ style=bold color="green" fontcolor="orange"]
"R-lxc-02_kiff-01_monitor_10000 kiff-02" [ style=bold color="green" fontcolor="black"]
"R-lxc-02_kiff-01_start_0 kiff-02" -> "R-lxc-02_kiff-01_monitor_10000 kiff-02" [ style = bold]
"R-lxc-02_kiff-01_start_0 kiff-02" -> "lxc-02_kiff-01_start_0 kiff-02" [ style = bold]
"R-lxc-02_kiff-01_start_0 kiff-02" [ style=bold color="green" fontcolor="black"]
"R-lxc-02_kiff-01_stop_0 kiff-01" -> "R-lxc-02_kiff-01_start_0 kiff-02" [ style = bold]
"R-lxc-02_kiff-01_stop_0 kiff-01" -> "all_stopped" [ style = bold]
"R-lxc-02_kiff-01_stop_0 kiff-01" -> "shared0-clone_stop_0" [ style = bold]
+"R-lxc-02_kiff-01_stop_0 kiff-01" -> "stonith 'reboot' lxc-02_kiff-01" [ style = bold]
"R-lxc-02_kiff-01_stop_0 kiff-01" [ style=bold color="green" fontcolor="orange"]
+"all_stopped" -> "fence-kiff-02_start_0 kiff-02" [ style = bold]
"all_stopped" [ style=bold color="green" fontcolor="orange"]
"clvmd-clone_stop_0" -> "clvmd-clone_stopped_0" [ style = bold]
"clvmd-clone_stop_0" -> "clvmd_stop_0 kiff-01" [ style = bold]
"clvmd-clone_stop_0" [ style=bold color="green" fontcolor="orange"]
"clvmd-clone_stopped_0" -> "dlm-clone_stop_0" [ style = bold]
"clvmd-clone_stopped_0" [ style=bold color="green" fontcolor="orange"]
"clvmd_stop_0 kiff-01" -> "all_stopped" [ style = bold]
"clvmd_stop_0 kiff-01" -> "clvmd-clone_stopped_0" [ style = bold]
"clvmd_stop_0 kiff-01" -> "dlm_stop_0 kiff-01" [ style = bold]
"clvmd_stop_0 kiff-01" [ style=bold color="green" fontcolor="orange"]
"dlm-clone_stop_0" -> "dlm-clone_stopped_0" [ style = bold]
"dlm-clone_stop_0" -> "dlm_stop_0 kiff-01" [ style = bold]
"dlm-clone_stop_0" [ style=bold color="green" fontcolor="orange"]
"dlm-clone_stopped_0" [ style=bold color="green" fontcolor="orange"]
"dlm_stop_0 kiff-01" -> "all_stopped" [ style = bold]
"dlm_stop_0 kiff-01" -> "dlm-clone_stopped_0" [ style = bold]
"dlm_stop_0 kiff-01" [ style=bold color="green" fontcolor="orange"]
"fence-kiff-02_monitor_60000 kiff-02" [ style=bold color="green" fontcolor="black"]
"fence-kiff-02_start_0 kiff-02" -> "fence-kiff-02_monitor_60000 kiff-02" [ style = bold]
"fence-kiff-02_start_0 kiff-02" [ style=bold color="green" fontcolor="black"]
"fence-kiff-02_stop_0 kiff-01" -> "all_stopped" [ style = bold]
"fence-kiff-02_stop_0 kiff-01" -> "fence-kiff-02_start_0 kiff-02" [ style = bold]
"fence-kiff-02_stop_0 kiff-01" [ style=bold color="green" fontcolor="orange"]
"lxc-01_kiff-01_monitor_30000 kiff-02" [ style=bold color="green" fontcolor="black"]
"lxc-01_kiff-01_start_0 kiff-02" -> "lxc-01_kiff-01_monitor_30000 kiff-02" [ style = bold]
"lxc-01_kiff-01_start_0 kiff-02" -> "vm-fs_monitor_20000 lxc-01_kiff-01" [ style = bold]
"lxc-01_kiff-01_start_0 kiff-02" -> "vm-fs_start_0 lxc-01_kiff-01" [ style = bold]
"lxc-01_kiff-01_start_0 kiff-02" [ style=bold color="green" fontcolor="black"]
"lxc-01_kiff-01_stop_0 kiff-01" -> "R-lxc-01_kiff-01_stop_0 kiff-01" [ style = bold]
"lxc-01_kiff-01_stop_0 kiff-01" -> "all_stopped" [ style = bold]
"lxc-01_kiff-01_stop_0 kiff-01" -> "lxc-01_kiff-01_start_0 kiff-02" [ style = bold]
"lxc-01_kiff-01_stop_0 kiff-01" [ style=bold color="green" fontcolor="orange"]
"lxc-02_kiff-01_monitor_30000 kiff-02" [ style=bold color="green" fontcolor="black"]
"lxc-02_kiff-01_start_0 kiff-02" -> "lxc-02_kiff-01_monitor_30000 kiff-02" [ style = bold]
"lxc-02_kiff-01_start_0 kiff-02" [ style=bold color="green" fontcolor="black"]
"lxc-02_kiff-01_stop_0 kiff-01" -> "R-lxc-02_kiff-01_stop_0 kiff-01" [ style = bold]
"lxc-02_kiff-01_stop_0 kiff-01" -> "all_stopped" [ style = bold]
"lxc-02_kiff-01_stop_0 kiff-01" -> "lxc-02_kiff-01_start_0 kiff-02" [ style = bold]
"lxc-02_kiff-01_stop_0 kiff-01" [ style=bold color="green" fontcolor="orange"]
"shared0-clone_stop_0" -> "shared0-clone_stopped_0" [ style = bold]
"shared0-clone_stop_0" -> "shared0_stop_0 kiff-01" [ style = bold]
"shared0-clone_stop_0" [ style=bold color="green" fontcolor="orange"]
"shared0-clone_stopped_0" -> "clvmd-clone_stop_0" [ style = bold]
"shared0-clone_stopped_0" [ style=bold color="green" fontcolor="orange"]
"shared0_stop_0 kiff-01" -> "all_stopped" [ style = bold]
"shared0_stop_0 kiff-01" -> "clvmd_stop_0 kiff-01" [ style = bold]
"shared0_stop_0 kiff-01" -> "shared0-clone_stopped_0" [ style = bold]
"shared0_stop_0 kiff-01" [ style=bold color="green" fontcolor="orange"]
"stonith 'reboot' kiff-01" -> "R-lxc-01_kiff-01_stop_0 kiff-01" [ style = bold]
"stonith 'reboot' kiff-01" -> "R-lxc-02_kiff-01_stop_0 kiff-01" [ style = bold]
"stonith 'reboot' kiff-01" -> "clvmd-clone_stop_0" [ style = bold]
"stonith 'reboot' kiff-01" -> "clvmd_stop_0 kiff-01" [ style = bold]
"stonith 'reboot' kiff-01" -> "dlm-clone_stop_0" [ style = bold]
"stonith 'reboot' kiff-01" -> "dlm_stop_0 kiff-01" [ style = bold]
"stonith 'reboot' kiff-01" -> "lxc-01_kiff-01_stop_0 kiff-01" [ style = bold]
"stonith 'reboot' kiff-01" -> "lxc-02_kiff-01_stop_0 kiff-01" [ style = bold]
"stonith 'reboot' kiff-01" -> "shared0-clone_stop_0" [ style = bold]
"stonith 'reboot' kiff-01" -> "shared0_stop_0 kiff-01" [ style = bold]
"stonith 'reboot' kiff-01" -> "stonith_complete" [ style = bold]
-"stonith 'reboot' kiff-01" -> "vm-fs_stop_0 lxc-01_kiff-01" [ style = bold]
"stonith 'reboot' kiff-01" [ style=bold color="green" fontcolor="black"]
+"stonith 'reboot' lxc-01_kiff-01" -> "stonith_complete" [ style = bold]
+"stonith 'reboot' lxc-01_kiff-01" -> "vm-fs_stop_0 lxc-01_kiff-01" [ style = bold]
+"stonith 'reboot' lxc-01_kiff-01" [ style=bold color="green" fontcolor="orange"]
+"stonith 'reboot' lxc-02_kiff-01" -> "stonith_complete" [ style = bold]
+"stonith 'reboot' lxc-02_kiff-01" [ style=bold color="green" fontcolor="orange"]
"stonith_complete" -> "R-lxc-01_kiff-01_start_0 kiff-02" [ style = bold]
"stonith_complete" -> "R-lxc-02_kiff-01_start_0 kiff-02" [ style = bold]
"stonith_complete" -> "all_stopped" [ style = bold]
"stonith_complete" -> "lxc-01_kiff-01_start_0 kiff-02" [ style = bold]
"stonith_complete" -> "lxc-02_kiff-01_start_0 kiff-02" [ style = bold]
"stonith_complete" -> "vm-fs_start_0 lxc-01_kiff-01" [ style = bold]
"stonith_complete" [ style=bold color="green" fontcolor="orange"]
"vm-fs_monitor_20000 lxc-01_kiff-01" [ style=bold color="green" fontcolor="black"]
"vm-fs_start_0 lxc-01_kiff-01" -> "vm-fs_monitor_20000 lxc-01_kiff-01" [ style = bold]
"vm-fs_start_0 lxc-01_kiff-01" [ style=bold color="green" fontcolor="black"]
"vm-fs_stop_0 lxc-01_kiff-01" -> "all_stopped" [ style = bold]
"vm-fs_stop_0 lxc-01_kiff-01" -> "vm-fs_start_0 lxc-01_kiff-01" [ style = bold]
"vm-fs_stop_0 lxc-01_kiff-01" [ style=bold color="green" fontcolor="orange"]
}
diff --git a/pengine/test10/whitebox-imply-stop-on-fence.exp b/pengine/test10/whitebox-imply-stop-on-fence.exp
index 0bd42b7627..e38f4ea97b 100644
--- a/pengine/test10/whitebox-imply-stop-on-fence.exp
+++ b/pengine/test10/whitebox-imply-stop-on-fence.exp
@@ -1,467 +1,506 @@
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
-
-
-
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/whitebox-imply-stop-on-fence.summary b/pengine/test10/whitebox-imply-stop-on-fence.summary
index 3ee9570947..50a3446e29 100644
--- a/pengine/test10/whitebox-imply-stop-on-fence.summary
+++ b/pengine/test10/whitebox-imply-stop-on-fence.summary
@@ -1,91 +1,93 @@
Current cluster status:
Node kiff-01 (1): UNCLEAN (offline)
Online: [ kiff-02 ]
-Containers: [ lxc-01_kiff-01:R-lxc-01_kiff-01 lxc-01_kiff-02:R-lxc-01_kiff-02 lxc-02_kiff-01:R-lxc-02_kiff-01 lxc-02_kiff-02:R-lxc-02_kiff-02 ]
+Containers: [ lxc-01_kiff-02:R-lxc-01_kiff-02 lxc-02_kiff-02:R-lxc-02_kiff-02 ]
fence-kiff-01 (stonith:fence_ipmilan): Started kiff-02
fence-kiff-02 (stonith:fence_ipmilan): Started kiff-01 (UNCLEAN)
Clone Set: dlm-clone [dlm]
dlm (ocf::pacemaker:controld): Started kiff-01 (UNCLEAN)
Started: [ kiff-02 ]
Stopped: [ lxc-01_kiff-01 lxc-01_kiff-02 lxc-02_kiff-01 lxc-02_kiff-02 ]
Clone Set: clvmd-clone [clvmd]
clvmd (ocf::heartbeat:clvm): Started kiff-01 (UNCLEAN)
Started: [ kiff-02 ]
Stopped: [ lxc-01_kiff-01 lxc-01_kiff-02 lxc-02_kiff-01 lxc-02_kiff-02 ]
Clone Set: shared0-clone [shared0]
shared0 (ocf::heartbeat:Filesystem): Started kiff-01 (UNCLEAN)
Started: [ kiff-02 ]
Stopped: [ lxc-01_kiff-01 lxc-01_kiff-02 lxc-02_kiff-01 lxc-02_kiff-02 ]
- R-lxc-01_kiff-01 (ocf::heartbeat:VirtualDomain): Started kiff-01 (UNCLEAN)
+ R-lxc-01_kiff-01 (ocf::heartbeat:VirtualDomain): FAILED kiff-01 (UNCLEAN)
R-lxc-02_kiff-01 (ocf::heartbeat:VirtualDomain): Started kiff-01 (UNCLEAN)
R-lxc-01_kiff-02 (ocf::heartbeat:VirtualDomain): Started kiff-02
R-lxc-02_kiff-02 (ocf::heartbeat:VirtualDomain): Started kiff-02
- vm-fs (ocf::heartbeat:Filesystem): Started lxc-01_kiff-01
+ vm-fs (ocf::heartbeat:Filesystem): FAILED lxc-01_kiff-01
Transition Summary:
* Move fence-kiff-02 (Started kiff-01 -> kiff-02)
* Stop dlm:0 (kiff-01)
* Stop clvmd:0 (kiff-01)
* Stop shared0:0 (kiff-01)
- * Move R-lxc-01_kiff-01 (Started kiff-01 -> kiff-02)
+ * Recover R-lxc-01_kiff-01 (Started kiff-01 -> kiff-02)
* Move R-lxc-02_kiff-01 (Started kiff-01 -> kiff-02)
- * Restart vm-fs (Started lxc-01_kiff-01)
+ * Recover vm-fs (Started lxc-01_kiff-01)
* Move lxc-01_kiff-01 (Started kiff-01 -> kiff-02)
* Move lxc-02_kiff-01 (Started kiff-01 -> kiff-02)
Executing cluster transition:
* Pseudo action: fence-kiff-02_stop_0
* Fencing kiff-01 (reboot)
- * Pseudo action: stonith_complete
- * Resource action: fence-kiff-02 start on kiff-02
- * Pseudo action: vm-fs_stop_0
* Pseudo action: lxc-01_kiff-01_stop_0
* Pseudo action: lxc-02_kiff-01_stop_0
- * Resource action: fence-kiff-02 monitor=60000 on kiff-02
* Pseudo action: R-lxc-01_kiff-01_stop_0
* Pseudo action: R-lxc-02_kiff-01_stop_0
+ * Pseudo action: stonith-lxc-02_kiff-01-reboot on lxc-02_kiff-01
+ * Pseudo action: stonith-lxc-01_kiff-01-reboot on lxc-01_kiff-01
+ * Pseudo action: stonith_complete
* Pseudo action: shared0-clone_stop_0
* Resource action: R-lxc-01_kiff-01 start on kiff-02
* Resource action: R-lxc-02_kiff-01 start on kiff-02
+ * Pseudo action: vm-fs_stop_0
* Resource action: lxc-01_kiff-01 start on kiff-02
* Resource action: lxc-02_kiff-01 start on kiff-02
* Pseudo action: shared0_stop_0
* Pseudo action: shared0-clone_stopped_0
* Resource action: R-lxc-01_kiff-01 monitor=10000 on kiff-02
* Resource action: R-lxc-02_kiff-01 monitor=10000 on kiff-02
* Resource action: vm-fs start on lxc-01_kiff-01
- * Resource action: vm-fs monitor=20000 on lxc-01_kiff-01
* Resource action: lxc-01_kiff-01 monitor=30000 on kiff-02
* Resource action: lxc-02_kiff-01 monitor=30000 on kiff-02
* Pseudo action: clvmd-clone_stop_0
+ * Resource action: vm-fs monitor=20000 on lxc-01_kiff-01
* Pseudo action: clvmd_stop_0
* Pseudo action: clvmd-clone_stopped_0
* Pseudo action: dlm-clone_stop_0
* Pseudo action: dlm_stop_0
* Pseudo action: dlm-clone_stopped_0
* Pseudo action: all_stopped
+ * Resource action: fence-kiff-02 start on kiff-02
+ * Resource action: fence-kiff-02 monitor=60000 on kiff-02
Revised cluster status:
Online: [ kiff-02 ]
OFFLINE: [ kiff-01 ]
Containers: [ lxc-01_kiff-01:R-lxc-01_kiff-01 lxc-01_kiff-02:R-lxc-01_kiff-02 lxc-02_kiff-01:R-lxc-02_kiff-01 lxc-02_kiff-02:R-lxc-02_kiff-02 ]
fence-kiff-01 (stonith:fence_ipmilan): Started kiff-02
fence-kiff-02 (stonith:fence_ipmilan): Started kiff-02
Clone Set: dlm-clone [dlm]
Started: [ kiff-02 ]
Stopped: [ kiff-01 lxc-01_kiff-01 lxc-01_kiff-02 lxc-02_kiff-01 lxc-02_kiff-02 ]
Clone Set: clvmd-clone [clvmd]
Started: [ kiff-02 ]
Stopped: [ kiff-01 lxc-01_kiff-01 lxc-01_kiff-02 lxc-02_kiff-01 lxc-02_kiff-02 ]
Clone Set: shared0-clone [shared0]
Started: [ kiff-02 ]
Stopped: [ kiff-01 lxc-01_kiff-01 lxc-01_kiff-02 lxc-02_kiff-01 lxc-02_kiff-02 ]
R-lxc-01_kiff-01 (ocf::heartbeat:VirtualDomain): Started kiff-02
R-lxc-02_kiff-01 (ocf::heartbeat:VirtualDomain): Started kiff-02
R-lxc-01_kiff-02 (ocf::heartbeat:VirtualDomain): Started kiff-02
R-lxc-02_kiff-02 (ocf::heartbeat:VirtualDomain): Started kiff-02
vm-fs (ocf::heartbeat:Filesystem): Started lxc-01_kiff-01
diff --git a/pengine/test10/whitebox-ms-ordering.dot b/pengine/test10/whitebox-ms-ordering.dot
index 7f03a657fd..bd773634ee 100644
--- a/pengine/test10/whitebox-ms-ordering.dot
+++ b/pengine/test10/whitebox-ms-ordering.dot
@@ -1,82 +1,100 @@
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_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_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 0566f413bc..7aecfbae2e 100644
--- a/pengine/test10/whitebox-ms-ordering.exp
+++ b/pengine/test10/whitebox-ms-ordering.exp
@@ -1,437 +1,513 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pengine/test10/whitebox-ms-ordering.summary b/pengine/test10/whitebox-ms-ordering.summary
index d6bbaafb10..5d7c042bbe 100644
--- a/pengine/test10/whitebox-ms-ordering.summary
+++ b/pengine/test10/whitebox-ms-ordering.summary
@@ -1,62 +1,65 @@
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
+ * 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-unexpectedly-running.dot b/pengine/test10/whitebox-unexpectedly-running.dot
index d87344a984..2915d776ee 100644
--- a/pengine/test10/whitebox-unexpectedly-running.dot
+++ b/pengine/test10/whitebox-unexpectedly-running.dot
@@ -1,13 +1,18 @@
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_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 29cd66bfed..c5272f22d6 100644
--- a/pengine/test10/whitebox-unexpectedly-running.exp
+++ b/pengine/test10/whitebox-unexpectedly-running.exp
@@ -1,75 +1,105 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pengine/test10/whitebox-unexpectedly-running.summary b/pengine/test10/whitebox-unexpectedly-running.summary
index f834e417a7..7d5b90817b 100644
--- a/pengine/test10/whitebox-unexpectedly-running.summary
+++ b/pengine/test10/whitebox-unexpectedly-running.summary
@@ -1,24 +1,26 @@
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
+ * 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