diff --git a/pengine/test10/797.summary b/pengine/test10/797.summary
index ef69c6d8a0..c49e1b9209 100644
--- a/pengine/test10/797.summary
+++ b/pengine/test10/797.summary
@@ -1,73 +1,73 @@
Current cluster status:
Node c001n08 (6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b): UNCLEAN (offline)
Online: [ c001n01 c001n02 c001n03 ]
DcIPaddr (ocf::heartbeat:IPaddr): Started c001n03
rsc_c001n08 (ocf::heartbeat:IPaddr): Started c001n02
rsc_c001n02 (ocf::heartbeat:IPaddr): Started c001n02
rsc_c001n03 (ocf::heartbeat:IPaddr): Started c001n03
rsc_c001n01 (ocf::heartbeat:IPaddr): Started c001n01
Clone Set: DoFencing [child_DoFencing] (unique)
child_DoFencing:0 (stonith:ssh): Started [ c001n01 c001n03 ]
child_DoFencing:1 (stonith:ssh): Started c001n02
child_DoFencing:2 (stonith:ssh): Started c001n03
child_DoFencing:3 (stonith:ssh): Stopped
Transition Summary:
* Stop DcIPaddr (Started c001n03)
* Stop rsc_c001n08 (Started c001n01)
* Stop rsc_c001n02 (Started c001n01)
* Stop rsc_c001n03 (Started c001n03)
* Stop rsc_c001n01 (Started c001n01)
* Restart child_DoFencing:0 (Started c001n01)
* Stop child_DoFencing:1 (c001n02)
Executing cluster transition:
* Resource action: DcIPaddr monitor on c001n02
* Resource action: DcIPaddr monitor on c001n01
* Resource action: rsc_c001n08 stop on c001n02
* Resource action: rsc_c001n08 monitor on c001n03
* Resource action: rsc_c001n08 monitor on c001n01
* Resource action: rsc_c001n02 stop on c001n02
* Resource action: rsc_c001n02 monitor on c001n03
* Resource action: rsc_c001n02 monitor on c001n01
* Resource action: rsc_c001n03 monitor on c001n02
* Resource action: rsc_c001n03 monitor on c001n01
* Resource action: rsc_c001n01 monitor on c001n03
* Resource action: child_DoFencing:2 monitor on c001n01
* Resource action: child_DoFencing:3 monitor on c001n03
* Resource action: child_DoFencing:3 monitor on c001n02
* Resource action: child_DoFencing:3 monitor on c001n01
* Pseudo action: DoFencing_stop_0
* Pseudo action: probe_complete
* Resource action: DcIPaddr stop on c001n03
* Resource action: rsc_c001n03 stop on c001n03
* Resource action: rsc_c001n01 stop on c001n01
* Resource action: child_DoFencing:0 stop on c001n03
* Resource action: child_DoFencing:0 stop on c001n01
* Resource action: child_DoFencing:1 stop on c001n02
* Pseudo action: DoFencing_stopped_0
* Pseudo action: DoFencing_start_0
* Cluster action: do_shutdown on c001n02
* Pseudo action: all_stopped
* Resource action: DcIPaddr delete on c001n03
* Resource action: child_DoFencing:0 start on c001n01
* Resource action: child_DoFencing:0 monitor=5000 on c001n01
* Pseudo action: DoFencing_running_0
Revised cluster status:
Node c001n08 (6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b): UNCLEAN (offline)
Online: [ c001n01 c001n02 c001n03 ]
- DcIPaddr (ocf::heartbeat:IPaddr): Started c001n03
+ DcIPaddr (ocf::heartbeat:IPaddr): Stopped
rsc_c001n08 (ocf::heartbeat:IPaddr): Stopped
rsc_c001n02 (ocf::heartbeat:IPaddr): Stopped
rsc_c001n03 (ocf::heartbeat:IPaddr): Stopped
rsc_c001n01 (ocf::heartbeat:IPaddr): Stopped
Clone Set: DoFencing [child_DoFencing] (unique)
child_DoFencing:0 (stonith:ssh): Started c001n01
child_DoFencing:1 (stonith:ssh): Stopped
child_DoFencing:2 (stonith:ssh): Started c001n03
child_DoFencing:3 (stonith:ssh): Stopped
diff --git a/pengine/test10/bug-1718.dot b/pengine/test10/bug-1718.dot
index 8b547bf977..aa392d82b5 100644
--- a/pengine/test10/bug-1718.dot
+++ b/pengine/test10/bug-1718.dot
@@ -1,28 +1,33 @@
digraph "g" {
+"Apache_delete_0 biggame.ds9" [ style=bold color="green" fontcolor="black"]
+"Apache_delete_0 heartbeat.ds9" [ style=bold color="green" fontcolor="black"]
+"Apache_delete_0 ops.ds9" [ style=bold color="green" fontcolor="black"]
+"OpenVPN_IP_delete_0 heartbeat.ds9" [ style=bold color="green" fontcolor="black"]
+"OpenVPN_IP_delete_0 ops.ds9" [ style=bold color="green" fontcolor="black"]
"all_stopped" [ style=bold color="green" fontcolor="orange" ]
"group_fUN_running_0" [ style=dashed color="red" fontcolor="orange" ]
"group_fUN_start_0" -> "group_fUN_running_0" [ style = dashed]
"group_fUN_start_0" -> "resource_IP3_start_0 ops.ds9" [ style = dashed]
"group_fUN_start_0" -> "resource_dummy_start_0 ops.ds9" [ style = dashed]
"group_fUN_start_0" [ style=dashed color="red" fontcolor="orange" ]
"group_fUN_stop_0" -> "group_fUN_stopped_0" [ style = bold]
"group_fUN_stop_0" -> "resource_IP3_stop_0 ops.ds9" [ style = bold]
"group_fUN_stop_0" -> "resource_dummy_stop_0 ops.ds9" [ style = bold]
"group_fUN_stop_0" [ style=bold color="green" fontcolor="orange" ]
"group_fUN_stopped_0" -> "group_fUN_start_0" [ style = dashed]
"group_fUN_stopped_0" [ style=bold color="green" fontcolor="orange" ]
"resource_IP3_start_0 ops.ds9" -> "group_fUN_running_0" [ style = dashed]
"resource_IP3_start_0 ops.ds9" -> "resource_dummy_start_0 ops.ds9" [ style = dashed]
"resource_IP3_start_0 ops.ds9" [ style=dashed color="red" fontcolor="black" ]
"resource_IP3_stop_0 ops.ds9" -> "all_stopped" [ style = bold]
"resource_IP3_stop_0 ops.ds9" -> "group_fUN_stopped_0" [ style = bold]
"resource_IP3_stop_0 ops.ds9" -> "resource_IP3_start_0 ops.ds9" [ style = dashed]
"resource_IP3_stop_0 ops.ds9" [ style=bold color="green" fontcolor="black" ]
"resource_dummy_start_0 ops.ds9" -> "group_fUN_running_0" [ style = dashed]
"resource_dummy_start_0 ops.ds9" [ style=dashed color="red" fontcolor="black" ]
"resource_dummy_stop_0 ops.ds9" -> "all_stopped" [ style = bold]
"resource_dummy_stop_0 ops.ds9" -> "group_fUN_stopped_0" [ style = bold]
"resource_dummy_stop_0 ops.ds9" -> "resource_IP3_stop_0 ops.ds9" [ style = bold]
"resource_dummy_stop_0 ops.ds9" -> "resource_dummy_start_0 ops.ds9" [ style = dashed]
"resource_dummy_stop_0 ops.ds9" [ style=bold color="green" fontcolor="black" ]
}
diff --git a/pengine/test10/bug-1718.exp b/pengine/test10/bug-1718.exp
index 2992c72c49..6d327319af 100644
--- a/pengine/test10/bug-1718.exp
+++ b/pengine/test10/bug-1718.exp
@@ -1,73 +1,118 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
diff --git a/pengine/test10/bug-1718.summary b/pengine/test10/bug-1718.summary
index 3bf4caeef2..d9a0cccc70 100644
--- a/pengine/test10/bug-1718.summary
+++ b/pengine/test10/bug-1718.summary
@@ -1,36 +1,41 @@
Current cluster status:
Online: [ biggame.ds9 heartbeat.ds9 ops.ds9 ]
OFFLINE: [ defiant.ds9 warbird.ds9 ]
Resource Group: Web_Group
Apache_IP (ocf::heartbeat:IPaddr): Started heartbeat.ds9
resource_IP2 (ocf::heartbeat:IPaddr): Stopped
resource_dummyweb (ocf::heartbeat:Dummy): Stopped
Resource Group: group_fUN
resource_IP3 (ocf::heartbeat:IPaddr): Started ops.ds9
resource_dummy (ocf::heartbeat:Dummy): Started ops.ds9
Transition Summary:
* Stop resource_IP3 (Started ops.ds9)
* Stop resource_dummy (Started ops.ds9)
Executing cluster transition:
* Pseudo action: group_fUN_stop_0
* Resource action: resource_dummy stop on ops.ds9
+ * Resource action: OpenVPN_IP delete on ops.ds9
+ * Resource action: OpenVPN_IP delete on heartbeat.ds9
+ * Resource action: Apache delete on biggame.ds9
+ * Resource action: Apache delete on ops.ds9
+ * Resource action: Apache delete on heartbeat.ds9
* Resource action: resource_IP3 stop on ops.ds9
* Pseudo action: all_stopped
* Pseudo action: group_fUN_stopped_0
Revised cluster status:
Online: [ biggame.ds9 heartbeat.ds9 ops.ds9 ]
OFFLINE: [ defiant.ds9 warbird.ds9 ]
Resource Group: Web_Group
Apache_IP (ocf::heartbeat:IPaddr): Started heartbeat.ds9
resource_IP2 (ocf::heartbeat:IPaddr): Stopped
resource_dummyweb (ocf::heartbeat:Dummy): Stopped
Resource Group: group_fUN
resource_IP3 (ocf::heartbeat:IPaddr): Stopped
resource_dummy (ocf::heartbeat:Dummy): Stopped
diff --git a/pengine/test10/bug-5059.dot b/pengine/test10/bug-5059.dot
index ea5851c528..97e3992e8a 100644
--- a/pengine/test10/bug-5059.dot
+++ b/pengine/test10/bug-5059.dot
@@ -1,104 +1,106 @@
digraph "g" {
"g_stateful:0_promote_0" -> "p_stateful1:0_promote_0 gluster01.h" [ style = bold]
"g_stateful:0_promote_0" -> "p_stateful2:0_promote_0 gluster01.h" [ style = bold]
"g_stateful:0_promote_0" [ style=bold color="green" fontcolor="orange"]
"g_stateful:0_promoted_0" -> "ms_stateful_promoted_0" [ style = bold]
"g_stateful:0_promoted_0" [ style=bold color="green" fontcolor="orange"]
"g_stateful:0_running_0" -> "ms_stateful_running_0" [ style = bold]
"g_stateful:0_running_0" [ style=bold color="green" fontcolor="orange"]
"g_stateful:0_start_0" -> "g_stateful:0_running_0" [ style = bold]
"g_stateful:0_start_0" -> "p_stateful2:0_start_0 gluster01.h" [ style = bold]
"g_stateful:0_start_0" [ style=bold color="green" fontcolor="orange"]
"g_stateful:1_running_0" -> "ms_stateful_running_0" [ style = bold]
"g_stateful:1_running_0" [ style=bold color="green" fontcolor="orange"]
"g_stateful:1_start_0" -> "g_stateful:1_running_0" [ style = bold]
"g_stateful:1_start_0" -> "p_stateful2:1_start_0 gluster02.h" [ style = bold]
"g_stateful:1_start_0" [ style=bold color="green" fontcolor="orange"]
+"ipsrc2_delete_0 gluster02.h" [ style=bold color="green" fontcolor="black"]
+"iptest_delete_0 gluster02.h" [ style=bold color="green" fontcolor="black"]
"ms_stateful_confirmed-post_notify_promoted_0" -> "p_stateful1:1_monitor_10000 gluster02.h" [ style = bold]
"ms_stateful_confirmed-post_notify_promoted_0" -> "p_stateful2:1_monitor_10000 gluster02.h" [ style = bold]
"ms_stateful_confirmed-post_notify_promoted_0" [ style=bold color="green" fontcolor="orange"]
"ms_stateful_confirmed-post_notify_running_0" -> "ms_stateful_pre_notify_promote_0" [ style = bold]
"ms_stateful_confirmed-post_notify_running_0" -> "p_stateful1:1_monitor_10000 gluster02.h" [ style = bold]
"ms_stateful_confirmed-post_notify_running_0" -> "p_stateful2:1_monitor_10000 gluster02.h" [ style = bold]
"ms_stateful_confirmed-post_notify_running_0" [ style=bold color="green" fontcolor="orange"]
"ms_stateful_confirmed-pre_notify_promote_0" -> "ms_stateful_post_notify_promoted_0" [ style = bold]
"ms_stateful_confirmed-pre_notify_promote_0" -> "ms_stateful_promote_0" [ style = bold]
"ms_stateful_confirmed-pre_notify_promote_0" [ style=bold color="green" fontcolor="orange"]
"ms_stateful_confirmed-pre_notify_start_0" -> "ms_stateful_post_notify_running_0" [ style = bold]
"ms_stateful_confirmed-pre_notify_start_0" -> "ms_stateful_start_0" [ style = bold]
"ms_stateful_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange"]
"ms_stateful_post_notify_promoted_0" -> "ms_stateful_confirmed-post_notify_promoted_0" [ style = bold]
"ms_stateful_post_notify_promoted_0" -> "p_stateful1:0_post_notify_promote_0 gluster01.h" [ style = bold]
"ms_stateful_post_notify_promoted_0" -> "p_stateful1:1_post_notify_promote_0 gluster02.h" [ style = bold]
"ms_stateful_post_notify_promoted_0" -> "p_stateful2:0_post_notify_promote_0 gluster01.h" [ style = bold]
"ms_stateful_post_notify_promoted_0" -> "p_stateful2:1_post_notify_promote_0 gluster02.h" [ style = bold]
"ms_stateful_post_notify_promoted_0" [ style=bold color="green" fontcolor="orange"]
"ms_stateful_post_notify_running_0" -> "ms_stateful_confirmed-post_notify_running_0" [ style = bold]
"ms_stateful_post_notify_running_0" -> "p_stateful1:0_post_notify_start_0 gluster01.h" [ style = bold]
"ms_stateful_post_notify_running_0" -> "p_stateful1:1_post_notify_start_0 gluster02.h" [ style = bold]
"ms_stateful_post_notify_running_0" -> "p_stateful2:0_post_notify_start_0 gluster01.h" [ style = bold]
"ms_stateful_post_notify_running_0" -> "p_stateful2:1_post_notify_start_0 gluster02.h" [ style = bold]
"ms_stateful_post_notify_running_0" [ style=bold color="green" fontcolor="orange"]
"ms_stateful_pre_notify_promote_0" -> "ms_stateful_confirmed-pre_notify_promote_0" [ style = bold]
"ms_stateful_pre_notify_promote_0" -> "p_stateful1:0_pre_notify_promote_0 gluster01.h" [ style = bold]
"ms_stateful_pre_notify_promote_0" -> "p_stateful1:1_pre_notify_promote_0 gluster02.h" [ style = bold]
"ms_stateful_pre_notify_promote_0" -> "p_stateful2:0_pre_notify_promote_0 gluster01.h" [ style = bold]
"ms_stateful_pre_notify_promote_0" -> "p_stateful2:1_pre_notify_promote_0 gluster02.h" [ style = bold]
"ms_stateful_pre_notify_promote_0" [ style=bold color="green" fontcolor="orange"]
"ms_stateful_pre_notify_start_0" -> "ms_stateful_confirmed-pre_notify_start_0" [ style = bold]
"ms_stateful_pre_notify_start_0" -> "p_stateful1:0_pre_notify_start_0 gluster01.h" [ style = bold]
"ms_stateful_pre_notify_start_0" -> "p_stateful1:1_pre_notify_start_0 gluster02.h" [ style = bold]
"ms_stateful_pre_notify_start_0" [ style=bold color="green" fontcolor="orange"]
"ms_stateful_promote_0" -> "g_stateful:0_promote_0" [ style = bold]
"ms_stateful_promote_0" [ style=bold color="green" fontcolor="orange"]
"ms_stateful_promoted_0" -> "ms_stateful_post_notify_promoted_0" [ style = bold]
"ms_stateful_promoted_0" [ style=bold color="green" fontcolor="orange"]
"ms_stateful_running_0" -> "ms_stateful_post_notify_running_0" [ style = bold]
"ms_stateful_running_0" -> "ms_stateful_promote_0" [ style = bold]
"ms_stateful_running_0" [ style=bold color="green" fontcolor="orange"]
"ms_stateful_start_0" -> "g_stateful:0_start_0" [ style = bold]
"ms_stateful_start_0" -> "g_stateful:1_start_0" [ style = bold]
"ms_stateful_start_0" -> "ms_stateful_running_0" [ style = bold]
"ms_stateful_start_0" [ style=bold color="green" fontcolor="orange"]
"p_stateful1:0_post_notify_promote_0 gluster01.h" -> "ms_stateful_confirmed-post_notify_promoted_0" [ style = bold]
"p_stateful1:0_post_notify_promote_0 gluster01.h" [ style=bold color="green" fontcolor="black"]
"p_stateful1:0_post_notify_start_0 gluster01.h" -> "ms_stateful_confirmed-post_notify_running_0" [ style = bold]
"p_stateful1:0_post_notify_start_0 gluster01.h" [ style=bold color="green" fontcolor="black"]
"p_stateful1:0_pre_notify_promote_0 gluster01.h" -> "ms_stateful_confirmed-pre_notify_promote_0" [ style = bold]
"p_stateful1:0_pre_notify_promote_0 gluster01.h" [ style=bold color="green" fontcolor="black"]
"p_stateful1:0_pre_notify_start_0 gluster01.h" -> "ms_stateful_confirmed-pre_notify_start_0" [ style = bold]
"p_stateful1:0_pre_notify_start_0 gluster01.h" [ style=bold color="green" fontcolor="black"]
"p_stateful1:0_promote_0 gluster01.h" -> "g_stateful:0_promoted_0" [ style = bold]
"p_stateful1:0_promote_0 gluster01.h" -> "p_stateful2:0_promote_0 gluster01.h" [ style = bold]
"p_stateful1:0_promote_0 gluster01.h" [ style=bold color="green" fontcolor="black"]
"p_stateful1:1_monitor_10000 gluster02.h" [ style=bold color="green" fontcolor="black"]
"p_stateful1:1_post_notify_promote_0 gluster02.h" -> "ms_stateful_confirmed-post_notify_promoted_0" [ style = bold]
"p_stateful1:1_post_notify_promote_0 gluster02.h" [ style=bold color="green" fontcolor="black"]
"p_stateful1:1_post_notify_start_0 gluster02.h" -> "ms_stateful_confirmed-post_notify_running_0" [ style = bold]
"p_stateful1:1_post_notify_start_0 gluster02.h" [ style=bold color="green" fontcolor="black"]
"p_stateful1:1_pre_notify_promote_0 gluster02.h" -> "ms_stateful_confirmed-pre_notify_promote_0" [ style = bold]
"p_stateful1:1_pre_notify_promote_0 gluster02.h" [ style=bold color="green" fontcolor="black"]
"p_stateful1:1_pre_notify_start_0 gluster02.h" -> "ms_stateful_confirmed-pre_notify_start_0" [ style = bold]
"p_stateful1:1_pre_notify_start_0 gluster02.h" [ style=bold color="green" fontcolor="black"]
"p_stateful2:0_post_notify_promote_0 gluster01.h" -> "ms_stateful_confirmed-post_notify_promoted_0" [ style = bold]
"p_stateful2:0_post_notify_promote_0 gluster01.h" [ style=bold color="green" fontcolor="black"]
"p_stateful2:0_post_notify_start_0 gluster01.h" -> "ms_stateful_confirmed-post_notify_running_0" [ style = bold]
"p_stateful2:0_post_notify_start_0 gluster01.h" [ style=bold color="green" fontcolor="black"]
"p_stateful2:0_pre_notify_promote_0 gluster01.h" -> "ms_stateful_confirmed-pre_notify_promote_0" [ style = bold]
"p_stateful2:0_pre_notify_promote_0 gluster01.h" [ style=bold color="green" fontcolor="black"]
"p_stateful2:0_promote_0 gluster01.h" -> "g_stateful:0_promoted_0" [ style = bold]
"p_stateful2:0_promote_0 gluster01.h" [ style=bold color="green" fontcolor="black"]
"p_stateful2:0_start_0 gluster01.h" -> "g_stateful:0_running_0" [ style = bold]
"p_stateful2:0_start_0 gluster01.h" -> "p_stateful2:0_promote_0 gluster01.h" [ style = bold]
"p_stateful2:0_start_0 gluster01.h" [ style=bold color="green" fontcolor="black"]
"p_stateful2:1_monitor_10000 gluster02.h" [ style=bold color="green" fontcolor="black"]
"p_stateful2:1_post_notify_promote_0 gluster02.h" -> "ms_stateful_confirmed-post_notify_promoted_0" [ style = bold]
"p_stateful2:1_post_notify_promote_0 gluster02.h" [ style=bold color="green" fontcolor="black"]
"p_stateful2:1_post_notify_start_0 gluster02.h" -> "ms_stateful_confirmed-post_notify_running_0" [ style = bold]
"p_stateful2:1_post_notify_start_0 gluster02.h" [ style=bold color="green" fontcolor="black"]
"p_stateful2:1_pre_notify_promote_0 gluster02.h" -> "ms_stateful_confirmed-pre_notify_promote_0" [ style = bold]
"p_stateful2:1_pre_notify_promote_0 gluster02.h" [ style=bold color="green" fontcolor="black"]
"p_stateful2:1_start_0 gluster02.h" -> "g_stateful:1_running_0" [ style = bold]
"p_stateful2:1_start_0 gluster02.h" -> "p_stateful2:1_monitor_10000 gluster02.h" [ style = bold]
"p_stateful2:1_start_0 gluster02.h" [ style=bold color="green" fontcolor="black"]
}
diff --git a/pengine/test10/bug-5059.exp b/pengine/test10/bug-5059.exp
index 6fdbee8298..b86b87edfb 100644
--- a/pengine/test10/bug-5059.exp
+++ b/pengine/test10/bug-5059.exp
@@ -1,556 +1,574 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pengine/test10/bug-5059.summary b/pengine/test10/bug-5059.summary
index 25a013f528..b854e43563 100644
--- a/pengine/test10/bug-5059.summary
+++ b/pengine/test10/bug-5059.summary
@@ -1,73 +1,75 @@
Current cluster status:
Node gluster03.h: standby
Online: [ gluster01.h gluster02.h ]
OFFLINE: [ gluster04.h ]
Master/Slave Set: ms_stateful [g_stateful]
Resource Group: g_stateful:0
p_stateful1:0 (ocf::pacemaker:Stateful): Started gluster01.h
p_stateful2:0 (ocf::pacemaker:Stateful): Stopped
Resource Group: g_stateful:1
p_stateful1:1 (ocf::pacemaker:Stateful): Started gluster02.h
p_stateful2:1 (ocf::pacemaker:Stateful): Stopped
Clone Set: c_dummy [p_dummy1]
Started: [ gluster01.h gluster02.h ]
Transition Summary:
* Promote p_stateful1:0 (Slave -> Master gluster01.h)
* Start p_stateful2:0 (gluster01.h)
* Promote p_stateful2:0 (Stopped -> Master gluster01.h)
* Start p_stateful2:1 (gluster02.h)
Executing cluster transition:
* Pseudo action: ms_stateful_pre_notify_start_0
+ * Resource action: iptest delete on gluster02.h
+ * Resource action: ipsrc2 delete on gluster02.h
* Resource action: p_stateful1:0 notify on gluster01.h
* Resource action: p_stateful1:1 notify on gluster02.h
* Pseudo action: ms_stateful_confirmed-pre_notify_start_0
* Pseudo action: ms_stateful_start_0
* Pseudo action: g_stateful:0_start_0
* Resource action: p_stateful2:0 start on gluster01.h
* Pseudo action: g_stateful:1_start_0
* Resource action: p_stateful2:1 start on gluster02.h
* Pseudo action: g_stateful:0_running_0
* Pseudo action: g_stateful:1_running_0
* Pseudo action: ms_stateful_running_0
* Pseudo action: ms_stateful_post_notify_running_0
* Resource action: p_stateful1:0 notify on gluster01.h
* Resource action: p_stateful2:0 notify on gluster01.h
* Resource action: p_stateful1:1 notify on gluster02.h
* Resource action: p_stateful2:1 notify on gluster02.h
* Pseudo action: ms_stateful_confirmed-post_notify_running_0
* Pseudo action: ms_stateful_pre_notify_promote_0
* Resource action: p_stateful1:0 notify on gluster01.h
* Resource action: p_stateful2:0 notify on gluster01.h
* Resource action: p_stateful1:1 notify on gluster02.h
* Resource action: p_stateful2:1 notify on gluster02.h
* Pseudo action: ms_stateful_confirmed-pre_notify_promote_0
* Pseudo action: ms_stateful_promote_0
* Pseudo action: g_stateful:0_promote_0
* Resource action: p_stateful1:0 promote on gluster01.h
* Resource action: p_stateful2:0 promote on gluster01.h
* Pseudo action: g_stateful:0_promoted_0
* Pseudo action: ms_stateful_promoted_0
* Pseudo action: ms_stateful_post_notify_promoted_0
* Resource action: p_stateful1:0 notify on gluster01.h
* Resource action: p_stateful2:0 notify on gluster01.h
* Resource action: p_stateful1:1 notify on gluster02.h
* Resource action: p_stateful2:1 notify on gluster02.h
* Pseudo action: ms_stateful_confirmed-post_notify_promoted_0
* Resource action: p_stateful1:1 monitor=10000 on gluster02.h
* Resource action: p_stateful2:1 monitor=10000 on gluster02.h
Revised cluster status:
Node gluster03.h: standby
Online: [ gluster01.h gluster02.h ]
OFFLINE: [ gluster04.h ]
Master/Slave Set: ms_stateful [g_stateful]
Masters: [ gluster01.h ]
Slaves: [ gluster02.h ]
Clone Set: c_dummy [p_dummy1]
Started: [ gluster01.h gluster02.h ]
diff --git a/pengine/test10/bug-lf-2361.dot b/pengine/test10/bug-lf-2361.dot
index db5da1b24f..60309150fd 100644
--- a/pengine/test10/bug-lf-2361.dot
+++ b/pengine/test10/bug-lf-2361.dot
@@ -1,35 +1,40 @@
digraph "g" {
"cl_dummy2_running_0" [ style=dashed color="red" fontcolor="orange" ]
"cl_dummy2_start_0" -> "cl_dummy2_running_0" [ style = dashed]
"cl_dummy2_start_0" -> "dummy2:0_start_0 alice.demo" [ style = dashed]
"cl_dummy2_start_0" -> "dummy2:1_start_0 bob.demo" [ style = dashed]
"cl_dummy2_start_0" [ style=dashed color="red" fontcolor="orange" ]
"dummy2:0_start_0 alice.demo" -> "cl_dummy2_running_0" [ style = dashed]
"dummy2:0_start_0 alice.demo" [ style=dashed color="red" fontcolor="black" ]
"dummy2:1_start_0 bob.demo" -> "cl_dummy2_running_0" [ style = dashed]
"dummy2:1_start_0 bob.demo" [ style=dashed color="red" fontcolor="black" ]
"ms_stateful_confirmed-post_notify_running_0" [ style=bold color="green" fontcolor="orange" ]
"ms_stateful_confirmed-pre_notify_start_0" -> "ms_stateful_post_notify_running_0" [ style = bold]
"ms_stateful_confirmed-pre_notify_start_0" -> "ms_stateful_start_0" [ style = bold]
"ms_stateful_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ]
"ms_stateful_post_notify_running_0" -> "ms_stateful_confirmed-post_notify_running_0" [ style = bold]
"ms_stateful_post_notify_running_0" -> "stateful:0_post_notify_start_0 alice.demo" [ style = bold]
"ms_stateful_post_notify_running_0" -> "stateful:1_post_notify_start_0 bob.demo" [ style = bold]
"ms_stateful_post_notify_running_0" [ style=bold color="green" fontcolor="orange" ]
"ms_stateful_pre_notify_start_0" -> "ms_stateful_confirmed-pre_notify_start_0" [ style = bold]
"ms_stateful_pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ]
"ms_stateful_running_0" -> "ms_stateful_post_notify_running_0" [ style = bold]
"ms_stateful_running_0" [ style=bold color="green" fontcolor="orange" ]
"ms_stateful_start_0" -> "ms_stateful_running_0" [ style = bold]
"ms_stateful_start_0" -> "stateful:0_start_0 alice.demo" [ style = bold]
"ms_stateful_start_0" -> "stateful:1_start_0 bob.demo" [ style = bold]
"ms_stateful_start_0" [ style=bold color="green" fontcolor="orange" ]
+"service1_delete_0 alice.demo" [ style=bold color="green" fontcolor="black"]
+"service1_delete_0 bob.demo" [ style=bold color="green" fontcolor="black"]
+"service2:0_delete_0 alice.demo" [ style=bold color="green" fontcolor="black"]
+"service2:0_delete_0 bob.demo" [ style=bold color="green" fontcolor="black"]
+"service2:1_delete_0 bob.demo" [ style=bold color="green" fontcolor="black"]
"stateful:0_post_notify_start_0 alice.demo" -> "ms_stateful_confirmed-post_notify_running_0" [ style = bold]
"stateful:0_post_notify_start_0 alice.demo" [ style=bold color="green" fontcolor="black" ]
"stateful:0_start_0 alice.demo" -> "ms_stateful_running_0" [ style = bold]
"stateful:0_start_0 alice.demo" [ style=bold color="green" fontcolor="black" ]
"stateful:1_post_notify_start_0 bob.demo" -> "ms_stateful_confirmed-post_notify_running_0" [ style = bold]
"stateful:1_post_notify_start_0 bob.demo" [ style=bold color="green" fontcolor="black" ]
"stateful:1_start_0 bob.demo" -> "ms_stateful_running_0" [ style = bold]
"stateful:1_start_0 bob.demo" [ style=bold color="green" fontcolor="black" ]
}
diff --git a/pengine/test10/bug-lf-2361.exp b/pengine/test10/bug-lf-2361.exp
index 60f0d7e828..cba44887a1 100644
--- a/pengine/test10/bug-lf-2361.exp
+++ b/pengine/test10/bug-lf-2361.exp
@@ -1,138 +1,183 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pengine/test10/bug-lf-2361.summary b/pengine/test10/bug-lf-2361.summary
index 338f3e26ec..fd48ba98e3 100644
--- a/pengine/test10/bug-lf-2361.summary
+++ b/pengine/test10/bug-lf-2361.summary
@@ -1,37 +1,42 @@
Current cluster status:
Online: [ alice.demo bob.demo ]
dummy1 (ocf::heartbeat:Dummy): Stopped
Master/Slave Set: ms_stateful [stateful]
Stopped: [ stateful:0 stateful:1 ]
Clone Set: cl_dummy2 [dummy2]
Stopped: [ dummy2:0 dummy2:1 ]
Transition Summary:
* Start stateful:0 (alice.demo)
* Start stateful:1 (bob.demo)
* Start dummy2:0 (alice.demo - blocked)
* Start dummy2:1 (bob.demo - blocked)
Executing cluster transition:
* Pseudo action: ms_stateful_pre_notify_start_0
+ * Resource action: service2:0 delete on alice.demo
+ * Resource action: service2:0 delete on bob.demo
+ * Resource action: service2:1 delete on bob.demo
+ * Resource action: service1 delete on alice.demo
+ * Resource action: service1 delete on bob.demo
* Pseudo action: ms_stateful_confirmed-pre_notify_start_0
* Pseudo action: ms_stateful_start_0
* Resource action: stateful:0 start on alice.demo
* Resource action: stateful:1 start on bob.demo
* Pseudo action: ms_stateful_running_0
* Pseudo action: ms_stateful_post_notify_running_0
* Resource action: stateful:0 notify on alice.demo
* Resource action: stateful:1 notify on bob.demo
* Pseudo action: ms_stateful_confirmed-post_notify_running_0
Revised cluster status:
Online: [ alice.demo bob.demo ]
dummy1 (ocf::heartbeat:Dummy): Stopped
Master/Slave Set: ms_stateful [stateful]
Slaves: [ alice.demo bob.demo ]
Clone Set: cl_dummy2 [dummy2]
Stopped: [ dummy2:0 dummy2:1 ]
diff --git a/pengine/test10/bug-lf-2493.dot b/pengine/test10/bug-lf-2493.dot
index b1084c7e16..708eadd71d 100644
--- a/pengine/test10/bug-lf-2493.dot
+++ b/pengine/test10/bug-lf-2493.dot
@@ -1,7 +1,38 @@
digraph "g" {
"p_dummy2_start_0 hpn08" -> "p_dummy4_start_0 hpn07" [ style = bold]
"p_dummy2_start_0 hpn08" [ style=bold color="green" fontcolor="black" ]
"p_dummy3_start_0 hpn08" -> "p_dummy4_start_0 hpn07" [ style = bold]
"p_dummy3_start_0 hpn08" [ style=bold color="green" fontcolor="black" ]
"p_dummy4_start_0 hpn07" [ style=bold color="green" fontcolor="black" ]
+"res_Filesystem_nfs_fs1_delete_0 hpn07" [ style=bold color="green" fontcolor="black"]
+"res_Filesystem_nfs_fs1_delete_0 hpn08" [ style=bold color="green" fontcolor="black"]
+"res_Filesystem_nfs_fs2_delete_0 hpn07" [ style=bold color="green" fontcolor="black"]
+"res_Filesystem_nfs_fs2_delete_0 hpn08" [ style=bold color="green" fontcolor="black"]
+"res_Filesystem_nfs_fs3_delete_0 hpn07" [ style=bold color="green" fontcolor="black"]
+"res_Filesystem_nfs_fs3_delete_0 hpn08" [ style=bold color="green" fontcolor="black"]
+"res_Filesystem_sap_ci_delete_0 hpn07" [ style=bold color="green" fontcolor="black"]
+"res_Filesystem_sap_ci_delete_0 hpn08" [ style=bold color="green" fontcolor="black"]
+"res_Filesystem_sap_db_delete_0 hpn07" [ style=bold color="green" fontcolor="black"]
+"res_Filesystem_sap_db_delete_0 hpn08" [ style=bold color="green" fontcolor="black"]
+"res_IPaddr2_nfs_delete_0 hpn07" [ style=bold color="green" fontcolor="black"]
+"res_IPaddr2_nfs_delete_0 hpn08" [ style=bold color="green" fontcolor="black"]
+"res_LVM_nfs_delete_0 hpn07" [ style=bold color="green" fontcolor="black"]
+"res_LVM_nfs_delete_0 hpn08" [ style=bold color="green" fontcolor="black"]
+"res_LVM_p_vg-sap_delete_0 hpn07" [ style=bold color="green" fontcolor="black"]
+"res_LVM_p_vg-sap_delete_0 hpn08" [ style=bold color="green" fontcolor="black"]
+"res_drbd_hpn78:0_delete_0 hpn07" [ style=bold color="green" fontcolor="black"]
+"res_drbd_hpn78:0_delete_0 hpn08" [ style=bold color="green" fontcolor="black"]
+"res_drbd_hpn78:1_delete_0 hpn08" [ style=bold color="green" fontcolor="black"]
+"res_drbd_nfs:0_delete_0 hpn07" [ style=bold color="green" fontcolor="black"]
+"res_drbd_nfs:0_delete_0 hpn08" [ style=bold color="green" fontcolor="black"]
+"res_drbd_nfs:1_delete_0 hpn07" [ style=bold color="green" fontcolor="black"]
+"res_drbd_nfs:1_delete_0 hpn08" [ style=bold color="green" fontcolor="black"]
+"res_exportfs_fs1_delete_0 hpn07" [ style=bold color="green" fontcolor="black"]
+"res_exportfs_fs1_delete_0 hpn08" [ style=bold color="green" fontcolor="black"]
+"res_exportfs_fs2_delete_0 hpn07" [ style=bold color="green" fontcolor="black"]
+"res_exportfs_fs2_delete_0 hpn08" [ style=bold color="green" fontcolor="black"]
+"res_exportfs_fs3_delete_0 hpn07" [ style=bold color="green" fontcolor="black"]
+"res_exportfs_fs3_delete_0 hpn08" [ style=bold color="green" fontcolor="black"]
+"res_exportfs_rootfs:0_delete_0 hpn07" [ style=bold color="green" fontcolor="black"]
+"res_exportfs_rootfs:1_delete_0 hpn08" [ style=bold color="green" fontcolor="black"]
}
diff --git a/pengine/test10/bug-lf-2493.exp b/pengine/test10/bug-lf-2493.exp
index 3d1faa85e1..6c1e267dcb 100644
--- a/pengine/test10/bug-lf-2493.exp
+++ b/pengine/test10/bug-lf-2493.exp
@@ -1,37 +1,316 @@
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pengine/test10/bug-lf-2493.summary b/pengine/test10/bug-lf-2493.summary
index 874146c889..6b61b1c716 100644
--- a/pengine/test10/bug-lf-2493.summary
+++ b/pengine/test10/bug-lf-2493.summary
@@ -1,33 +1,64 @@
Current cluster status:
Online: [ hpn07 hpn08 ]
p_dummy1 (ocf::pacemaker:Dummy): Started hpn07
p_dummy2 (ocf::pacemaker:Dummy): Stopped
p_dummy4 (ocf::pacemaker:Dummy): Stopped
p_dummy3 (ocf::pacemaker:Dummy): Stopped
Master/Slave Set: ms_stateful1 [p_stateful1]
Masters: [ hpn07 ]
Slaves: [ hpn08 ]
Transition Summary:
* Start p_dummy2 (hpn08)
* Start p_dummy4 (hpn07)
* Start p_dummy3 (hpn08)
Executing cluster transition:
* Resource action: p_dummy2 start on hpn08
* Resource action: p_dummy3 start on hpn08
+ * Resource action: res_Filesystem_nfs_fs1 delete on hpn08
+ * Resource action: res_Filesystem_nfs_fs1 delete on hpn07
+ * Resource action: res_drbd_nfs:0 delete on hpn08
+ * Resource action: res_drbd_nfs:0 delete on hpn07
+ * Resource action: res_Filesystem_nfs_fs2 delete on hpn08
+ * Resource action: res_Filesystem_nfs_fs2 delete on hpn07
+ * Resource action: res_Filesystem_nfs_fs3 delete on hpn08
+ * Resource action: res_Filesystem_nfs_fs3 delete on hpn07
+ * Resource action: res_exportfs_fs1 delete on hpn08
+ * Resource action: res_exportfs_fs1 delete on hpn07
+ * Resource action: res_exportfs_fs2 delete on hpn08
+ * Resource action: res_exportfs_fs2 delete on hpn07
+ * Resource action: res_exportfs_fs3 delete on hpn08
+ * Resource action: res_exportfs_fs3 delete on hpn07
+ * Resource action: res_drbd_nfs:1 delete on hpn08
+ * Resource action: res_drbd_nfs:1 delete on hpn07
+ * Resource action: res_LVM_nfs delete on hpn08
+ * Resource action: res_LVM_nfs delete on hpn07
+ * Resource action: res_LVM_p_vg-sap delete on hpn08
+ * Resource action: res_LVM_p_vg-sap delete on hpn07
+ * Resource action: res_exportfs_rootfs:0 delete on hpn07
+ * Resource action: res_IPaddr2_nfs delete on hpn08
+ * Resource action: res_IPaddr2_nfs delete on hpn07
+ * Resource action: res_drbd_hpn78:0 delete on hpn08
+ * Resource action: res_drbd_hpn78:0 delete on hpn07
+ * Resource action: res_Filesystem_sap_db delete on hpn08
+ * Resource action: res_Filesystem_sap_db delete on hpn07
+ * Resource action: res_Filesystem_sap_ci delete on hpn08
+ * Resource action: res_Filesystem_sap_ci delete on hpn07
+ * Resource action: res_exportfs_rootfs:1 delete on hpn08
+ * Resource action: res_drbd_hpn78:1 delete on hpn08
* Resource action: p_dummy4 start on hpn07
Revised cluster status:
Online: [ hpn07 hpn08 ]
p_dummy1 (ocf::pacemaker:Dummy): Started hpn07
p_dummy2 (ocf::pacemaker:Dummy): Started hpn08
p_dummy4 (ocf::pacemaker:Dummy): Started hpn07
p_dummy3 (ocf::pacemaker:Dummy): Started hpn08
Master/Slave Set: ms_stateful1 [p_stateful1]
Masters: [ hpn07 ]
Slaves: [ hpn08 ]
diff --git a/pengine/test10/clone-anon-dup.dot b/pengine/test10/clone-anon-dup.dot
index 85c7fcc6e4..342ad3ac53 100644
--- a/pengine/test10/clone-anon-dup.dot
+++ b/pengine/test10/clone-anon-dup.dot
@@ -1,31 +1,37 @@
digraph "g" {
"all_stopped" [ style=bold color="green" fontcolor="orange" ]
+"apache2:0_delete_0 wc01" [ style=bold color="green" fontcolor="black"]
+"apache2:0_delete_0 wc02" [ style=bold color="green" fontcolor="black"]
+"apache2:0_delete_0 wc03" [ style=bold color="green" fontcolor="black"]
"apache2:0_stop_0 wc02" -> "all_stopped" [ style = bold]
+"apache2:0_stop_0 wc02" -> "apache2:0_delete_0 wc01" [ style = bold]
+"apache2:0_stop_0 wc02" -> "apache2:0_delete_0 wc02" [ style = bold]
+"apache2:0_stop_0 wc02" -> "apache2:0_delete_0 wc03" [ style = bold]
"apache2:0_stop_0 wc02" -> "group_webservice:2_stopped_0" [ style = bold]
"apache2:0_stop_0 wc02" [ style=bold color="green" fontcolor="black"]
"clone_webservice_stop_0" -> "clone_webservice_stopped_0" [ style = bold]
"clone_webservice_stop_0" -> "group_webservice:2_stop_0" [ style = bold]
"clone_webservice_stop_0" [ style=bold color="green" fontcolor="orange" ]
"clone_webservice_stopped_0" [ style=bold color="green" fontcolor="orange" ]
"group_webservice:2_stop_0" -> "apache2:0_stop_0 wc02" [ style = bold]
"group_webservice:2_stop_0" -> "group_webservice:2_stopped_0" [ style = bold]
"group_webservice:2_stop_0" [ style=bold color="green" fontcolor="orange" ]
"group_webservice:2_stopped_0" -> "clone_webservice_stopped_0" [ style = bold]
"group_webservice:2_stopped_0" [ style=bold color="green" fontcolor="orange" ]
"probe_complete wc01" -> "probe_complete" [ style = bold]
"probe_complete wc01" [ style=bold color="green" fontcolor="black" ]
"probe_complete wc02" -> "probe_complete" [ style = bold]
"probe_complete wc02" [ style=bold color="green" fontcolor="black" ]
"probe_complete wc03" -> "probe_complete" [ style = bold]
"probe_complete wc03" [ style=bold color="green" fontcolor="black" ]
"probe_complete" -> "apache2:0_stop_0 wc02" [ style = bold]
"probe_complete" -> "stonith-1_start_0 wc01" [ style = bold]
"probe_complete" [ style=bold color="green" fontcolor="orange" ]
"stonith-1_monitor_0 wc01" -> "probe_complete wc01" [ style = bold]
"stonith-1_monitor_0 wc01" [ style=bold color="green" fontcolor="black" ]
"stonith-1_monitor_0 wc02" -> "probe_complete wc02" [ style = bold]
"stonith-1_monitor_0 wc02" [ style=bold color="green" fontcolor="black" ]
"stonith-1_monitor_0 wc03" -> "probe_complete wc03" [ style = bold]
"stonith-1_monitor_0 wc03" [ style=bold color="green" fontcolor="black" ]
"stonith-1_start_0 wc01" [ style=bold color="green" fontcolor="black" ]
}
diff --git a/pengine/test10/clone-anon-dup.exp b/pengine/test10/clone-anon-dup.exp
index 69ed601c37..e06b55af7e 100644
--- a/pengine/test10/clone-anon-dup.exp
+++ b/pengine/test10/clone-anon-dup.exp
@@ -1,175 +1,214 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/clone-anon-dup.summary b/pengine/test10/clone-anon-dup.summary
index 0bb2f1b7df..ed127c38d3 100644
--- a/pengine/test10/clone-anon-dup.summary
+++ b/pengine/test10/clone-anon-dup.summary
@@ -1,35 +1,38 @@
Current cluster status:
Online: [ wc01 wc02 wc03 ]
stonith-1 (stonith:dummy): Stopped
Clone Set: clone_webservice [group_webservice]
Resource Group: group_webservice:2
fs_www:2 (ocf::heartbeat:Filesystem): ORPHANED Stopped
apache2:2 (ocf::heartbeat:apache): ORPHANED Started wc02
Started: [ wc01 wc02 ]
Transition Summary:
* Start stonith-1 (wc01)
* Stop apache2:2 (wc02)
Executing cluster transition:
* Resource action: stonith-1 monitor on wc03
* Resource action: stonith-1 monitor on wc02
* Resource action: stonith-1 monitor on wc01
* Pseudo action: clone_webservice_stop_0
* Pseudo action: probe_complete
* Resource action: stonith-1 start on wc01
* Pseudo action: group_webservice:2_stop_0
* Resource action: apache2:0 stop on wc02
+ * Resource action: apache2:0 delete on wc03
+ * Resource action: apache2:0 delete on wc01
+ * Resource action: apache2:0 delete on wc02
* Pseudo action: all_stopped
* Pseudo action: group_webservice:2_stopped_0
* Pseudo action: clone_webservice_stopped_0
Revised cluster status:
Online: [ wc01 wc02 wc03 ]
stonith-1 (stonith:dummy): Started wc01
Clone Set: clone_webservice [group_webservice]
Started: [ wc01 wc02 ]
diff --git a/pengine/test10/clone-max-zero.dot b/pengine/test10/clone-max-zero.dot
index 33cec0a502..f4d11bdb03 100644
--- a/pengine/test10/clone-max-zero.dot
+++ b/pengine/test10/clone-max-zero.dot
@@ -1,42 +1,50 @@
digraph "g" {
"all_stopped" [ style=bold color="green" fontcolor="orange" ]
"c-ocfs2-1_stop_0" -> "c-ocfs2-1_stopped_0" [ style = bold]
"c-ocfs2-1_stop_0" -> "ocfs2-1:0_stop_0 c001n11" [ style = bold]
"c-ocfs2-1_stop_0" -> "ocfs2-1:1_stop_0 c001n12" [ style = bold]
"c-ocfs2-1_stop_0" [ style=bold color="green" fontcolor="orange" ]
"c-ocfs2-1_stopped_0" -> "o2cb-clone_stop_0" [ style = bold]
"c-ocfs2-1_stopped_0" [ style=bold color="green" fontcolor="orange" ]
"dlm-clone_stop_0" -> "dlm-clone_stopped_0" [ style = bold]
"dlm-clone_stop_0" -> "dlm:0_stop_0 c001n11" [ style = bold]
"dlm-clone_stop_0" -> "dlm:1_stop_0 c001n12" [ style = bold]
"dlm-clone_stop_0" [ style=bold color="green" fontcolor="orange" ]
"dlm-clone_stopped_0" [ style=bold color="green" fontcolor="orange" ]
+"dlm:0_delete_0 c001n11" [ style=bold color="green" fontcolor="black"]
+"dlm:0_delete_0 c001n12" [ style=bold color="green" fontcolor="black"]
"dlm:0_stop_0 c001n11" -> "all_stopped" [ style = bold]
"dlm:0_stop_0 c001n11" -> "dlm-clone_stopped_0" [ style = bold]
+"dlm:0_stop_0 c001n11" -> "dlm:0_delete_0 c001n11" [ style = bold]
+"dlm:0_stop_0 c001n11" -> "dlm:0_delete_0 c001n12" [ style = bold]
"dlm:0_stop_0 c001n11" [ style=bold color="green" fontcolor="black"]
+"dlm:1_delete_0 c001n11" [ style=bold color="green" fontcolor="black"]
+"dlm:1_delete_0 c001n12" [ style=bold color="green" fontcolor="black"]
"dlm:1_stop_0 c001n12" -> "all_stopped" [ style = bold]
"dlm:1_stop_0 c001n12" -> "dlm-clone_stopped_0" [ style = bold]
+"dlm:1_stop_0 c001n12" -> "dlm:1_delete_0 c001n11" [ style = bold]
+"dlm:1_stop_0 c001n12" -> "dlm:1_delete_0 c001n12" [ style = bold]
"dlm:1_stop_0 c001n12" [ style=bold color="green" fontcolor="black"]
"o2cb-clone_stop_0" -> "o2cb-clone_stopped_0" [ style = bold]
"o2cb-clone_stop_0" -> "o2cb:0_stop_0 c001n11" [ style = bold]
"o2cb-clone_stop_0" -> "o2cb:1_stop_0 c001n12" [ style = bold]
"o2cb-clone_stop_0" [ style=bold color="green" fontcolor="orange" ]
"o2cb-clone_stopped_0" -> "dlm-clone_stop_0" [ style = bold]
"o2cb-clone_stopped_0" [ style=bold color="green" fontcolor="orange" ]
"o2cb:0_stop_0 c001n11" -> "all_stopped" [ style = bold]
"o2cb:0_stop_0 c001n11" -> "dlm:0_stop_0 c001n11" [ style = bold]
"o2cb:0_stop_0 c001n11" -> "o2cb-clone_stopped_0" [ style = bold]
"o2cb:0_stop_0 c001n11" [ style=bold color="green" fontcolor="black" ]
"o2cb:1_stop_0 c001n12" -> "all_stopped" [ style = bold]
"o2cb:1_stop_0 c001n12" -> "dlm:1_stop_0 c001n12" [ style = bold]
"o2cb:1_stop_0 c001n12" -> "o2cb-clone_stopped_0" [ style = bold]
"o2cb:1_stop_0 c001n12" [ style=bold color="green" fontcolor="black" ]
"ocfs2-1:0_stop_0 c001n11" -> "all_stopped" [ style = bold]
"ocfs2-1:0_stop_0 c001n11" -> "c-ocfs2-1_stopped_0" [ style = bold]
"ocfs2-1:0_stop_0 c001n11" -> "o2cb:0_stop_0 c001n11" [ style = bold]
"ocfs2-1:0_stop_0 c001n11" [ style=bold color="green" fontcolor="black" ]
"ocfs2-1:1_stop_0 c001n12" -> "all_stopped" [ style = bold]
"ocfs2-1:1_stop_0 c001n12" -> "c-ocfs2-1_stopped_0" [ style = bold]
"ocfs2-1:1_stop_0 c001n12" -> "o2cb:1_stop_0 c001n12" [ style = bold]
"ocfs2-1:1_stop_0 c001n12" [ style=bold color="green" fontcolor="black" ]
}
diff --git a/pengine/test10/clone-max-zero.exp b/pengine/test10/clone-max-zero.exp
index d071c4b09b..274c117a9c 100644
--- a/pengine/test10/clone-max-zero.exp
+++ b/pengine/test10/clone-max-zero.exp
@@ -1,206 +1,258 @@
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/clone-max-zero.summary b/pengine/test10/clone-max-zero.summary
index 0e97f2cb36..2a0b498816 100644
--- a/pengine/test10/clone-max-zero.summary
+++ b/pengine/test10/clone-max-zero.summary
@@ -1,50 +1,54 @@
Current cluster status:
Online: [ c001n11 c001n12 ]
fencing (stonith:external/ssh): Started c001n11
Clone Set: dlm-clone [dlm]
dlm:0 (ocf::pacemaker:controld): ORPHANED Started c001n12
dlm:1 (ocf::pacemaker:controld): ORPHANED Started c001n11
Clone Set: o2cb-clone [o2cb]
Started: [ c001n11 c001n12 ]
Clone Set: clone-drbd0 [drbd0]
Started: [ c001n11 c001n12 ]
Clone Set: c-ocfs2-1 [ocfs2-1]
Started: [ c001n11 c001n12 ]
Transition Summary:
* Stop dlm:0 (c001n12)
* Stop dlm:1 (c001n11)
* Stop o2cb:0 (c001n12)
* Stop o2cb:1 (c001n11)
* Stop ocfs2-1:0 (c001n12)
* Stop ocfs2-1:1 (c001n11)
Executing cluster transition:
* Pseudo action: c-ocfs2-1_stop_0
* Resource action: ocfs2-1:1 stop on c001n12
* Resource action: ocfs2-1:0 stop on c001n11
* Pseudo action: c-ocfs2-1_stopped_0
* Pseudo action: o2cb-clone_stop_0
* Resource action: o2cb:1 stop on c001n12
* Resource action: o2cb:0 stop on c001n11
* Pseudo action: o2cb-clone_stopped_0
* Pseudo action: dlm-clone_stop_0
* Resource action: dlm:1 stop on c001n12
+ * Resource action: dlm:1 delete on c001n11
+ * Resource action: dlm:1 delete on c001n12
* Resource action: dlm:0 stop on c001n11
+ * Resource action: dlm:0 delete on c001n11
+ * Resource action: dlm:0 delete on c001n12
* Pseudo action: dlm-clone_stopped_0
* Pseudo action: all_stopped
Revised cluster status:
Online: [ c001n11 c001n12 ]
fencing (stonith:external/ssh): Started c001n11
Clone Set: dlm-clone [dlm]
Clone Set: o2cb-clone [o2cb]
Stopped: [ o2cb:0 o2cb:1 ]
Clone Set: clone-drbd0 [drbd0]
Started: [ c001n11 c001n12 ]
Clone Set: c-ocfs2-1 [ocfs2-1]
Stopped: [ ocfs2-1:0 ocfs2-1:1 ]
diff --git a/pengine/test10/cloned-group.dot b/pengine/test10/cloned-group.dot
index cf6ec27af4..0d71821f82 100644
--- a/pengine/test10/cloned-group.dot
+++ b/pengine/test10/cloned-group.dot
@@ -1,57 +1,61 @@
digraph "g" {
"all_stopped" [ style=bold color="green" fontcolor="orange" ]
+"apache2:0_delete_0 webcluster01" [ style=bold color="green" fontcolor="black"]
"apache2:0_stop_0 webcluster01" -> "all_stopped" [ style = bold]
+"apache2:0_stop_0 webcluster01" -> "apache2:0_delete_0 webcluster01" [ style = bold]
"apache2:0_stop_0 webcluster01" -> "grrr:2_stopped_0" [ style = bold]
"apache2:0_stop_0 webcluster01" [ style=bold color="green" fontcolor="black"]
"apache2:1_monitor_10000 webcluster01" [ style=bold color="green" fontcolor="black" ]
"apache2:1_start_0 webcluster01" -> "apache2:1_monitor_10000 webcluster01" [ style = bold]
"apache2:1_start_0 webcluster01" -> "grrr:0_running_0" [ style = bold]
"apache2:1_start_0 webcluster01" -> "mysql-proxy:1_start_0 webcluster01" [ style = bold]
"apache2:1_start_0 webcluster01" [ style=bold color="green" fontcolor="black" ]
"apache2:1_stop_0 webcluster01" -> "all_stopped" [ style = bold]
"apache2:1_stop_0 webcluster01" -> "apache2:1_start_0 webcluster01" [ style = bold]
"apache2:1_stop_0 webcluster01" -> "grrr:0_stopped_0" [ style = bold]
"apache2:1_stop_0 webcluster01" [ style=bold color="green" fontcolor="black" ]
"apache2_clone_running_0" [ style=bold color="green" fontcolor="orange" ]
"apache2_clone_start_0" -> "apache2_clone_running_0" [ style = bold]
"apache2_clone_start_0" -> "grrr:0_start_0" [ style = bold]
"apache2_clone_start_0" [ style=bold color="green" fontcolor="orange" ]
"apache2_clone_stop_0" -> "apache2_clone_stopped_0" [ style = bold]
"apache2_clone_stop_0" -> "grrr:0_stop_0" [ style = bold]
"apache2_clone_stop_0" -> "grrr:2_stop_0" [ style = bold]
"apache2_clone_stop_0" [ style=bold color="green" fontcolor="orange" ]
"apache2_clone_stopped_0" -> "apache2_clone_start_0" [ style = bold]
"apache2_clone_stopped_0" [ style=bold color="green" fontcolor="orange" ]
"grrr:0_running_0" -> "apache2_clone_running_0" [ style = bold]
"grrr:0_running_0" [ style=bold color="green" fontcolor="orange"]
"grrr:0_start_0" -> "apache2:1_start_0 webcluster01" [ style = bold]
"grrr:0_start_0" -> "grrr:0_running_0" [ style = bold]
"grrr:0_start_0" -> "mysql-proxy:1_start_0 webcluster01" [ style = bold]
"grrr:0_start_0" [ style=bold color="green" fontcolor="orange"]
"grrr:0_stop_0" -> "apache2:1_stop_0 webcluster01" [ style = bold]
"grrr:0_stop_0" -> "grrr:0_stopped_0" [ style = bold]
"grrr:0_stop_0" -> "mysql-proxy:1_stop_0 webcluster01" [ style = bold]
"grrr:0_stop_0" [ style=bold color="green" fontcolor="orange"]
"grrr:0_stopped_0" -> "apache2_clone_stopped_0" [ style = bold]
"grrr:0_stopped_0" -> "grrr:0_start_0" [ style = bold]
"grrr:0_stopped_0" [ style=bold color="green" fontcolor="orange"]
"grrr:2_stop_0" -> "apache2:0_stop_0 webcluster01" [ style = bold]
"grrr:2_stop_0" -> "grrr:2_stopped_0" [ style = bold]
"grrr:2_stop_0" -> "mysql-proxy:0_stop_0 webcluster01" [ style = bold]
"grrr:2_stop_0" [ style=bold color="green" fontcolor="orange" ]
"grrr:2_stopped_0" -> "apache2_clone_stopped_0" [ style = bold]
"grrr:2_stopped_0" [ style=bold color="green" fontcolor="orange" ]
+"mysql-proxy:0_delete_0 webcluster01" [ style=bold color="green" fontcolor="black"]
"mysql-proxy:0_stop_0 webcluster01" -> "all_stopped" [ style = bold]
"mysql-proxy:0_stop_0 webcluster01" -> "apache2:0_stop_0 webcluster01" [ style = bold]
"mysql-proxy:0_stop_0 webcluster01" -> "grrr:2_stopped_0" [ style = bold]
+"mysql-proxy:0_stop_0 webcluster01" -> "mysql-proxy:0_delete_0 webcluster01" [ style = bold]
"mysql-proxy:0_stop_0 webcluster01" [ style=bold color="green" fontcolor="black"]
"mysql-proxy:1_monitor_10000 webcluster01" [ style=bold color="green" fontcolor="black" ]
"mysql-proxy:1_start_0 webcluster01" -> "grrr:0_running_0" [ style = bold]
"mysql-proxy:1_start_0 webcluster01" -> "mysql-proxy:1_monitor_10000 webcluster01" [ style = bold]
"mysql-proxy:1_start_0 webcluster01" [ style=bold color="green" fontcolor="black" ]
"mysql-proxy:1_stop_0 webcluster01" -> "all_stopped" [ style = bold]
"mysql-proxy:1_stop_0 webcluster01" -> "apache2:1_stop_0 webcluster01" [ style = bold]
"mysql-proxy:1_stop_0 webcluster01" -> "grrr:0_stopped_0" [ style = bold]
"mysql-proxy:1_stop_0 webcluster01" -> "mysql-proxy:1_start_0 webcluster01" [ style = bold]
"mysql-proxy:1_stop_0 webcluster01" [ style=bold color="green" fontcolor="black" ]
}
diff --git a/pengine/test10/cloned-group.exp b/pengine/test10/cloned-group.exp
index 102bdddfcb..0a833b8884 100644
--- a/pengine/test10/cloned-group.exp
+++ b/pengine/test10/cloned-group.exp
@@ -1,289 +1,315 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/cloned-group.summary b/pengine/test10/cloned-group.summary
index 846f315e2c..1ec8e79641 100644
--- a/pengine/test10/cloned-group.summary
+++ b/pengine/test10/cloned-group.summary
@@ -1,47 +1,49 @@
Current cluster status:
Online: [ webcluster01 ]
OFFLINE: [ webcluster02 ]
Clone Set: apache2_clone [grrr]
Resource Group: grrr:2
apache2:2 (ocf::heartbeat:apache): ORPHANED Started webcluster01
mysql-proxy:2 (lsb:mysql-proxy): ORPHANED Started webcluster01
Started: [ webcluster01 ]
Stopped: [ grrr:1 ]
Transition Summary:
* Restart apache2:0 (Started webcluster01)
* Restart mysql-proxy:0 (Started webcluster01)
* Stop apache2:2 (webcluster01)
* Stop mysql-proxy:2 (webcluster01)
Executing cluster transition:
* Pseudo action: apache2_clone_stop_0
* Pseudo action: grrr:0_stop_0
* Resource action: mysql-proxy:1 stop on webcluster01
* Pseudo action: grrr:2_stop_0
* Resource action: mysql-proxy:0 stop on webcluster01
+ * Resource action: mysql-proxy:0 delete on webcluster01
* Resource action: apache2:1 stop on webcluster01
* Resource action: apache2:0 stop on webcluster01
+ * Resource action: apache2:0 delete on webcluster01
* Pseudo action: all_stopped
* Pseudo action: grrr:0_stopped_0
* Pseudo action: grrr:2_stopped_0
* Pseudo action: apache2_clone_stopped_0
* Pseudo action: apache2_clone_start_0
* Pseudo action: grrr:0_start_0
* Resource action: apache2:1 start on webcluster01
* Resource action: apache2:1 monitor=10000 on webcluster01
* Resource action: mysql-proxy:1 start on webcluster01
* Resource action: mysql-proxy:1 monitor=10000 on webcluster01
* Pseudo action: grrr:0_running_0
* Pseudo action: apache2_clone_running_0
Revised cluster status:
Online: [ webcluster01 ]
OFFLINE: [ webcluster02 ]
Clone Set: apache2_clone [grrr]
Started: [ webcluster01 ]
Stopped: [ grrr:1 ]
diff --git a/pengine/test10/coloc-intra-set.dot b/pengine/test10/coloc-intra-set.dot
index 0b32ad021d..a5ddb3ba8f 100644
--- a/pengine/test10/coloc-intra-set.dot
+++ b/pengine/test10/coloc-intra-set.dot
@@ -1,15 +1,20 @@
digraph "g" {
"all_stopped" [ style=bold color="green" fontcolor="orange" ]
+"d0:0_delete_0 hex-13" [ style=bold color="green" fontcolor="black"]
+"dlm:0_delete_0 hex-13" [ style=bold color="green" fontcolor="black"]
"dummy1_monitor_15000 hex-14" [ style=bold color="green" fontcolor="black" ]
"dummy1_start_0 hex-14" -> "dummy1_monitor_15000 hex-14" [ style = bold]
"dummy1_start_0 hex-14" [ style=bold color="green" fontcolor="black" ]
"dummy1_stop_0 hex-13" -> "all_stopped" [ style = bold]
"dummy1_stop_0 hex-13" -> "dummy1_start_0 hex-14" [ style = bold]
"dummy1_stop_0 hex-13" [ style=bold color="green" fontcolor="black" ]
"dummy3_monitor_15000 hex-14" [ style=bold color="green" fontcolor="black" ]
"dummy3_start_0 hex-14" -> "dummy3_monitor_15000 hex-14" [ style = bold]
"dummy3_start_0 hex-14" [ style=bold color="green" fontcolor="black" ]
"dummy3_stop_0 hex-13" -> "all_stopped" [ style = bold]
"dummy3_stop_0 hex-13" -> "dummy3_start_0 hex-14" [ style = bold]
"dummy3_stop_0 hex-13" [ style=bold color="green" fontcolor="black" ]
+"dummy4_delete_0 hex-13" [ style=bold color="green" fontcolor="black"]
+"o2cb:0_delete_0 hex-13" [ style=bold color="green" fontcolor="black"]
+"ocfs2-3:0_delete_0 hex-13" [ style=bold color="green" fontcolor="black"]
}
diff --git a/pengine/test10/coloc-intra-set.exp b/pengine/test10/coloc-intra-set.exp
index 99bb815304..29622d4a03 100644
--- a/pengine/test10/coloc-intra-set.exp
+++ b/pengine/test10/coloc-intra-set.exp
@@ -1,88 +1,133 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
diff --git a/pengine/test10/coloc-intra-set.summary b/pengine/test10/coloc-intra-set.summary
index 4570ab2b51..caefd3e2ef 100644
--- a/pengine/test10/coloc-intra-set.summary
+++ b/pengine/test10/coloc-intra-set.summary
@@ -1,32 +1,37 @@
Current cluster status:
Online: [ hex-13 hex-14 ]
fencing-sbd (stonith:external/sbd): Started hex-13
dummy0 (ocf::heartbeat:Dummy): Started hex-14
dummy1 (ocf::heartbeat:Dummy): Started hex-13
dummy2 (ocf::heartbeat:Dummy): Started hex-14
dummy3 (ocf::heartbeat:Dummy): Started hex-13
Transition Summary:
* Move dummy1 (Started hex-13 -> hex-14)
* Move dummy3 (Started hex-13 -> hex-14)
Executing cluster transition:
* Resource action: dummy1 stop on hex-13
* Resource action: dummy3 stop on hex-13
+ * Resource action: d0:0 delete on hex-13
+ * Resource action: o2cb:0 delete on hex-13
+ * Resource action: dummy4 delete on hex-13
+ * Resource action: dlm:0 delete on hex-13
+ * Resource action: ocfs2-3:0 delete on hex-13
* Pseudo action: all_stopped
* Resource action: dummy1 start on hex-14
* Resource action: dummy3 start on hex-14
* Resource action: dummy1 monitor=15000 on hex-14
* Resource action: dummy3 monitor=15000 on hex-14
Revised cluster status:
Online: [ hex-13 hex-14 ]
fencing-sbd (stonith:external/sbd): Started hex-13
dummy0 (ocf::heartbeat:Dummy): Started hex-14
dummy1 (ocf::heartbeat:Dummy): Started hex-14
dummy2 (ocf::heartbeat:Dummy): Started hex-14
dummy3 (ocf::heartbeat:Dummy): Started hex-14
diff --git a/pengine/test10/failcount.dot b/pengine/test10/failcount.dot
index ed3c165ce9..aa7124efc9 100644
--- a/pengine/test10/failcount.dot
+++ b/pengine/test10/failcount.dot
@@ -1,4 +1,22 @@
digraph "g" {
+"re-dummy1_delete_0 dresproddns01" [ style=bold color="green" fontcolor="black"]
+"re-dummy1_delete_0 dresproddns02" [ style=bold color="green" fontcolor="black"]
+"re-dummy2_delete_0 dresproddns01" [ style=bold color="green" fontcolor="black"]
+"re-dummy2_delete_0 dresproddns02" [ style=bold color="green" fontcolor="black"]
+"re-dummy3_delete_0 dresproddns01" [ style=bold color="green" fontcolor="black"]
+"re-dummy3_delete_0 dresproddns02" [ style=bold color="green" fontcolor="black"]
+"re-dummy4_delete_0 dresproddns01" [ style=bold color="green" fontcolor="black"]
+"re-dummy4_delete_0 dresproddns02" [ style=bold color="green" fontcolor="black"]
+"re-dummy_delete_0 dresproddns01" [ style=bold color="green" fontcolor="black"]
+"re-dummy_delete_0 dresproddns02" [ style=bold color="green" fontcolor="black"]
+"re-monitoring-lv:0_delete_0 dresproddns01" [ style=bold color="green" fontcolor="black"]
+"re-monitoring-lv:0_delete_0 dresproddns02" [ style=bold color="green" fontcolor="black"]
+"re-monitoring-lv_delete_0 dresproddns01" [ style=bold color="green" fontcolor="black"]
+"re-monitoring-lv_delete_0 dresproddns02" [ style=bold color="green" fontcolor="black"]
+"re-named-103ns1-ip_delete_0 dresproddns01" [ style=bold color="green" fontcolor="black"]
+"re-named-103ns1-ip_delete_0 dresproddns02" [ style=bold color="green" fontcolor="black"]
+"re-named-103ns2-ip_delete_0 dresproddns01" [ style=bold color="green" fontcolor="black"]
+"re-named-103ns2-ip_delete_0 dresproddns02" [ style=bold color="green" fontcolor="black"]
"re-openfire-lsb:0_clear_failcount dresproddns01" [ style=bold color="green" fontcolor="black"]
"re-openfire-lsb:1_clear_failcount dresproddns02" [ style=bold color="green" fontcolor="black"]
}
diff --git a/pengine/test10/failcount.exp b/pengine/test10/failcount.exp
index 3b2057e7aa..396bdb14ef 100644
--- a/pengine/test10/failcount.exp
+++ b/pengine/test10/failcount.exp
@@ -1,21 +1,183 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pengine/test10/failcount.summary b/pengine/test10/failcount.summary
index 9d60f46062..9ee764fd95 100644
--- a/pengine/test10/failcount.summary
+++ b/pengine/test10/failcount.summary
@@ -1,59 +1,77 @@
Current cluster status:
Online: [ dresproddns01 dresproddns02 ]
Clone Set: cl-openfire [gr-openfire]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-named [gr-named]
Started: [ dresproddns01 dresproddns02 ]
re-monitor (ocf::pacemaker:ClusterMon): Started dresproddns02
Clone Set: cl-ping-sjim [re-ping-sjim]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-wesbprod [gr-wesbprod]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-svn [gr-svn]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-ldirectord [re-ldirectord-gluster]
Started: [ dresproddns01 dresproddns02 ]
re-drdns-ip (ocf::heartbeat:IPaddr): Started dresproddns01
Clone Set: cl-cdeprod [gr-cdeprod]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-sysinfo [re-sysinfo]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-haproxy [gr-haproxy]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-ping-sjho [re-ping-sjho]
Started: [ dresproddns01 dresproddns02 ]
Transition Summary:
Executing cluster transition:
* Cluster action: clear_failcount on dresproddns01
* Cluster action: clear_failcount on dresproddns02
+ * Resource action: re-named-103ns2-ip delete on dresproddns02
+ * Resource action: re-named-103ns2-ip delete on dresproddns01
+ * Resource action: re-monitoring-lv:0 delete on dresproddns02
+ * Resource action: re-monitoring-lv:0 delete on dresproddns01
+ * Resource action: re-dummy delete on dresproddns02
+ * Resource action: re-dummy delete on dresproddns01
+ * Resource action: re-dummy3 delete on dresproddns02
+ * Resource action: re-dummy3 delete on dresproddns01
+ * Resource action: re-dummy4 delete on dresproddns02
+ * Resource action: re-dummy4 delete on dresproddns01
+ * Resource action: re-dummy1 delete on dresproddns02
+ * Resource action: re-dummy1 delete on dresproddns01
+ * Resource action: re-monitoring-lv delete on dresproddns02
+ * Resource action: re-monitoring-lv delete on dresproddns01
+ * Resource action: re-dummy2 delete on dresproddns02
+ * Resource action: re-dummy2 delete on dresproddns01
+ * Resource action: re-named-103ns1-ip delete on dresproddns02
+ * Resource action: re-named-103ns1-ip delete on dresproddns01
Revised cluster status:
Online: [ dresproddns01 dresproddns02 ]
Clone Set: cl-openfire [gr-openfire]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-named [gr-named]
Started: [ dresproddns01 dresproddns02 ]
re-monitor (ocf::pacemaker:ClusterMon): Started dresproddns02
Clone Set: cl-ping-sjim [re-ping-sjim]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-wesbprod [gr-wesbprod]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-svn [gr-svn]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-ldirectord [re-ldirectord-gluster]
Started: [ dresproddns01 dresproddns02 ]
re-drdns-ip (ocf::heartbeat:IPaddr): Started dresproddns01
Clone Set: cl-cdeprod [gr-cdeprod]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-sysinfo [re-sysinfo]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-haproxy [gr-haproxy]
Started: [ dresproddns01 dresproddns02 ]
Clone Set: cl-ping-sjho [re-ping-sjho]
Started: [ dresproddns01 dresproddns02 ]
diff --git a/pengine/test10/inc9.dot b/pengine/test10/inc9.dot
index f4d6649003..8e297386b8 100644
--- a/pengine/test10/inc9.dot
+++ b/pengine/test10/inc9.dot
@@ -1,18 +1,26 @@
digraph "g" {
"all_stopped" [ style=bold color="green" fontcolor="orange" ]
+"child_rsc1:1_delete_0 node1" [ style=bold color="green" fontcolor="black"]
+"child_rsc1:1_delete_0 node2" [ style=bold color="green" fontcolor="black"]
"child_rsc1:1_stop_0 node1" -> "all_stopped" [ style = bold]
+"child_rsc1:1_stop_0 node1" -> "child_rsc1:1_delete_0 node1" [ style = bold]
+"child_rsc1:1_stop_0 node1" -> "child_rsc1:1_delete_0 node2" [ style = bold]
"child_rsc1:1_stop_0 node1" -> "rsc1_stopped_0" [ style = bold]
"child_rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="black"]
"child_rsc1:1_stop_0 node2" -> "all_stopped" [ style = bold]
+"child_rsc1:1_stop_0 node2" -> "child_rsc1:1_delete_0 node1" [ style = bold]
+"child_rsc1:1_stop_0 node2" -> "child_rsc1:1_delete_0 node2" [ style = bold]
"child_rsc1:1_stop_0 node2" -> "rsc1_stopped_0" [ style = bold]
"child_rsc1:1_stop_0 node2" [ style=bold color="green" fontcolor="black"]
+"child_rsc1:2_delete_0 node1" [ style=bold color="green" fontcolor="black"]
"child_rsc1:2_stop_0 node1" -> "all_stopped" [ style = bold]
+"child_rsc1:2_stop_0 node1" -> "child_rsc1:2_delete_0 node1" [ style = bold]
"child_rsc1:2_stop_0 node1" -> "rsc1_stopped_0" [ style = bold]
"child_rsc1:2_stop_0 node1" [ style=bold color="green" fontcolor="black"]
"rsc1_stop_0" -> "child_rsc1:1_stop_0 node1" [ style = bold]
"rsc1_stop_0" -> "child_rsc1:1_stop_0 node2" [ style = bold]
"rsc1_stop_0" -> "child_rsc1:2_stop_0 node1" [ style = bold]
"rsc1_stop_0" -> "rsc1_stopped_0" [ style = bold]
"rsc1_stop_0" [ style=bold color="green" fontcolor="orange" ]
"rsc1_stopped_0" [ style=bold color="green" fontcolor="orange" ]
}
diff --git a/pengine/test10/inc9.exp b/pengine/test10/inc9.exp
index e8ffd91eeb..8610824f43 100644
--- a/pengine/test10/inc9.exp
+++ b/pengine/test10/inc9.exp
@@ -1,89 +1,154 @@
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/inc9.summary b/pengine/test10/inc9.summary
index 7425549105..f7ae82adfb 100644
--- a/pengine/test10/inc9.summary
+++ b/pengine/test10/inc9.summary
@@ -1,31 +1,36 @@
Current cluster status:
Online: [ node1 node2 ]
Clone Set: rsc1 [child_rsc1]
child_rsc1:5 (heartbeat:apache): ORPHANED Started node1
child_rsc1:6 (heartbeat:apache): ORPHANED Started node1
child_rsc1:7 (heartbeat:apache): ORPHANED Started node2
Started: [ node1 node2 ]
Stopped: [ child_rsc1:2 child_rsc1:3 child_rsc1:4 ]
Transition Summary:
* Stop child_rsc1:5 (node1)
* Stop child_rsc1:6 (node1)
* Stop child_rsc1:7 (node2)
Executing cluster transition:
* Pseudo action: rsc1_stop_0
* Resource action: child_rsc1:1 stop on node1
+ * Resource action: child_rsc1:1 delete on node2
+ * Resource action: child_rsc1:1 delete on node1
* Resource action: child_rsc1:2 stop on node1
+ * Resource action: child_rsc1:2 delete on node1
* Resource action: child_rsc1:1 stop on node2
+ * Resource action: child_rsc1:1 delete on node2
+ * Resource action: child_rsc1:1 delete on node1
* Pseudo action: rsc1_stopped_0
* Pseudo action: all_stopped
Revised cluster status:
Online: [ node1 node2 ]
Clone Set: rsc1 [child_rsc1]
Started: [ node1 node2 ]
Stopped: [ child_rsc1:2 child_rsc1:3 child_rsc1:4 ]
diff --git a/pengine/test10/obsolete-lrm-resource.dot b/pengine/test10/obsolete-lrm-resource.dot
index 85b12efc8c..b42feb9965 100644
--- a/pengine/test10/obsolete-lrm-resource.dot
+++ b/pengine/test10/obsolete-lrm-resource.dot
@@ -1,14 +1,15 @@
digraph "g" {
"probe_complete yingying.site" -> "probe_complete" [ style = bold]
"probe_complete yingying.site" [ style=bold color="green" fontcolor="black"]
"probe_complete" -> "rsc1_child:0_start_0 yingying.site" [ style = bold]
"probe_complete" [ style=bold color="green" fontcolor="orange"]
"rsc1_child:0_monitor_0 yingying.site" -> "probe_complete yingying.site" [ style = bold]
"rsc1_child:0_monitor_0 yingying.site" [ style=bold color="green" fontcolor="black"]
"rsc1_child:0_start_0 yingying.site" -> "rsc1_running_0" [ style = bold]
"rsc1_child:0_start_0 yingying.site" [ style=bold color="green" fontcolor="black"]
+"rsc1_delete_0 yingying.site" [ style=bold color="green" fontcolor="black"]
"rsc1_running_0" [ style=bold color="green" fontcolor="orange"]
"rsc1_start_0" -> "rsc1_child:0_start_0 yingying.site" [ style = bold]
"rsc1_start_0" -> "rsc1_running_0" [ style = bold]
"rsc1_start_0" [ style=bold color="green" fontcolor="orange"]
}
diff --git a/pengine/test10/obsolete-lrm-resource.exp b/pengine/test10/obsolete-lrm-resource.exp
index b7b6ce7f8c..e56e556995 100644
--- a/pengine/test10/obsolete-lrm-resource.exp
+++ b/pengine/test10/obsolete-lrm-resource.exp
@@ -1,75 +1,84 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/obsolete-lrm-resource.summary b/pengine/test10/obsolete-lrm-resource.summary
index d89195386e..f45bdd5f45 100644
--- a/pengine/test10/obsolete-lrm-resource.summary
+++ b/pengine/test10/obsolete-lrm-resource.summary
@@ -1,23 +1,24 @@
Current cluster status:
Online: [ yingying.site ]
Clone Set: rsc1 [rsc1_child]
Stopped: [ rsc1_child:0 ]
Transition Summary:
* Start rsc1_child:0 (yingying.site)
Executing cluster transition:
* Resource action: rsc1_child:0 monitor on yingying.site
* Pseudo action: rsc1_start_0
+ * Resource action: rsc1 delete on yingying.site
* Pseudo action: probe_complete
* Resource action: rsc1_child:0 start on yingying.site
* Pseudo action: rsc1_running_0
Revised cluster status:
Online: [ yingying.site ]
Clone Set: rsc1 [rsc1_child]
Started: [ yingying.site ]
diff --git a/pengine/test10/orphan-0.exp b/pengine/test10/orphan-0.exp
index c9f649de15..afccffbb46 100644
--- a/pengine/test10/orphan-0.exp
+++ b/pengine/test10/orphan-0.exp
@@ -1,213 +1,213 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/orphan-1.dot b/pengine/test10/orphan-1.dot
index 511dd8b4cb..8710cdcad7 100644
--- a/pengine/test10/orphan-1.dot
+++ b/pengine/test10/orphan-1.dot
@@ -1,42 +1,44 @@
digraph "g" {
"Cancel rsc_c001n02_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ]
"Cancel rsc_c001n03_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ]
"DcIPaddr_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
"DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
"DcIPaddr_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
"DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
"DcIPaddr_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
"DcIPaddr_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
"all_stopped" [ style=bold color="green" fontcolor="orange" ]
"probe_complete c001n01" -> "probe_complete" [ style = bold]
"probe_complete c001n01" [ style=bold color="green" fontcolor="black" ]
"probe_complete c001n02" -> "probe_complete" [ style = bold]
"probe_complete c001n02" [ style=bold color="green" fontcolor="black" ]
"probe_complete c001n03" -> "probe_complete" [ style = bold]
"probe_complete c001n03" [ style=bold color="green" fontcolor="black" ]
"probe_complete c001n08" -> "probe_complete" [ style = bold]
"probe_complete c001n08" [ style=bold color="green" fontcolor="black" ]
"probe_complete" -> "rsc_c001n08_stop_0 c001n08" [ style = bold]
"probe_complete" [ style=bold color="green" fontcolor="orange" ]
"rsc_c001n01_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
"rsc_c001n01_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n01_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
"rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n01_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
"rsc_c001n01_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n02_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
"rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n02_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
"rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n02_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
"rsc_c001n02_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n03_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
"rsc_c001n03_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n03_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
"rsc_c001n03_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n03_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
"rsc_c001n03_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
"rsc_c001n03_monitor_6000 c001n03" [ style=bold color="green" fontcolor="black" ]
+"rsc_c001n08_delete_0 c001n08" [ style=bold color="green" fontcolor="black"]
"rsc_c001n08_stop_0 c001n08" -> "all_stopped" [ style = bold]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n08" [ style = bold]
"rsc_c001n08_stop_0 c001n08" [ style=bold color="green" fontcolor="black" ]
}
diff --git a/pengine/test10/orphan-1.exp b/pengine/test10/orphan-1.exp
index 8618b18d07..b3a647065b 100644
--- a/pengine/test10/orphan-1.exp
+++ b/pengine/test10/orphan-1.exp
@@ -1,256 +1,269 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/orphan-1.summary b/pengine/test10/orphan-1.summary
index bc07c42373..a669ea8688 100644
--- a/pengine/test10/orphan-1.summary
+++ b/pengine/test10/orphan-1.summary
@@ -1,41 +1,42 @@
Current cluster status:
Online: [ c001n01 c001n02 c001n03 c001n08 ]
DcIPaddr (ocf::heartbeat:IPaddr): Started c001n02
rsc_c001n02 (ocf::heartbeat:IPaddr): Started c001n02
rsc_c001n03 (ocf::heartbeat:IPaddr): Started c001n03
rsc_c001n01 (ocf::heartbeat:IPaddr): Started c001n01
rsc_c001n08 (ocf::heartbeat:IPaddr): ORPHANED Started c001n08
Transition Summary:
* Stop rsc_c001n08 (c001n08)
Executing cluster transition:
* Resource action: DcIPaddr monitor on c001n08
* Resource action: DcIPaddr monitor on c001n03
* Resource action: DcIPaddr monitor on c001n01
* Resource action: rsc_c001n02 monitor on c001n08
* Resource action: rsc_c001n02 monitor on c001n03
* Resource action: rsc_c001n02 monitor on c001n01
* Resource action: rsc_c001n02 cancel=5000 on c001n02
* Resource action: rsc_c001n03 monitor=6000 on c001n03
* Resource action: rsc_c001n03 monitor on c001n08
* Resource action: rsc_c001n03 monitor on c001n02
* Resource action: rsc_c001n03 monitor on c001n01
* Resource action: rsc_c001n03 cancel=5000 on c001n03
* Resource action: rsc_c001n01 monitor on c001n08
* Resource action: rsc_c001n01 monitor on c001n03
* Resource action: rsc_c001n01 monitor on c001n02
* Pseudo action: probe_complete
* Resource action: rsc_c001n08 stop on c001n08
+ * Resource action: rsc_c001n08 delete on c001n08
* Pseudo action: all_stopped
Revised cluster status:
Online: [ c001n01 c001n02 c001n03 c001n08 ]
DcIPaddr (ocf::heartbeat:IPaddr): Started c001n02
rsc_c001n02 (ocf::heartbeat:IPaddr): Started c001n02
rsc_c001n03 (ocf::heartbeat:IPaddr): Started c001n03
rsc_c001n01 (ocf::heartbeat:IPaddr): Started c001n01
diff --git a/pengine/test10/orphan-2.dot b/pengine/test10/orphan-2.dot
index 4037b90b6f..09fb0bdc0d 100644
--- a/pengine/test10/orphan-2.dot
+++ b/pengine/test10/orphan-2.dot
@@ -1,46 +1,48 @@
digraph "g" {
"Cancel rsc_c001n02_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black"]
"Cancel rsc_c001n03_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black"]
"DcIPaddr_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
"DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black"]
"DcIPaddr_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
"DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black"]
"DcIPaddr_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
"DcIPaddr_monitor_0 c001n08" [ style=bold color="green" fontcolor="black"]
"all_stopped" [ style=bold color="green" fontcolor="orange"]
"probe_complete c001n01" -> "probe_complete" [ style = bold]
"probe_complete c001n01" [ style=bold color="green" fontcolor="black"]
"probe_complete c001n02" -> "probe_complete" [ style = bold]
"probe_complete c001n02" [ style=bold color="green" fontcolor="black"]
"probe_complete c001n03" -> "probe_complete" [ style = bold]
"probe_complete c001n03" [ style=bold color="green" fontcolor="black"]
"probe_complete c001n08" -> "probe_complete" [ style = bold]
"probe_complete c001n08" [ style=bold color="green" fontcolor="black"]
"probe_complete" -> "rsc_c001n08_stop_0 c001n08" [ style = bold]
"probe_complete" [ style=bold color="green" fontcolor="orange"]
"rsc_c001n01_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
"rsc_c001n01_monitor_0 c001n02" [ style=bold color="green" fontcolor="black"]
"rsc_c001n01_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
"rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black"]
"rsc_c001n01_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
"rsc_c001n01_monitor_0 c001n08" [ style=bold color="green" fontcolor="black"]
"rsc_c001n02_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
"rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black"]
"rsc_c001n02_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
"rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black"]
"rsc_c001n02_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
"rsc_c001n02_monitor_0 c001n08" [ style=bold color="green" fontcolor="black"]
"rsc_c001n03_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
"rsc_c001n03_monitor_0 c001n01" [ style=bold color="green" fontcolor="black"]
"rsc_c001n03_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
"rsc_c001n03_monitor_0 c001n02" [ style=bold color="green" fontcolor="black"]
"rsc_c001n03_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
"rsc_c001n03_monitor_0 c001n08" [ style=bold color="green" fontcolor="black"]
"rsc_c001n03_monitor_6000 c001n03" [ style=bold color="green" fontcolor="black"]
"rsc_c001n08_clear_failcount c001n02" -> "probe_complete" [ style = bold]
"rsc_c001n08_clear_failcount c001n02" [ style=bold color="green" fontcolor="black"]
"rsc_c001n08_clear_failcount c001n08" -> "probe_complete" [ style = bold]
"rsc_c001n08_clear_failcount c001n08" [ style=bold color="green" fontcolor="black"]
+"rsc_c001n08_delete_0 c001n08" [ style=bold color="green" fontcolor="black"]
"rsc_c001n08_stop_0 c001n08" -> "all_stopped" [ style = bold]
+"rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n08" [ style = bold]
"rsc_c001n08_stop_0 c001n08" [ style=bold color="green" fontcolor="black"]
}
diff --git a/pengine/test10/orphan-2.exp b/pengine/test10/orphan-2.exp
index bc0e42aa26..ad9ad5984d 100644
--- a/pengine/test10/orphan-2.exp
+++ b/pengine/test10/orphan-2.exp
@@ -1,280 +1,293 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/pengine/test10/orphan-2.summary b/pengine/test10/orphan-2.summary
index 8ce2fc3ec7..e20bb18b30 100644
--- a/pengine/test10/orphan-2.summary
+++ b/pengine/test10/orphan-2.summary
@@ -1,43 +1,44 @@
Current cluster status:
Online: [ c001n01 c001n02 c001n03 c001n08 ]
DcIPaddr (ocf::heartbeat:IPaddr): Started c001n02
rsc_c001n02 (ocf::heartbeat:IPaddr): Started c001n02
rsc_c001n03 (ocf::heartbeat:IPaddr): Started c001n03
rsc_c001n01 (ocf::heartbeat:IPaddr): Started c001n01
rsc_c001n08 (ocf::heartbeat:IPaddr): ORPHANED Started c001n08
Transition Summary:
* Stop rsc_c001n08 (c001n08)
Executing cluster transition:
* Resource action: DcIPaddr monitor on c001n08
* Resource action: DcIPaddr monitor on c001n03
* Resource action: DcIPaddr monitor on c001n01
* Resource action: rsc_c001n02 monitor on c001n08
* Resource action: rsc_c001n02 monitor on c001n03
* Resource action: rsc_c001n02 monitor on c001n01
* Resource action: rsc_c001n02 cancel=5000 on c001n02
* Resource action: rsc_c001n03 monitor=6000 on c001n03
* Resource action: rsc_c001n03 monitor on c001n08
* Resource action: rsc_c001n03 monitor on c001n02
* Resource action: rsc_c001n03 monitor on c001n01
* Resource action: rsc_c001n03 cancel=5000 on c001n03
* Resource action: rsc_c001n01 monitor on c001n08
* Resource action: rsc_c001n01 monitor on c001n03
* Resource action: rsc_c001n01 monitor on c001n02
* Cluster action: clear_failcount on c001n08
* Cluster action: clear_failcount on c001n02
* Pseudo action: probe_complete
* Resource action: rsc_c001n08 stop on c001n08
+ * Resource action: rsc_c001n08 delete on c001n08
* Pseudo action: all_stopped
Revised cluster status:
Online: [ c001n01 c001n02 c001n03 c001n08 ]
DcIPaddr (ocf::heartbeat:IPaddr): Started c001n02
rsc_c001n02 (ocf::heartbeat:IPaddr): Started c001n02
rsc_c001n03 (ocf::heartbeat:IPaddr): Started c001n03
rsc_c001n01 (ocf::heartbeat:IPaddr): Started c001n01