diff --git a/pengine/test10/whitebox-asymmetric.dot b/pengine/test10/whitebox-asymmetric.dot
index 896f66a790..0c4ee01ef8 100644
--- a/pengine/test10/whitebox-asymmetric.dot
+++ b/pengine/test10/whitebox-asymmetric.dot
@@ -1,10 +1,26 @@
digraph "g" {
"18node2_monitor_30000 18builder" [ style=bold color="green" fontcolor="black"]
"18node2_start_0 18builder" -> "18node2_monitor_30000 18builder" [ style = bold]
+"18node2_start_0 18builder" -> "nfs_mount_monitor_0 18node2" [ style = bold]
"18node2_start_0 18builder" -> "nfs_mount_monitor_10000 18node2" [ style = bold]
"18node2_start_0 18builder" -> "nfs_mount_start_0 18node2" [ style = bold]
+"18node2_start_0 18builder" -> "vg_tags_dup_monitor_0 18node2" [ style = bold]
+"18node2_start_0 18builder" -> "vg_tags_monitor_0 18node2" [ style = bold]
+"18node2_start_0 18builder" -> "webserver_monitor_0 18node2" [ style = bold]
"18node2_start_0 18builder" [ style=bold color="green" fontcolor="black"]
+"nfs_mount_monitor_0 18node2" -> "probe_complete 18node2" [ style = bold]
+"nfs_mount_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
"nfs_mount_monitor_10000 18node2" [ style=bold color="green" fontcolor="black"]
"nfs_mount_start_0 18node2" -> "nfs_mount_monitor_10000 18node2" [ style = bold]
"nfs_mount_start_0 18node2" [ style=bold color="green" fontcolor="black"]
+"probe_complete 18node2" -> "probe_complete" [ style = bold]
+"probe_complete 18node2" [ style=bold color="green" fontcolor="black"]
+"probe_complete" -> "nfs_mount_start_0 18node2" [ style = bold]
+"probe_complete" [ style=bold color="green" fontcolor="orange"]
+"vg_tags_dup_monitor_0 18node2" -> "probe_complete 18node2" [ style = bold]
+"vg_tags_dup_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
+"vg_tags_monitor_0 18node2" -> "probe_complete 18node2" [ style = bold]
+"vg_tags_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
+"webserver_monitor_0 18node2" -> "probe_complete 18node2" [ style = bold]
+"webserver_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
}
diff --git a/pengine/test10/whitebox-asymmetric.exp b/pengine/test10/whitebox-asymmetric.exp
index e3fe1f6937..a9bf7da490 100644
--- a/pengine/test10/whitebox-asymmetric.exp
+++ b/pengine/test10/whitebox-asymmetric.exp
@@ -1,53 +1,141 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pengine/test10/whitebox-asymmetric.summary b/pengine/test10/whitebox-asymmetric.summary
index 1a688022bc..7d7597707e 100644
--- a/pengine/test10/whitebox-asymmetric.summary
+++ b/pengine/test10/whitebox-asymmetric.summary
@@ -1,34 +1,39 @@
Current cluster status:
Online: [ 18builder ]
fence_false (stonith:fence_false): Stopped
container2 (ocf::pacemaker:Dummy): Started 18builder
webserver (ocf::pacemaker:Dummy): Stopped
nfs_mount (ocf::pacemaker:Dummy): Stopped
Resource Group: mygroup
vg_tags (ocf::heartbeat:LVM): Stopped
vg_tags_dup (ocf::heartbeat:LVM): Stopped
Transition Summary:
* Start nfs_mount (18node2)
* Start 18node2 (18builder)
Executing cluster transition:
* Resource action: 18node2 start on 18builder
- * Resource action: nfs_mount start on 18node2
+ * Resource action: webserver monitor on 18node2
+ * Resource action: nfs_mount monitor on 18node2
+ * Resource action: vg_tags monitor on 18node2
+ * Resource action: vg_tags_dup monitor on 18node2
* Resource action: 18node2 monitor=30000 on 18builder
+ * Pseudo action: probe_complete
+ * Resource action: nfs_mount start on 18node2
* Resource action: nfs_mount monitor=10000 on 18node2
Revised cluster status:
Online: [ 18builder ]
Containers: [ 18node2:container2 ]
fence_false (stonith:fence_false): Stopped
container2 (ocf::pacemaker:Dummy): Started 18builder
webserver (ocf::pacemaker:Dummy): Stopped
nfs_mount (ocf::pacemaker:Dummy): Started 18node2
Resource Group: mygroup
vg_tags (ocf::heartbeat:LVM): Stopped
vg_tags_dup (ocf::heartbeat:LVM): Stopped
diff --git a/pengine/test10/whitebox-fail1.dot b/pengine/test10/whitebox-fail1.dot
index b595015d26..008ee4d1b8 100644
--- a/pengine/test10/whitebox-fail1.dot
+++ b/pengine/test10/whitebox-fail1.dot
@@ -1,44 +1,67 @@
digraph "g" {
+"A_monitor_0 lxc1" -> "probe_complete lxc1" [ style = bold]
+"A_monitor_0 lxc1" [ style=bold color="green" fontcolor="black"]
+"A_monitor_0 lxc2" -> "probe_complete lxc2" [ style = bold]
+"A_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
+"B_monitor_0 lxc2" -> "probe_complete lxc2" [ style = bold]
+"B_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
"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"]
+"C_monitor_0 lxc1" -> "probe_complete lxc1" [ style = bold]
+"C_monitor_0 lxc1" [ style=bold color="green" fontcolor="black"]
+"D_monitor_0 lxc1" -> "probe_complete lxc1" [ style = bold]
+"D_monitor_0 lxc1" [ style=bold color="green" fontcolor="black"]
+"D_monitor_0 lxc2" -> "probe_complete lxc2" [ style = bold]
+"D_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
"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_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" [ style=bold color="green" fontcolor="black"]
"lxc1_monitor_30000 18node2" [ style=bold color="green" fontcolor="black"]
+"lxc1_start_0 18node2" -> "A_monitor_0 lxc1" [ style = bold]
"lxc1_start_0 18node2" -> "B_monitor_10000 lxc1" [ style = bold]
"lxc1_start_0 18node2" -> "B_start_0 lxc1" [ style = bold]
+"lxc1_start_0 18node2" -> "C_monitor_0 lxc1" [ style = bold]
+"lxc1_start_0 18node2" -> "D_monitor_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"]
+"probe_complete lxc1" -> "probe_complete" [ style = bold]
+"probe_complete lxc1" [ style=bold color="green" fontcolor="black"]
+"probe_complete lxc2" -> "probe_complete" [ style = bold]
+"probe_complete lxc2" [ style=bold color="green" fontcolor="black"]
+"probe_complete" -> "B_start_0 lxc1" [ style = bold]
+"probe_complete" -> "B_stop_0 lxc1" [ style = bold]
+"probe_complete" -> "M_stop_0 lxc1" [ style = bold]
+"probe_complete" [ style=bold color="green" fontcolor="orange"]
}
diff --git a/pengine/test10/whitebox-fail1.exp b/pengine/test10/whitebox-fail1.exp
index a1973599f5..22fcc056cd 100644
--- a/pengine/test10/whitebox-fail1.exp
+++ b/pengine/test10/whitebox-fail1.exp
@@ -1,232 +1,358 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
diff --git a/pengine/test10/whitebox-fail1.summary b/pengine/test10/whitebox-fail1.summary
index 5e5887b4ce..6d9531877d 100644
--- a/pengine/test10/whitebox-fail1.summary
+++ b/pengine/test10/whitebox-fail1.summary
@@ -1,53 +1,60 @@
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:
* Pseudo action: M-clone_stop_0
+ * Resource action: A monitor on lxc2
+ * Resource action: B monitor on lxc2
+ * Resource action: D monitor on lxc2
* Resource action: lxc1 stop on 18node2
* Resource action: container1 stop on 18node2
+ * Resource action: container1 start on 18node2
+ * Resource action: lxc1 start on 18node2
+ * Resource action: lxc1 monitor=30000 on 18node2
+ * Resource action: A monitor on lxc1
+ * Resource action: C monitor on lxc1
+ * Resource action: D monitor on lxc1
+ * Pseudo action: probe_complete
* Pseudo action: M_stop_0
* Pseudo action: M-clone_stopped_0
* Pseudo action: M-clone_start_0
* Pseudo action: B_stop_0
* Pseudo action: all_stopped
- * Resource action: container1 start on 18node2
- * Resource action: lxc1 start on 18node2
- * Resource action: lxc1 monitor=30000 on 18node2
* 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
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 b595015d26..008ee4d1b8 100644
--- a/pengine/test10/whitebox-fail2.dot
+++ b/pengine/test10/whitebox-fail2.dot
@@ -1,44 +1,67 @@
digraph "g" {
+"A_monitor_0 lxc1" -> "probe_complete lxc1" [ style = bold]
+"A_monitor_0 lxc1" [ style=bold color="green" fontcolor="black"]
+"A_monitor_0 lxc2" -> "probe_complete lxc2" [ style = bold]
+"A_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
+"B_monitor_0 lxc2" -> "probe_complete lxc2" [ style = bold]
+"B_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
"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"]
+"C_monitor_0 lxc1" -> "probe_complete lxc1" [ style = bold]
+"C_monitor_0 lxc1" [ style=bold color="green" fontcolor="black"]
+"D_monitor_0 lxc1" -> "probe_complete lxc1" [ style = bold]
+"D_monitor_0 lxc1" [ style=bold color="green" fontcolor="black"]
+"D_monitor_0 lxc2" -> "probe_complete lxc2" [ style = bold]
+"D_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
"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_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" [ style=bold color="green" fontcolor="black"]
"lxc1_monitor_30000 18node2" [ style=bold color="green" fontcolor="black"]
+"lxc1_start_0 18node2" -> "A_monitor_0 lxc1" [ style = bold]
"lxc1_start_0 18node2" -> "B_monitor_10000 lxc1" [ style = bold]
"lxc1_start_0 18node2" -> "B_start_0 lxc1" [ style = bold]
+"lxc1_start_0 18node2" -> "C_monitor_0 lxc1" [ style = bold]
+"lxc1_start_0 18node2" -> "D_monitor_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"]
+"probe_complete lxc1" -> "probe_complete" [ style = bold]
+"probe_complete lxc1" [ style=bold color="green" fontcolor="black"]
+"probe_complete lxc2" -> "probe_complete" [ style = bold]
+"probe_complete lxc2" [ style=bold color="green" fontcolor="black"]
+"probe_complete" -> "B_start_0 lxc1" [ style = bold]
+"probe_complete" -> "B_stop_0 lxc1" [ style = bold]
+"probe_complete" -> "M_stop_0 lxc1" [ style = bold]
+"probe_complete" [ style=bold color="green" fontcolor="orange"]
}
diff --git a/pengine/test10/whitebox-fail2.exp b/pengine/test10/whitebox-fail2.exp
index a1973599f5..22fcc056cd 100644
--- a/pengine/test10/whitebox-fail2.exp
+++ b/pengine/test10/whitebox-fail2.exp
@@ -1,232 +1,358 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
diff --git a/pengine/test10/whitebox-fail2.summary b/pengine/test10/whitebox-fail2.summary
index 338173dbe2..6b3bc9b6d7 100644
--- a/pengine/test10/whitebox-fail2.summary
+++ b/pengine/test10/whitebox-fail2.summary
@@ -1,53 +1,60 @@
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:
* Pseudo action: M-clone_stop_0
+ * Resource action: A monitor on lxc2
+ * Resource action: B monitor on lxc2
+ * Resource action: D monitor on lxc2
* Resource action: lxc1 stop on 18node2
* Resource action: container1 stop on 18node2
+ * Resource action: container1 start on 18node2
+ * Resource action: lxc1 start on 18node2
+ * Resource action: lxc1 monitor=30000 on 18node2
+ * Resource action: A monitor on lxc1
+ * Resource action: C monitor on lxc1
+ * Resource action: D monitor on lxc1
+ * Pseudo action: probe_complete
* Pseudo action: M_stop_0
* Pseudo action: M-clone_stopped_0
* Pseudo action: M-clone_start_0
* Pseudo action: B_stop_0
* Pseudo action: all_stopped
- * Resource action: container1 start on 18node2
- * Resource action: lxc1 start on 18node2
- * Resource action: lxc1 monitor=30000 on 18node2
* 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
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-fail3.dot b/pengine/test10/whitebox-fail3.dot
index 0c03463f5c..f202f84453 100644
--- a/pengine/test10/whitebox-fail3.dot
+++ b/pengine/test10/whitebox-fail3.dot
@@ -1,41 +1,55 @@
digraph "g" {
"18builder_monitor_0 dvossel-laptop2" -> "probe_complete 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_monitor_0 18builder" [ style = bold]
"18builder_start_0 dvossel-laptop2" -> "FAKE_start_0 18builder" [ style = bold]
+"18builder_start_0 dvossel-laptop2" -> "W:1_monitor_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_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_monitor_0 18builder" -> "probe_complete 18builder" [ style = bold]
+"FAKE_monitor_0 18builder" [ 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_0 18builder" -> "probe_complete 18builder" [ style = bold]
+"W:1_monitor_0 18builder" [ style=bold color="green" fontcolor="black"]
"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_0 18builder" -> "probe_complete 18builder" [ style = bold]
+"X:1_monitor_0 18builder" [ style=bold color="green" fontcolor="black"]
"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"]
+"probe_complete 18builder" -> "probe_complete" [ style = bold]
+"probe_complete 18builder" [ style=bold color="green" fontcolor="black"]
"probe_complete dvossel-laptop2" -> "probe_nodes_complete" [ style = bold]
"probe_complete dvossel-laptop2" [ style=bold color="green" fontcolor="black"]
+"probe_complete" -> "FAKE_start_0 18builder" [ style = bold]
"probe_complete" -> "FAKE_stop_0 dvossel-laptop2" [ style = bold]
+"probe_complete" -> "W:1_start_0 18builder" [ style = bold]
+"probe_complete" -> "X:1_start_0 18builder" [ style = bold]
"probe_complete" [ style=bold color="green" fontcolor="orange"]
"probe_nodes_complete" -> "18builder_start_0 dvossel-laptop2" [ style = bold]
"probe_nodes_complete" [ 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 63c819e914..faf4f6ff0b 100644
--- a/pengine/test10/whitebox-fail3.exp
+++ b/pengine/test10/whitebox-fail3.exp
@@ -1,233 +1,303 @@
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
+
+
+
+
-
+
-
+
diff --git a/pengine/test10/whitebox-fail3.summary b/pengine/test10/whitebox-fail3.summary
index af2b2305a7..d6cae1a540 100644
--- a/pengine/test10/whitebox-fail3.summary
+++ b/pengine/test10/whitebox-fail3.summary
@@ -1,56 +1,59 @@
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
* Pseudo action: W-master_start_0
* Pseudo action: X-master_start_0
* Resource action: 18builder monitor on dvossel-laptop2
* Pseudo action: probe_nodes_complete
+ * Resource action: 18builder start on dvossel-laptop2
+ * Resource action: FAKE monitor on 18builder
+ * Resource action: W monitor on 18builder
+ * Resource action: X monitor on 18builder
+ * Resource action: 18builder monitor=30000 on dvossel-laptop2
* Pseudo action: probe_complete
* Resource action: FAKE stop on dvossel-laptop2
- * Resource action: 18builder start on dvossel-laptop2
- * Pseudo action: all_stopped
- * 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
+ * Pseudo action: all_stopped
+ * Resource action: FAKE start on 18builder
* 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-move.dot b/pengine/test10/whitebox-move.dot
index 7368b1e005..762a0fe1c1 100644
--- a/pengine/test10/whitebox-move.dot
+++ b/pengine/test10/whitebox-move.dot
@@ -1,44 +1,54 @@
digraph "g" {
+"A_monitor_0 lxc2" -> "probe_complete lxc2" [ style = bold]
+"A_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
"A_monitor_10000 lxc1" [ style=bold color="green" fontcolor="black"]
"A_start_0 lxc1" -> "A_monitor_10000 lxc1" [ style = bold]
"A_start_0 lxc1" [ style=bold color="green" fontcolor="black"]
"A_stop_0 lxc1" -> "A_start_0 lxc1" [ style = bold]
"A_stop_0 lxc1" -> "all_stopped" [ style = bold]
"A_stop_0 lxc1" -> "lxc1_stop_0 18node1" [ style = bold]
"A_stop_0 lxc1" [ style=bold color="green" fontcolor="black"]
"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" -> "lxc1_stop_0 18node1" [ style = bold]
"M_stop_0 lxc1" [ style=bold color="green" fontcolor="black"]
"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 18node1" -> "all_stopped" [ style = bold]
"container1_stop_0 18node1" -> "container1_start_0 18node2" [ style = bold]
"container1_stop_0 18node1" [ style=bold color="green" fontcolor="black"]
"lxc1_monitor_30000 18node2" [ style=bold color="green" fontcolor="black"]
"lxc1_start_0 18node2" -> "A_monitor_10000 lxc1" [ style = bold]
"lxc1_start_0 18node2" -> "A_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 18node1" -> "all_stopped" [ style = bold]
"lxc1_stop_0 18node1" -> "container1_stop_0 18node1" [ style = bold]
"lxc1_stop_0 18node1" -> "lxc1_start_0 18node2" [ style = bold]
"lxc1_stop_0 18node1" [ style=bold color="green" fontcolor="black"]
+"probe_complete lxc1" -> "probe_complete" [ style = bold]
+"probe_complete lxc1" [ style=bold color="green" fontcolor="black"]
+"probe_complete lxc2" -> "probe_complete" [ style = bold]
+"probe_complete lxc2" [ style=bold color="green" fontcolor="black"]
+"probe_complete" -> "A_start_0 lxc1" [ style = bold]
+"probe_complete" -> "A_stop_0 lxc1" [ style = bold]
+"probe_complete" -> "M_stop_0 lxc1" [ style = bold]
+"probe_complete" [ style=bold color="green" fontcolor="orange"]
}
diff --git a/pengine/test10/whitebox-move.exp b/pengine/test10/whitebox-move.exp
index a1a604df09..a23e088816 100644
--- a/pengine/test10/whitebox-move.exp
+++ b/pengine/test10/whitebox-move.exp
@@ -1,234 +1,288 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/whitebox-move.summary b/pengine/test10/whitebox-move.summary
index 3422ac7890..33b31549b2 100644
--- a/pengine/test10/whitebox-move.summary
+++ b/pengine/test10/whitebox-move.summary
@@ -1,47 +1,49 @@
Current cluster status:
Online: [ 18node1 18node2 18node3 ]
Containers: [ lxc1:container1 lxc2:container2 ]
container1 (ocf::heartbeat:VirtualDomain): Started 18node1
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 lxc1
Transition Summary:
* Move container1 (Started 18node1 -> 18node2)
* Restart M:3 (Started lxc1)
* Restart A (Started lxc1)
* Move lxc1 (Started 18node1 -> 18node2)
Executing cluster transition:
* Pseudo action: M-clone_stop_0
- * Resource action: A stop on lxc1
+ * Resource action: A monitor on lxc2
+ * Pseudo action: probe_complete
* Resource action: M stop on lxc1
* Pseudo action: M-clone_stopped_0
* Pseudo action: M-clone_start_0
+ * Resource action: A stop on lxc1
* Resource action: lxc1 stop on 18node1
* Resource action: container1 stop on 18node1
* Pseudo action: all_stopped
* Resource action: container1 start on 18node2
* Resource action: lxc1 start on 18node2
* Resource action: M start on lxc1
* Resource action: M monitor=10000 on lxc1
* Pseudo action: M-clone_running_0
* Resource action: A start on lxc1
* Resource action: A monitor=10000 on lxc1
* Resource action: lxc1 monitor=30000 on 18node2
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 lxc1
diff --git a/pengine/test10/whitebox-ms-ordering.dot b/pengine/test10/whitebox-ms-ordering.dot
index 9d1d0d1b0b..e8fc075af0 100644
--- a/pengine/test10/whitebox-ms-ordering.dot
+++ b/pengine/test10/whitebox-ms-ordering.dot
@@ -1,108 +1,112 @@
digraph "g" {
"all_stopped" [ style=bold color="green" fontcolor="orange"]
"container1_monitor_0 18node1" -> "probe_complete 18node1" [ style = bold]
"container1_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
"container1_monitor_0 18node2" -> "probe_complete 18node2" [ style = bold]
"container1_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
"container1_monitor_0 18node3" -> "probe_complete 18node3" [ 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" -> "probe_complete 18node1" [ style = bold]
"container2_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
"container2_monitor_0 18node2" -> "probe_complete 18node2" [ style = bold]
"container2_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
"container2_monitor_0 18node3" -> "probe_complete 18node3" [ 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="black"]
"lxc-ms_monitor_0 18node1" -> "probe_complete 18node1" [ style = bold]
"lxc-ms_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
"lxc-ms_monitor_0 18node2" -> "probe_complete 18node2" [ style = bold]
"lxc-ms_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
"lxc-ms_monitor_0 18node3" -> "probe_complete 18node3" [ 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" -> "probe_complete 18node1" [ style = bold]
"lxc1_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
"lxc1_monitor_0 18node2" -> "probe_complete 18node2" [ style = bold]
"lxc1_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
"lxc1_monitor_0 18node3" -> "probe_complete 18node3" [ 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_demote_0 lxc1" [ style = bold]
"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" -> "probe_complete 18node1" [ style = bold]
"lxc2_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
"lxc2_monitor_0 18node2" -> "probe_complete 18node2" [ style = bold]
"lxc2_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
"lxc2_monitor_0 18node3" -> "probe_complete 18node3" [ 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"]
"probe_complete 18node1" -> "probe_nodes_complete" [ style = bold]
"probe_complete 18node1" [ style=bold color="green" fontcolor="black"]
"probe_complete 18node2" -> "probe_nodes_complete" [ style = bold]
"probe_complete 18node2" [ style=bold color="green" fontcolor="black"]
"probe_complete 18node3" -> "probe_nodes_complete" [ style = bold]
"probe_complete 18node3" [ style=bold color="green" fontcolor="black"]
-"probe_complete" -> "container1_start_0 18node1" [ style = bold]
-"probe_complete" -> "container2_start_0 18node1" [ style = bold]
+"probe_complete lxc1" -> "probe_complete" [ style = bold]
+"probe_complete lxc1" [ style=bold color="green" fontcolor="black"]
+"probe_complete lxc2" -> "probe_complete" [ style = bold]
+"probe_complete lxc2" [ style=bold color="green" fontcolor="black"]
"probe_complete" -> "lxc-ms_start_0 lxc1" [ style = bold]
"probe_complete" -> "lxc-ms_start_0 lxc2" [ style = bold]
"probe_complete" -> "lxc-ms_stop_0 lxc1" [ style = bold]
"probe_complete" -> "lxc-ms_stop_0 lxc2" [ style = bold]
"probe_complete" [ style=bold color="green" fontcolor="orange"]
+"probe_nodes_complete" -> "container1_start_0 18node1" [ style = bold]
+"probe_nodes_complete" -> "container2_start_0 18node1" [ style = bold]
"probe_nodes_complete" -> "lxc1_start_0 18node1" [ style = bold]
"probe_nodes_complete" -> "lxc2_start_0 18node1" [ style = bold]
"probe_nodes_complete" [ style=bold color="green" fontcolor="orange"]
}
diff --git a/pengine/test10/whitebox-ms-ordering.exp b/pengine/test10/whitebox-ms-ordering.exp
index 2060ffb751..22b004063c 100644
--- a/pengine/test10/whitebox-ms-ordering.exp
+++ b/pengine/test10/whitebox-ms-ordering.exp
@@ -1,581 +1,604 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
-
+
-
+
-
+
diff --git a/pengine/test10/whitebox-orphan-ms.pe.dot b/pengine/test10/whitebox-orphan-ms.pe.dot
deleted file mode 100644
index 81c37ebad0..0000000000
--- a/pengine/test10/whitebox-orphan-ms.pe.dot
+++ /dev/null
@@ -1,69 +0,0 @@
-digraph "g" {
-"FencingFail_start_0 18node1" [ style=bold color="green" fontcolor="black"]
-"FencingFail_stop_0 18node3" -> "FencingFail_start_0 18node1" [ style = bold]
-"FencingFail_stop_0 18node3" -> "all_stopped" [ style = bold]
-"FencingFail_stop_0 18node3" [ style=bold color="green" fontcolor="black"]
-"all_stopped" [ style=bold color="green" fontcolor="orange"]
-"container1_delete_0 18node1" -> "container1_start_0 " [ style = dashed]
-"container1_delete_0 18node1" [ style=bold color="green" fontcolor="black"]
-"container1_delete_0 18node2" -> "container1_start_0 " [ style = dashed]
-"container1_delete_0 18node2" [ style=bold color="green" fontcolor="black"]
-"container1_delete_0 18node3" -> "container1_start_0 " [ style = dashed]
-"container1_delete_0 18node3" [ style=bold color="green" fontcolor="black"]
-"container1_start_0 " [ style=dashed color="red" fontcolor="black"]
-"container1_stop_0 18node1" -> "all_stopped" [ style = bold]
-"container1_stop_0 18node1" -> "container1_delete_0 18node1" [ style = bold]
-"container1_stop_0 18node1" -> "container1_delete_0 18node2" [ style = bold]
-"container1_stop_0 18node1" -> "container1_delete_0 18node3" [ style = bold]
-"container1_stop_0 18node1" -> "container1_start_0 " [ style = dashed]
-"container1_stop_0 18node1" [ style=bold color="green" fontcolor="black"]
-"container2_delete_0 18node1" [ style=bold color="green" fontcolor="black"]
-"container2_delete_0 18node2" [ style=bold color="green" fontcolor="black"]
-"container2_delete_0 18node3" [ style=bold color="green" fontcolor="black"]
-"container2_stop_0 18node1" -> "all_stopped" [ style = bold]
-"container2_stop_0 18node1" -> "container2_delete_0 18node1" [ style = bold]
-"container2_stop_0 18node1" -> "container2_delete_0 18node2" [ style = bold]
-"container2_stop_0 18node1" -> "container2_delete_0 18node3" [ style = bold]
-"container2_stop_0 18node1" [ style=bold color="green" fontcolor="black"]
-"lxc-ms_delete_0 18node1" [ style=bold color="green" fontcolor="black"]
-"lxc-ms_delete_0 18node2" [ style=bold color="green" fontcolor="black"]
-"lxc-ms_delete_0 18node3" [ style=bold color="green" fontcolor="black"]
-"lxc-ms_demote_0 lxc1" -> "lxc-ms_stop_0 lxc1" [ style = bold]
-"lxc-ms_demote_0 lxc1" -> "lxc-ms_stop_0 lxc2" [ style = bold]
-"lxc-ms_demote_0 lxc1" -> "lxc1_stop_0 18node1" [ style = bold]
-"lxc-ms_demote_0 lxc1" [ style=bold color="green" fontcolor="black"]
-"lxc-ms_demote_0 lxc2" -> "lxc-ms_stop_0 lxc1" [ style = bold]
-"lxc-ms_demote_0 lxc2" -> "lxc-ms_stop_0 lxc2" [ style = bold]
-"lxc-ms_demote_0 lxc2" -> "lxc2_stop_0 18node1" [ style = bold]
-"lxc-ms_demote_0 lxc2" [ style=bold color="green" fontcolor="black"]
-"lxc-ms_stop_0 lxc1" -> "all_stopped" [ style = bold]
-"lxc-ms_stop_0 lxc1" -> "lxc-ms_delete_0 18node1" [ style = bold]
-"lxc-ms_stop_0 lxc1" -> "lxc-ms_delete_0 18node2" [ style = bold]
-"lxc-ms_stop_0 lxc1" -> "lxc-ms_delete_0 18node3" [ style = bold]
-"lxc-ms_stop_0 lxc1" -> "lxc1_stop_0 18node1" [ style = bold]
-"lxc-ms_stop_0 lxc1" [ style=bold color="green" fontcolor="black"]
-"lxc-ms_stop_0 lxc2" -> "all_stopped" [ style = bold]
-"lxc-ms_stop_0 lxc2" -> "lxc-ms_delete_0 18node1" [ style = bold]
-"lxc-ms_stop_0 lxc2" -> "lxc-ms_delete_0 18node2" [ style = bold]
-"lxc-ms_stop_0 lxc2" -> "lxc-ms_delete_0 18node3" [ style = bold]
-"lxc-ms_stop_0 lxc2" -> "lxc2_stop_0 18node1" [ style = bold]
-"lxc-ms_stop_0 lxc2" [ style=bold color="green" fontcolor="black"]
-"lxc1_delete_0 18node1" [ style=bold color="green" fontcolor="black"]
-"lxc1_delete_0 18node2" [ style=bold color="green" fontcolor="black"]
-"lxc1_delete_0 18node3" [ style=bold color="green" fontcolor="black"]
-"lxc1_stop_0 18node1" -> "all_stopped" [ style = bold]
-"lxc1_stop_0 18node1" -> "container1_stop_0 18node1" [ style = bold]
-"lxc1_stop_0 18node1" -> "lxc1_delete_0 18node1" [ style = bold]
-"lxc1_stop_0 18node1" -> "lxc1_delete_0 18node2" [ style = bold]
-"lxc1_stop_0 18node1" -> "lxc1_delete_0 18node3" [ style = bold]
-"lxc1_stop_0 18node1" [ style=bold color="green" fontcolor="black"]
-"lxc2_delete_0 18node1" [ style=bold color="green" fontcolor="black"]
-"lxc2_delete_0 18node2" [ style=bold color="green" fontcolor="black"]
-"lxc2_delete_0 18node3" [ style=bold color="green" fontcolor="black"]
-"lxc2_stop_0 18node1" -> "all_stopped" [ style = bold]
-"lxc2_stop_0 18node1" -> "container2_stop_0 18node1" [ style = bold]
-"lxc2_stop_0 18node1" -> "lxc2_delete_0 18node1" [ style = bold]
-"lxc2_stop_0 18node1" -> "lxc2_delete_0 18node2" [ style = bold]
-"lxc2_stop_0 18node1" -> "lxc2_delete_0 18node3" [ style = bold]
-"lxc2_stop_0 18node1" [ style=bold color="green" fontcolor="black"]
-}
diff --git a/pengine/test10/whitebox-orphaned.dot b/pengine/test10/whitebox-orphaned.dot
index 289a8f6dc1..0f30e7c24d 100644
--- a/pengine/test10/whitebox-orphaned.dot
+++ b/pengine/test10/whitebox-orphaned.dot
@@ -1,37 +1,49 @@
digraph "g" {
+"A_monitor_0 lxc2" -> "probe_complete lxc2" [ style = bold]
+"A_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
+"B_monitor_0 lxc2" -> "probe_complete lxc2" [ style = bold]
+"B_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
"B_monitor_10000 lxc2" [ style=bold color="green" fontcolor="black"]
"B_start_0 lxc2" -> "B_monitor_10000 lxc2" [ style = bold]
"B_start_0 lxc2" [ style=bold color="green" fontcolor="black"]
"B_stop_0 lxc1" -> "B_start_0 lxc2" [ style = bold]
"B_stop_0 lxc1" -> "all_stopped" [ style = bold]
"B_stop_0 lxc1" -> "lxc1_stop_0 18node2" [ style = bold]
"B_stop_0 lxc1" [ style=bold color="green" fontcolor="black"]
+"D_monitor_0 lxc2" -> "probe_complete lxc2" [ style = bold]
+"D_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
"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" [ style=bold color="green" fontcolor="orange"]
"M_stop_0 lxc1" -> "M-clone_stopped_0" [ style = bold]
"M_stop_0 lxc1" -> "all_stopped" [ style = bold]
"M_stop_0 lxc1" -> "lxc1_stop_0 18node2" [ style = bold]
"M_stop_0 lxc1" [ style=bold color="green" fontcolor="black"]
"all_stopped" [ style=bold color="green" fontcolor="orange"]
+"container1_clear_failcount 18node2" -> "probe_complete" [ style = bold]
"container1_clear_failcount 18node2" [ style=bold color="green" fontcolor="black"]
"container1_delete_0 18node1" [ style=bold color="green" fontcolor="black"]
"container1_delete_0 18node2" [ style=bold color="green" fontcolor="black"]
"container1_delete_0 18node3" [ style=bold color="green" fontcolor="black"]
"container1_stop_0 18node2" -> "all_stopped" [ style = bold]
"container1_stop_0 18node2" -> "container1_delete_0 18node1" [ style = bold]
"container1_stop_0 18node2" -> "container1_delete_0 18node2" [ style = bold]
"container1_stop_0 18node2" -> "container1_delete_0 18node3" [ style = bold]
"container1_stop_0 18node2" [ style=bold color="green" fontcolor="black"]
+"lxc1_clear_failcount 18node2" -> "probe_complete" [ style = bold]
"lxc1_clear_failcount 18node2" [ style=bold color="green" fontcolor="black"]
"lxc1_delete_0 18node1" [ style=bold color="green" fontcolor="black"]
"lxc1_delete_0 18node2" [ style=bold color="green" fontcolor="black"]
"lxc1_delete_0 18node3" [ 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_delete_0 18node1" [ style = bold]
"lxc1_stop_0 18node2" -> "lxc1_delete_0 18node2" [ style = bold]
"lxc1_stop_0 18node2" -> "lxc1_delete_0 18node3" [ style = bold]
"lxc1_stop_0 18node2" [ style=bold color="green" fontcolor="black"]
+"probe_complete lxc2" -> "probe_complete" [ style = bold]
+"probe_complete lxc2" [ style=bold color="green" fontcolor="black"]
+"probe_complete" -> "B_start_0 lxc2" [ style = bold]
+"probe_complete" [ style=bold color="green" fontcolor="orange"]
}
diff --git a/pengine/test10/whitebox-orphaned.exp b/pengine/test10/whitebox-orphaned.exp
index 9a0b673c1c..e78fc814a9 100644
--- a/pengine/test10/whitebox-orphaned.exp
+++ b/pengine/test10/whitebox-orphaned.exp
@@ -1,219 +1,285 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
diff --git a/pengine/test10/whitebox-orphaned.summary b/pengine/test10/whitebox-orphaned.summary
index 7be845326a..3484149185 100644
--- a/pengine/test10/whitebox-orphaned.summary
+++ b/pengine/test10/whitebox-orphaned.summary
@@ -1,55 +1,59 @@
Current cluster status:
Online: [ 18node1 18node2 18node3 ]
Containers: [ lxc1:container1 lxc2:container2 ]
container2 (ocf::heartbeat:VirtualDomain): Started 18node2
shoot1 (stonith:fence_xvm): Started 18node3
Clone Set: M-clone [M]
M (ocf::pacemaker:Dummy): ORPHANED Started lxc1
Started: [ 18node1 18node2 18node3 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
container1 (ocf::heartbeat:VirtualDomain): ORPHANED Started 18node2
lxc1 (ocf::pacemaker:remote): ORPHANED Started 18node2
Transition Summary:
* Stop M:4 (lxc1)
* Move B (Started lxc1 -> lxc2)
* Stop container1 (18node2)
* Stop lxc1 (18node2)
Executing cluster transition:
* Pseudo action: M-clone_stop_0
+ * Resource action: A monitor on lxc2
* Resource action: B stop on lxc1
+ * Resource action: B monitor on lxc2
+ * Resource action: D monitor on lxc2
* Cluster action: clear_failcount for container1 on 18node2
* Cluster action: clear_failcount for lxc1 on 18node2
+ * Pseudo action: probe_complete
* Resource action: M stop on lxc1
* Pseudo action: M-clone_stopped_0
* Resource action: B start on lxc2
* Resource action: lxc1 stop on 18node2
* Resource action: lxc1 delete on 18node3
* Resource action: lxc1 delete on 18node2
* Resource action: lxc1 delete on 18node1
* Resource action: B monitor=10000 on lxc2
* Resource action: container1 stop on 18node2
* Resource action: container1 delete on 18node3
* Resource action: container1 delete on 18node2
* Resource action: container1 delete on 18node1
* Pseudo action: all_stopped
Revised cluster status:
Online: [ 18node1 18node2 18node3 ]
Containers: [ lxc2:container2 ]
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): Started lxc2
C (ocf::pacemaker:Dummy): Started lxc2
D (ocf::pacemaker:Dummy): Started 18node1
diff --git a/pengine/test10/whitebox-start.dot b/pengine/test10/whitebox-start.dot
index bec57b0845..f9866021e3 100644
--- a/pengine/test10/whitebox-start.dot
+++ b/pengine/test10/whitebox-start.dot
@@ -1,17 +1,35 @@
digraph "g" {
+"A_monitor_0 lxc1" -> "probe_complete lxc1" [ style = bold]
+"A_monitor_0 lxc1" [ style=bold color="green" fontcolor="black"]
+"A_monitor_0 lxc2" -> "probe_complete lxc2" [ style = bold]
+"A_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
+"C_monitor_0 lxc1" -> "probe_complete lxc1" [ style = bold]
+"C_monitor_0 lxc1" [ style=bold color="green" fontcolor="black"]
+"D_monitor_0 lxc1" -> "probe_complete lxc1" [ style = bold]
+"D_monitor_0 lxc1" [ style=bold color="green" fontcolor="black"]
+"D_monitor_0 lxc2" -> "probe_complete lxc2" [ style = bold]
+"D_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
"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_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"]
"container1_start_0 18node1" -> "lxc1_start_0 18node1" [ style = bold]
"container1_start_0 18node1" [ style=bold color="green" fontcolor="black"]
"lxc1_monitor_30000 18node1" [ style=bold color="green" fontcolor="black"]
+"lxc1_start_0 18node1" -> "A_monitor_0 lxc1" [ style = bold]
+"lxc1_start_0 18node1" -> "C_monitor_0 lxc1" [ style = bold]
+"lxc1_start_0 18node1" -> "D_monitor_0 lxc1" [ style = bold]
"lxc1_start_0 18node1" -> "M_monitor_10000 lxc1" [ style = bold]
"lxc1_start_0 18node1" -> "M_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"]
+"probe_complete lxc1" -> "probe_complete" [ style = bold]
+"probe_complete lxc1" [ style=bold color="green" fontcolor="black"]
+"probe_complete lxc2" -> "probe_complete" [ style = bold]
+"probe_complete lxc2" [ style=bold color="green" fontcolor="black"]
+"probe_complete" [ style=bold color="green" fontcolor="orange"]
}
diff --git a/pengine/test10/whitebox-start.exp b/pengine/test10/whitebox-start.exp
index f950dafaed..1f10e16278 100644
--- a/pengine/test10/whitebox-start.exp
+++ b/pengine/test10/whitebox-start.exp
@@ -1,93 +1,198 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pengine/test10/whitebox-start.summary b/pengine/test10/whitebox-start.summary
index 2801abe21f..777fe62ea3 100644
--- a/pengine/test10/whitebox-start.summary
+++ b/pengine/test10/whitebox-start.summary
@@ -1,44 +1,50 @@
Current cluster status:
Online: [ 18node1 18node2 18node3 ]
Containers: [ lxc2:container2 ]
container1 (ocf::heartbeat:VirtualDomain): Stopped
container2 (ocf::heartbeat:VirtualDomain): Started 18node2
shoot1 (stonith:fence_xvm): Started 18node3
Clone Set: M-clone [M]
Started: [ 18node1 18node2 18node3 lxc2 ]
Stopped: [ lxc1 ]
A (ocf::pacemaker:Dummy): Started 18node1
B (ocf::pacemaker:Dummy): Started lxc2
C (ocf::pacemaker:Dummy): Started lxc2
D (ocf::pacemaker:Dummy): Started 18node1
Transition Summary:
* Start container1 (18node1)
* Start M:4 (lxc1)
* Start lxc1 (18node1)
Executing cluster transition:
* Resource action: container1 start on 18node1
* Pseudo action: M-clone_start_0
+ * Resource action: A monitor on lxc2
+ * Resource action: D monitor on lxc2
* Resource action: lxc1 start on 18node1
* Resource action: M start on lxc1
* Pseudo action: M-clone_running_0
+ * Resource action: A monitor on lxc1
+ * Resource action: C monitor on lxc1
+ * Resource action: D monitor on lxc1
* Resource action: lxc1 monitor=30000 on 18node1
+ * Pseudo action: probe_complete
* Resource action: M monitor=10000 on lxc1
Revised cluster status:
Online: [ 18node1 18node2 18node3 ]
Containers: [ lxc1:container1 lxc2:container2 ]
container1 (ocf::heartbeat:VirtualDomain): Started 18node1
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 lxc2
C (ocf::pacemaker:Dummy): Started lxc2
D (ocf::pacemaker:Dummy): Started 18node1
diff --git a/pengine/test10/whitebox-stop.dot b/pengine/test10/whitebox-stop.dot
index 9900483098..26dcb24112 100644
--- a/pengine/test10/whitebox-stop.dot
+++ b/pengine/test10/whitebox-stop.dot
@@ -1,23 +1,33 @@
digraph "g" {
+"A_monitor_0 lxc2" -> "probe_complete lxc2" [ style = bold]
+"A_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
+"B_monitor_0 lxc2" -> "probe_complete lxc2" [ style = bold]
+"B_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
"B_monitor_10000 lxc2" [ style=bold color="green" fontcolor="black"]
"B_start_0 lxc2" -> "B_monitor_10000 lxc2" [ style = bold]
"B_start_0 lxc2" [ style=bold color="green" fontcolor="black"]
"B_stop_0 lxc1" -> "B_start_0 lxc2" [ style = bold]
"B_stop_0 lxc1" -> "all_stopped" [ style = bold]
"B_stop_0 lxc1" -> "lxc1_stop_0 18node2" [ style = bold]
"B_stop_0 lxc1" [ style=bold color="green" fontcolor="black"]
+"D_monitor_0 lxc2" -> "probe_complete lxc2" [ style = bold]
+"D_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
"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" [ style=bold color="green" fontcolor="orange"]
"M_stop_0 lxc1" -> "M-clone_stopped_0" [ style = bold]
"M_stop_0 lxc1" -> "all_stopped" [ style = bold]
"M_stop_0 lxc1" -> "lxc1_stop_0 18node2" [ style = bold]
"M_stop_0 lxc1" [ style=bold color="green" fontcolor="black"]
"all_stopped" [ style=bold color="green" fontcolor="orange"]
"container1_stop_0 18node2" -> "all_stopped" [ style = bold]
"container1_stop_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" [ style=bold color="green" fontcolor="black"]
+"probe_complete lxc2" -> "probe_complete" [ style = bold]
+"probe_complete lxc2" [ style=bold color="green" fontcolor="black"]
+"probe_complete" -> "B_start_0 lxc2" [ style = bold]
+"probe_complete" [ style=bold color="green" fontcolor="orange"]
}
diff --git a/pengine/test10/whitebox-stop.exp b/pengine/test10/whitebox-stop.exp
index 84234ed2f0..fbb3111a65 100644
--- a/pengine/test10/whitebox-stop.exp
+++ b/pengine/test10/whitebox-stop.exp
@@ -1,124 +1,184 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
+
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/whitebox-stop.summary b/pengine/test10/whitebox-stop.summary
index 51357b9552..8862c4b075 100644
--- a/pengine/test10/whitebox-stop.summary
+++ b/pengine/test10/whitebox-stop.summary
@@ -1,47 +1,51 @@
Current 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
Transition Summary:
* Stop container1 (18node2)
* Stop M:4 (lxc1)
* Move B (Started lxc1 -> lxc2)
* Stop lxc1 (18node2)
Executing cluster transition:
* Pseudo action: M-clone_stop_0
+ * Resource action: A monitor on lxc2
* Resource action: B stop on lxc1
+ * Resource action: B monitor on lxc2
+ * Resource action: D monitor on lxc2
+ * Pseudo action: probe_complete
* Resource action: M stop on lxc1
* Pseudo action: M-clone_stopped_0
* Resource action: B start on lxc2
* Resource action: lxc1 stop on 18node2
* Resource action: container1 stop on 18node2
* Resource action: B monitor=10000 on lxc2
* Pseudo action: all_stopped
Revised cluster status:
Online: [ 18node1 18node2 18node3 ]
Containers: [ lxc2:container2 ]
container1 (ocf::heartbeat:VirtualDomain): Stopped
container2 (ocf::heartbeat:VirtualDomain): Started 18node2
shoot1 (stonith:fence_xvm): Started 18node3
Clone Set: M-clone [M]
Started: [ 18node1 18node2 18node3 lxc2 ]
Stopped: [ lxc1 ]
A (ocf::pacemaker:Dummy): Started 18node1
B (ocf::pacemaker:Dummy): Started lxc2
C (ocf::pacemaker:Dummy): Started lxc2
D (ocf::pacemaker:Dummy): Started 18node1