diff --git a/pengine/test10/migrate-begin.dot b/pengine/test10/migrate-begin.dot
index 76d5a9d938..1927f7f2c1 100644
--- a/pengine/test10/migrate-begin.dot
+++ b/pengine/test10/migrate-begin.dot
@@ -1,16 +1,17 @@
digraph "g" {
"all_stopped" [ style=bold color="green" fontcolor="orange" ]
+"load_stopped_hex-13 hex-13" -> "test-vm_migrate_to_0 hex-14" [ style = bold]
"load_stopped_hex-13 hex-13" -> "test-vm_start_0 hex-13" [ style = bold]
"load_stopped_hex-13 hex-13" [ style=bold color="green" fontcolor="orange" ]
"load_stopped_hex-14 hex-14" [ style=bold color="green" fontcolor="orange" ]
"test-vm_migrate_from_0 hex-13" -> "test-vm_start_0 hex-13" [ style = bold]
"test-vm_migrate_from_0 hex-13" -> "test-vm_stop_0 hex-14" [ style = bold]
"test-vm_migrate_from_0 hex-13" [ style=bold color="green" fontcolor="black" ]
"test-vm_migrate_to_0 hex-14" -> "test-vm_migrate_from_0 hex-13" [ style = bold]
"test-vm_migrate_to_0 hex-14" [ style=bold color="green" fontcolor="black" ]
"test-vm_start_0 hex-13" [ style=bold color="green" fontcolor="orange" ]
"test-vm_stop_0 hex-14" -> "all_stopped" [ style = bold]
"test-vm_stop_0 hex-14" -> "load_stopped_hex-14 hex-14" [ style = bold]
"test-vm_stop_0 hex-14" -> "test-vm_start_0 hex-13" [ style = bold]
"test-vm_stop_0 hex-14" [ style=bold color="green" fontcolor="black" ]
}
diff --git a/pengine/test10/migrate-begin.exp b/pengine/test10/migrate-begin.exp
index 1d6a898ff7..c77e89c232 100644
--- a/pengine/test10/migrate-begin.exp
+++ b/pengine/test10/migrate-begin.exp
@@ -1,88 +1,92 @@
-
+
+
+
+
+
diff --git a/pengine/test10/migrate-begin.summary b/pengine/test10/migrate-begin.summary
index 3dea03a7fb..b4b58703f1 100644
--- a/pengine/test10/migrate-begin.summary
+++ b/pengine/test10/migrate-begin.summary
@@ -1,27 +1,27 @@
Current cluster status:
Online: [ hex-13 hex-14 ]
test-vm (ocf::heartbeat:Xen): Started hex-14
Clone Set: c-clusterfs [dlm]
Started: [ hex-13 hex-14 ]
Transition Summary:
* Migrate test-vm (Started hex-14 -> hex-13)
Executing cluster transition:
- * Resource action: test-vm migrate_to on hex-14
* Pseudo action: load_stopped_hex-13
+ * Resource action: test-vm migrate_to on hex-14
* Resource action: test-vm migrate_from on hex-13
* Resource action: test-vm stop on hex-14
* Pseudo action: load_stopped_hex-14
* Pseudo action: all_stopped
* Pseudo action: test-vm_start_0
Revised cluster status:
Online: [ hex-13 hex-14 ]
test-vm (ocf::heartbeat:Xen): Started hex-13
Clone Set: c-clusterfs [dlm]
Started: [ hex-13 hex-14 ]
diff --git a/pengine/test10/migrate-both-vms.dot b/pengine/test10/migrate-both-vms.dot
index 7402fd60a6..e8837548b1 100644
--- a/pengine/test10/migrate-both-vms.dot
+++ b/pengine/test10/migrate-both-vms.dot
@@ -1,109 +1,111 @@
digraph "g" {
"all_stopped" [ style=bold color="green" fontcolor="orange"]
"c-fs-bind-libvirt-VM-cvmh_stop_0" -> "c-fs-bind-libvirt-VM-cvmh_stopped_0" [ style = bold]
"c-fs-bind-libvirt-VM-cvmh_stop_0" -> "fs-bind-libvirt-VM-cvmh_stop_0 cvmh03" [ style = bold]
"c-fs-bind-libvirt-VM-cvmh_stop_0" -> "fs-bind-libvirt-VM-cvmh_stop_0 cvmh04" [ style = bold]
"c-fs-bind-libvirt-VM-cvmh_stop_0" [ style=bold color="green" fontcolor="orange"]
"c-fs-bind-libvirt-VM-cvmh_stopped_0" -> "c-fs-gpfs_stop_0" [ style = bold]
"c-fs-bind-libvirt-VM-cvmh_stopped_0" [ style=bold color="green" fontcolor="orange"]
"c-fs-gpfs_stop_0" -> "c-fs-gpfs_stopped_0" [ style = bold]
"c-fs-gpfs_stop_0" -> "p-fs-gpfs_stop_0 cvmh03" [ style = bold]
"c-fs-gpfs_stop_0" -> "p-fs-gpfs_stop_0 cvmh04" [ style = bold]
"c-fs-gpfs_stop_0" [ style=bold color="green" fontcolor="orange"]
"c-fs-gpfs_stopped_0" [ style=bold color="green" fontcolor="orange"]
"c-fs-libvirt-VM-xcm_stop_0" -> "c-fs-libvirt-VM-xcm_stopped_0" [ style = bold]
"c-fs-libvirt-VM-xcm_stop_0" -> "fs-libvirt-VM-xcm_stop_0 cvmh03" [ style = bold]
"c-fs-libvirt-VM-xcm_stop_0" -> "fs-libvirt-VM-xcm_stop_0 cvmh04" [ style = bold]
"c-fs-libvirt-VM-xcm_stop_0" [ style=bold color="green" fontcolor="orange"]
"c-fs-libvirt-VM-xcm_stopped_0" [ style=bold color="green" fontcolor="orange"]
"c-p-libvirtd_stop_0" -> "c-p-libvirtd_stopped_0" [ style = bold]
"c-p-libvirtd_stop_0" -> "p-libvirtd_stop_0 cvmh03" [ style = bold]
"c-p-libvirtd_stop_0" -> "p-libvirtd_stop_0 cvmh04" [ style = bold]
"c-p-libvirtd_stop_0" [ style=bold color="green" fontcolor="orange"]
"c-p-libvirtd_stopped_0" -> "c-fs-bind-libvirt-VM-cvmh_stop_0" [ style = bold]
"c-p-libvirtd_stopped_0" -> "c-fs-libvirt-VM-xcm_stop_0" [ style = bold]
"c-p-libvirtd_stopped_0" [ style=bold color="green" fontcolor="orange"]
"c-watch-ib0_stop_0" -> "c-watch-ib0_stopped_0" [ style = bold]
"c-watch-ib0_stop_0" -> "p-watch-ib0_stop_0 cvmh03" [ style = bold]
"c-watch-ib0_stop_0" -> "p-watch-ib0_stop_0 cvmh04" [ style = bold]
"c-watch-ib0_stop_0" [ style=bold color="green" fontcolor="orange"]
"c-watch-ib0_stopped_0" [ style=bold color="green" fontcolor="orange"]
"fs-bind-libvirt-VM-cvmh_stop_0 cvmh03" -> "all_stopped" [ style = bold]
"fs-bind-libvirt-VM-cvmh_stop_0 cvmh03" -> "c-fs-bind-libvirt-VM-cvmh_stopped_0" [ style = bold]
"fs-bind-libvirt-VM-cvmh_stop_0 cvmh03" -> "fs-bind-libvirt-VM-cvmh_stop_0 cvmh04" [ style = bold]
"fs-bind-libvirt-VM-cvmh_stop_0 cvmh03" -> "p-fs-gpfs_stop_0 cvmh03" [ style = bold]
"fs-bind-libvirt-VM-cvmh_stop_0 cvmh03" [ style=bold color="green" fontcolor="black"]
"fs-bind-libvirt-VM-cvmh_stop_0 cvmh04" -> "all_stopped" [ style = bold]
"fs-bind-libvirt-VM-cvmh_stop_0 cvmh04" -> "c-fs-bind-libvirt-VM-cvmh_stopped_0" [ style = bold]
"fs-bind-libvirt-VM-cvmh_stop_0 cvmh04" -> "p-fs-gpfs_stop_0 cvmh04" [ style = bold]
"fs-bind-libvirt-VM-cvmh_stop_0 cvmh04" [ style=bold color="green" fontcolor="black"]
"fs-libvirt-VM-xcm_stop_0 cvmh03" -> "all_stopped" [ style = bold]
"fs-libvirt-VM-xcm_stop_0 cvmh03" -> "c-fs-libvirt-VM-xcm_stopped_0" [ style = bold]
"fs-libvirt-VM-xcm_stop_0 cvmh03" -> "fs-libvirt-VM-xcm_stop_0 cvmh04" [ style = bold]
"fs-libvirt-VM-xcm_stop_0 cvmh03" [ style=bold color="green" fontcolor="black"]
"fs-libvirt-VM-xcm_stop_0 cvmh04" -> "all_stopped" [ style = bold]
"fs-libvirt-VM-xcm_stop_0 cvmh04" -> "c-fs-libvirt-VM-xcm_stopped_0" [ style = bold]
"fs-libvirt-VM-xcm_stop_0 cvmh04" [ style=bold color="green" fontcolor="black"]
+"load_stopped_cvmh01 cvmh01" -> "vm-compute-test_migrate_to_0 cvmh03" [ style = bold]
"load_stopped_cvmh01 cvmh01" -> "vm-compute-test_start_0 cvmh01" [ style = bold]
"load_stopped_cvmh01 cvmh01" [ style=bold color="green" fontcolor="orange"]
+"load_stopped_cvmh02 cvmh02" -> "vm-swbuildsl6_migrate_to_0 cvmh04" [ style = bold]
"load_stopped_cvmh02 cvmh02" -> "vm-swbuildsl6_start_0 cvmh02" [ style = bold]
"load_stopped_cvmh02 cvmh02" [ style=bold color="green" fontcolor="orange"]
"load_stopped_cvmh03 cvmh03" [ style=bold color="green" fontcolor="orange"]
"load_stopped_cvmh04 cvmh04" [ style=bold color="green" fontcolor="orange"]
"p-fs-gpfs_stop_0 cvmh03" -> "all_stopped" [ style = bold]
"p-fs-gpfs_stop_0 cvmh03" -> "c-fs-gpfs_stopped_0" [ style = bold]
"p-fs-gpfs_stop_0 cvmh03" -> "p-fs-gpfs_stop_0 cvmh04" [ style = bold]
"p-fs-gpfs_stop_0 cvmh03" [ style=bold color="green" fontcolor="black"]
"p-fs-gpfs_stop_0 cvmh04" -> "all_stopped" [ style = bold]
"p-fs-gpfs_stop_0 cvmh04" -> "c-fs-gpfs_stopped_0" [ style = bold]
"p-fs-gpfs_stop_0 cvmh04" [ style=bold color="green" fontcolor="black"]
"p-libvirtd_stop_0 cvmh03" -> "all_stopped" [ style = bold]
"p-libvirtd_stop_0 cvmh03" -> "c-p-libvirtd_stopped_0" [ style = bold]
"p-libvirtd_stop_0 cvmh03" -> "fs-bind-libvirt-VM-cvmh_stop_0 cvmh03" [ style = bold]
"p-libvirtd_stop_0 cvmh03" -> "fs-libvirt-VM-xcm_stop_0 cvmh03" [ style = bold]
"p-libvirtd_stop_0 cvmh03" -> "p-libvirtd_stop_0 cvmh04" [ style = bold]
"p-libvirtd_stop_0 cvmh03" [ style=bold color="green" fontcolor="black"]
"p-libvirtd_stop_0 cvmh04" -> "all_stopped" [ style = bold]
"p-libvirtd_stop_0 cvmh04" -> "c-p-libvirtd_stopped_0" [ style = bold]
"p-libvirtd_stop_0 cvmh04" -> "fs-bind-libvirt-VM-cvmh_stop_0 cvmh04" [ style = bold]
"p-libvirtd_stop_0 cvmh04" -> "fs-libvirt-VM-xcm_stop_0 cvmh04" [ style = bold]
"p-libvirtd_stop_0 cvmh04" [ style=bold color="green" fontcolor="black"]
"p-watch-ib0_stop_0 cvmh03" -> "all_stopped" [ style = bold]
"p-watch-ib0_stop_0 cvmh03" -> "c-watch-ib0_stopped_0" [ style = bold]
"p-watch-ib0_stop_0 cvmh03" -> "p-watch-ib0_stop_0 cvmh04" [ style = bold]
"p-watch-ib0_stop_0 cvmh03" [ style=bold color="green" fontcolor="black"]
"p-watch-ib0_stop_0 cvmh04" -> "all_stopped" [ style = bold]
"p-watch-ib0_stop_0 cvmh04" -> "c-watch-ib0_stopped_0" [ style = bold]
"p-watch-ib0_stop_0 cvmh04" [ style=bold color="green" fontcolor="black"]
"vm-compute-test_migrate_from_0 cvmh01" -> "vm-compute-test_start_0 cvmh01" [ style = bold]
"vm-compute-test_migrate_from_0 cvmh01" -> "vm-compute-test_stop_0 cvmh03" [ style = bold]
"vm-compute-test_migrate_from_0 cvmh01" -> "vm-swbuildsl6_migrate_to_0 cvmh04" [ style = bold]
"vm-compute-test_migrate_from_0 cvmh01" [ style=bold color="green" fontcolor="black"]
"vm-compute-test_migrate_to_0 cvmh03" -> "vm-compute-test_migrate_from_0 cvmh01" [ style = bold]
"vm-compute-test_migrate_to_0 cvmh03" [ style=bold color="green" fontcolor="black"]
"vm-compute-test_monitor_45000 cvmh01" [ style=bold color="green" fontcolor="black"]
"vm-compute-test_start_0 cvmh01" -> "vm-compute-test_monitor_45000 cvmh01" [ style = bold]
"vm-compute-test_start_0 cvmh01" -> "vm-swbuildsl6_migrate_to_0 cvmh04" [ style = dashed]
"vm-compute-test_start_0 cvmh01" -> "vm-swbuildsl6_start_0 cvmh02" [ style = bold]
"vm-compute-test_start_0 cvmh01" [ style=bold color="green" fontcolor="orange"]
"vm-compute-test_stop_0 cvmh03" -> "all_stopped" [ style = bold]
"vm-compute-test_stop_0 cvmh03" -> "c-p-libvirtd_stop_0" [ style = bold]
"vm-compute-test_stop_0 cvmh03" -> "load_stopped_cvmh03 cvmh03" [ style = bold]
"vm-compute-test_stop_0 cvmh03" -> "vm-compute-test_start_0 cvmh01" [ style = bold]
"vm-compute-test_stop_0 cvmh03" [ style=bold color="green" fontcolor="black"]
"vm-swbuildsl6_migrate_from_0 cvmh02" -> "vm-swbuildsl6_start_0 cvmh02" [ style = bold]
"vm-swbuildsl6_migrate_from_0 cvmh02" -> "vm-swbuildsl6_stop_0 cvmh04" [ style = bold]
"vm-swbuildsl6_migrate_from_0 cvmh02" [ style=bold color="green" fontcolor="black"]
"vm-swbuildsl6_migrate_to_0 cvmh04" -> "vm-swbuildsl6_migrate_from_0 cvmh02" [ style = bold]
"vm-swbuildsl6_migrate_to_0 cvmh04" [ style=bold color="green" fontcolor="black"]
"vm-swbuildsl6_monitor_45000 cvmh02" [ style=bold color="green" fontcolor="black"]
"vm-swbuildsl6_start_0 cvmh02" -> "vm-swbuildsl6_monitor_45000 cvmh02" [ style = bold]
"vm-swbuildsl6_start_0 cvmh02" [ style=bold color="green" fontcolor="orange"]
"vm-swbuildsl6_stop_0 cvmh04" -> "all_stopped" [ style = bold]
"vm-swbuildsl6_stop_0 cvmh04" -> "c-p-libvirtd_stop_0" [ style = bold]
"vm-swbuildsl6_stop_0 cvmh04" -> "load_stopped_cvmh04 cvmh04" [ style = bold]
"vm-swbuildsl6_stop_0 cvmh04" -> "vm-compute-test_migrate_to_0 cvmh03" [ style = dashed]
"vm-swbuildsl6_stop_0 cvmh04" -> "vm-compute-test_stop_0 cvmh03" [ style = bold]
"vm-swbuildsl6_stop_0 cvmh04" -> "vm-swbuildsl6_start_0 cvmh02" [ style = bold]
"vm-swbuildsl6_stop_0 cvmh04" [ style=bold color="green" fontcolor="black"]
}
diff --git a/pengine/test10/migrate-both-vms.exp b/pengine/test10/migrate-both-vms.exp
index 63aa146a34..58dd01b80f 100644
--- a/pengine/test10/migrate-both-vms.exp
+++ b/pengine/test10/migrate-both-vms.exp
@@ -1,541 +1,548 @@
-
+
+
+
+
+
+
+
+
diff --git a/pengine/test10/migrate-both-vms.summary b/pengine/test10/migrate-both-vms.summary
index 45a0a6e348..531fd4ca40 100644
--- a/pengine/test10/migrate-both-vms.summary
+++ b/pengine/test10/migrate-both-vms.summary
@@ -1,101 +1,101 @@
Current cluster status:
Node cvmh03: standby
Node cvmh04: standby
Online: [ cvmh01 cvmh02 ]
fence-cvmh01 (stonith:fence_ipmilan): Started cvmh02
fence-cvmh02 (stonith:fence_ipmilan): Started cvmh01
fence-cvmh03 (stonith:fence_ipmilan): Started cvmh01
fence-cvmh04 (stonith:fence_ipmilan): Started cvmh02
Clone Set: c-fs-libvirt-VM-xcm [fs-libvirt-VM-xcm]
Started: [ cvmh01 cvmh02 cvmh03 cvmh04 ]
Clone Set: c-p-libvirtd [p-libvirtd]
Started: [ cvmh01 cvmh02 cvmh03 cvmh04 ]
Clone Set: c-fs-bind-libvirt-VM-cvmh [fs-bind-libvirt-VM-cvmh]
Started: [ cvmh01 cvmh02 cvmh03 cvmh04 ]
Clone Set: c-watch-ib0 [p-watch-ib0]
Started: [ cvmh01 cvmh02 cvmh03 cvmh04 ]
Clone Set: c-fs-gpfs [p-fs-gpfs]
Started: [ cvmh01 cvmh02 cvmh03 cvmh04 ]
vm-compute-test (ocf::ccni:xcatVirtualDomain): Started cvmh03
vm-swbuildsl6 (ocf::ccni:xcatVirtualDomain): Started cvmh04
Transition Summary:
* Stop fs-libvirt-VM-xcm:0 (cvmh04)
* Stop fs-libvirt-VM-xcm:2 (cvmh03)
* Stop p-watch-ib0:0 (cvmh04)
* Stop p-watch-ib0:2 (cvmh03)
* Stop p-fs-gpfs:0 (cvmh04)
* Stop p-fs-gpfs:2 (cvmh03)
* Stop p-libvirtd:0 (cvmh04)
* Stop p-libvirtd:2 (cvmh03)
* Stop fs-bind-libvirt-VM-cvmh:0 (cvmh04)
* Stop fs-bind-libvirt-VM-cvmh:2 (cvmh03)
* Migrate vm-compute-test (Started cvmh03 -> cvmh01)
* Migrate vm-swbuildsl6 (Started cvmh04 -> cvmh02)
Executing cluster transition:
* Pseudo action: c-watch-ib0_stop_0
- * Resource action: vm-compute-test migrate_to on cvmh03
* Pseudo action: load_stopped_cvmh01
* Pseudo action: load_stopped_cvmh02
* Resource action: p-watch-ib0 stop on cvmh03
- * Resource action: vm-compute-test migrate_from on cvmh01
- * Resource action: vm-swbuildsl6 migrate_to on cvmh04
+ * Resource action: vm-compute-test migrate_to on cvmh03
* Resource action: p-watch-ib0 stop on cvmh04
* Pseudo action: c-watch-ib0_stopped_0
+ * Resource action: vm-compute-test migrate_from on cvmh01
+ * Resource action: vm-swbuildsl6 migrate_to on cvmh04
* Resource action: vm-swbuildsl6 migrate_from on cvmh02
* Resource action: vm-swbuildsl6 stop on cvmh04
* Pseudo action: load_stopped_cvmh04
* Resource action: vm-compute-test stop on cvmh03
* Pseudo action: load_stopped_cvmh03
* Pseudo action: c-p-libvirtd_stop_0
* Pseudo action: vm-compute-test_start_0
* Pseudo action: vm-swbuildsl6_start_0
* Resource action: p-libvirtd stop on cvmh03
* Resource action: vm-compute-test monitor=45000 on cvmh01
* Resource action: vm-swbuildsl6 monitor=45000 on cvmh02
* Resource action: p-libvirtd stop on cvmh04
* Pseudo action: c-p-libvirtd_stopped_0
* Pseudo action: c-fs-bind-libvirt-VM-cvmh_stop_0
* Pseudo action: c-fs-libvirt-VM-xcm_stop_0
* Resource action: fs-bind-libvirt-VM-cvmh stop on cvmh03
* Resource action: fs-libvirt-VM-xcm stop on cvmh03
* Resource action: fs-bind-libvirt-VM-cvmh stop on cvmh04
* Pseudo action: c-fs-bind-libvirt-VM-cvmh_stopped_0
* Resource action: fs-libvirt-VM-xcm stop on cvmh04
* Pseudo action: c-fs-libvirt-VM-xcm_stopped_0
* Pseudo action: c-fs-gpfs_stop_0
* Resource action: p-fs-gpfs stop on cvmh03
* Resource action: p-fs-gpfs stop on cvmh04
* Pseudo action: c-fs-gpfs_stopped_0
* Pseudo action: all_stopped
Revised cluster status:
Node cvmh03: standby
Node cvmh04: standby
Online: [ cvmh01 cvmh02 ]
fence-cvmh01 (stonith:fence_ipmilan): Started cvmh02
fence-cvmh02 (stonith:fence_ipmilan): Started cvmh01
fence-cvmh03 (stonith:fence_ipmilan): Started cvmh01
fence-cvmh04 (stonith:fence_ipmilan): Started cvmh02
Clone Set: c-fs-libvirt-VM-xcm [fs-libvirt-VM-xcm]
Started: [ cvmh01 cvmh02 ]
Stopped: [ cvmh03 cvmh04 ]
Clone Set: c-p-libvirtd [p-libvirtd]
Started: [ cvmh01 cvmh02 ]
Stopped: [ cvmh03 cvmh04 ]
Clone Set: c-fs-bind-libvirt-VM-cvmh [fs-bind-libvirt-VM-cvmh]
Started: [ cvmh01 cvmh02 ]
Stopped: [ cvmh03 cvmh04 ]
Clone Set: c-watch-ib0 [p-watch-ib0]
Started: [ cvmh01 cvmh02 ]
Stopped: [ cvmh03 cvmh04 ]
Clone Set: c-fs-gpfs [p-fs-gpfs]
Started: [ cvmh01 cvmh02 ]
Stopped: [ cvmh03 cvmh04 ]
vm-compute-test (ocf::ccni:xcatVirtualDomain): Started cvmh01
vm-swbuildsl6 (ocf::ccni:xcatVirtualDomain): Started cvmh02
diff --git a/pengine/test10/utilization-order3.dot b/pengine/test10/utilization-order3.dot
index a223d57559..d33041611d 100644
--- a/pengine/test10/utilization-order3.dot
+++ b/pengine/test10/utilization-order3.dot
@@ -1,20 +1,21 @@
digraph "g" {
"all_stopped" [ style=bold color="green" fontcolor="orange" ]
"load_stopped_node1 node1" -> "rsc2_start_0 node1" [ style = bold]
"load_stopped_node1 node1" [ style=bold color="green" fontcolor="orange" ]
+"load_stopped_node2 node2" -> "rsc1_migrate_to_0 node1" [ style = bold]
"load_stopped_node2 node2" -> "rsc1_start_0 node2" [ style = bold]
"load_stopped_node2 node2" [ style=bold color="green" fontcolor="orange" ]
"probe_complete node1" [ style=bold color="green" fontcolor="black" ]
"probe_complete node2" [ style=bold color="green" fontcolor="black" ]
"rsc1_migrate_from_0 node2" -> "rsc1_start_0 node2" [ style = bold]
"rsc1_migrate_from_0 node2" -> "rsc1_stop_0 node1" [ style = bold]
"rsc1_migrate_from_0 node2" [ style=bold color="green" fontcolor="black" ]
"rsc1_migrate_to_0 node1" -> "rsc1_migrate_from_0 node2" [ style = bold]
"rsc1_migrate_to_0 node1" [ style=bold color="green" fontcolor="black" ]
"rsc1_start_0 node2" [ style=bold color="green" fontcolor="orange" ]
"rsc1_stop_0 node1" -> "all_stopped" [ style = bold]
"rsc1_stop_0 node1" -> "load_stopped_node1 node1" [ style = bold]
"rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold]
"rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
"rsc2_start_0 node1" [ style=bold color="green" fontcolor="black" ]
}
diff --git a/pengine/test10/utilization-order3.exp b/pengine/test10/utilization-order3.exp
index cec7487174..4c234833b0 100644
--- a/pengine/test10/utilization-order3.exp
+++ b/pengine/test10/utilization-order3.exp
@@ -1,117 +1,121 @@
-
+
+
+
+
+
diff --git a/pengine/test10/utilization-order3.summary b/pengine/test10/utilization-order3.summary
index 23411ee578..cfeea48924 100644
--- a/pengine/test10/utilization-order3.summary
+++ b/pengine/test10/utilization-order3.summary
@@ -1,27 +1,27 @@
Current cluster status:
Online: [ node1 node2 ]
rsc2 (ocf::pacemaker:Dummy): Stopped
rsc1 (ocf::pacemaker:Dummy): Started node1
Transition Summary:
* Start rsc2 (node1)
* Migrate rsc1 (Started node1 -> node2)
Executing cluster transition:
- * Resource action: rsc1 migrate_to on node1
* Pseudo action: load_stopped_node2
+ * Resource action: rsc1 migrate_to on node1
* Resource action: rsc1 migrate_from on node2
* Resource action: rsc1 stop on node1
* Pseudo action: load_stopped_node1
* Pseudo action: all_stopped
* Resource action: rsc2 start on node1
* Pseudo action: rsc1_start_0
Revised cluster status:
Online: [ node1 node2 ]
rsc2 (ocf::pacemaker:Dummy): Started node1
rsc1 (ocf::pacemaker:Dummy): Started node2
diff --git a/pengine/test10/utilization-order4.dot b/pengine/test10/utilization-order4.dot
index bb426365c2..9c7e244920 100644
--- a/pengine/test10/utilization-order4.dot
+++ b/pengine/test10/utilization-order4.dot
@@ -1,54 +1,55 @@
digraph "g" {
"all_stopped" [ style=bold color="green" fontcolor="orange" ]
"clone-nfs_stop_0" -> "clone-nfs_stopped_0" [ style = bold]
"clone-nfs_stop_0" -> "grp-nfs:1_stop_0" [ style = bold]
"clone-nfs_stop_0" [ style=bold color="green" fontcolor="orange" ]
"clone-nfs_stopped_0" -> "clone-ping_stop_0" [ style = bold]
"clone-nfs_stopped_0" [ style=bold color="green" fontcolor="orange" ]
"clone-ping_stop_0" -> "clone-ping_stopped_0" [ style = bold]
"clone-ping_stop_0" -> "prim-ping:0_stop_0 deglxen002" [ style = bold]
"clone-ping_stop_0" [ style=bold color="green" fontcolor="orange" ]
"clone-ping_stopped_0" [ style=bold color="green" fontcolor="orange" ]
"degllx61-vm_stop_0 deglxen001" -> "all_stopped" [ style = bold]
"degllx61-vm_stop_0 deglxen001" -> "clone-nfs_stop_0" [ style = bold]
"degllx61-vm_stop_0 deglxen001" -> "load_stopped_deglxen001 deglxen001" [ style = bold]
"degllx61-vm_stop_0 deglxen001" [ style=bold color="green" fontcolor="black" ]
"degllx62-vm_migrate_from_0 deglxen001" -> "degllx62-vm_start_0 deglxen001" [ style = bold]
"degllx62-vm_migrate_from_0 deglxen001" -> "degllx62-vm_stop_0 deglxen002" [ style = bold]
"degllx62-vm_migrate_from_0 deglxen001" [ style=bold color="green" fontcolor="black"]
"degllx62-vm_migrate_to_0 deglxen002" -> "degllx62-vm_migrate_from_0 deglxen001" [ style = bold]
"degllx62-vm_migrate_to_0 deglxen002" [ style=bold color="green" fontcolor="black"]
"degllx62-vm_monitor_30000 deglxen001" [ style=bold color="green" fontcolor="black" ]
"degllx62-vm_start_0 deglxen001" -> "degllx62-vm_monitor_30000 deglxen001" [ style = bold]
"degllx62-vm_start_0 deglxen001" [ style=bold color="green" fontcolor="orange"]
"degllx62-vm_stop_0 deglxen002" -> "all_stopped" [ style = bold]
"degllx62-vm_stop_0 deglxen002" -> "clone-nfs_stop_0" [ style = bold]
"degllx62-vm_stop_0 deglxen002" -> "degllx62-vm_start_0 deglxen001" [ style = bold]
"degllx62-vm_stop_0 deglxen002" -> "load_stopped_deglxen002 deglxen002" [ style = bold]
"degllx62-vm_stop_0 deglxen002" [ style=bold color="green" fontcolor="black" ]
"grp-nfs:1_stop_0" -> "grp-nfs:1_stopped_0" [ style = bold]
"grp-nfs:1_stop_0" -> "nfs-xen_config:1_stop_0 deglxen002" [ style = bold]
"grp-nfs:1_stop_0" -> "nfs-xen_images:1_stop_0 deglxen002" [ style = bold]
"grp-nfs:1_stop_0" -> "nfs-xen_swapfiles:1_stop_0 deglxen002" [ style = bold]
"grp-nfs:1_stop_0" [ style=bold color="green" fontcolor="orange" ]
"grp-nfs:1_stopped_0" -> "clone-nfs_stopped_0" [ style = bold]
"grp-nfs:1_stopped_0" -> "prim-ping:0_stop_0 deglxen002" [ style = bold]
"grp-nfs:1_stopped_0" [ style=bold color="green" fontcolor="orange" ]
+"load_stopped_deglxen001 deglxen001" -> "degllx62-vm_migrate_to_0 deglxen002" [ style = bold]
"load_stopped_deglxen001 deglxen001" -> "degllx62-vm_start_0 deglxen001" [ style = bold]
"load_stopped_deglxen001 deglxen001" [ style=bold color="green" fontcolor="orange" ]
"load_stopped_deglxen002 deglxen002" [ style=bold color="green" fontcolor="orange" ]
"nfs-xen_config:1_stop_0 deglxen002" -> "all_stopped" [ style = bold]
"nfs-xen_config:1_stop_0 deglxen002" -> "grp-nfs:1_stopped_0" [ style = bold]
"nfs-xen_config:1_stop_0 deglxen002" [ style=bold color="green" fontcolor="black" ]
"nfs-xen_images:1_stop_0 deglxen002" -> "all_stopped" [ style = bold]
"nfs-xen_images:1_stop_0 deglxen002" -> "grp-nfs:1_stopped_0" [ style = bold]
"nfs-xen_images:1_stop_0 deglxen002" -> "nfs-xen_swapfiles:1_stop_0 deglxen002" [ style = bold]
"nfs-xen_images:1_stop_0 deglxen002" [ style=bold color="green" fontcolor="black" ]
"nfs-xen_swapfiles:1_stop_0 deglxen002" -> "all_stopped" [ style = bold]
"nfs-xen_swapfiles:1_stop_0 deglxen002" -> "grp-nfs:1_stopped_0" [ style = bold]
"nfs-xen_swapfiles:1_stop_0 deglxen002" -> "nfs-xen_config:1_stop_0 deglxen002" [ style = bold]
"nfs-xen_swapfiles:1_stop_0 deglxen002" [ style=bold color="green" fontcolor="black" ]
"prim-ping:0_stop_0 deglxen002" -> "all_stopped" [ style = bold]
"prim-ping:0_stop_0 deglxen002" -> "clone-ping_stopped_0" [ style = bold]
"prim-ping:0_stop_0 deglxen002" [ style=bold color="green" fontcolor="black" ]
}
diff --git a/pengine/test10/utilization-order4.exp b/pengine/test10/utilization-order4.exp
index 13ed62a05d..24dda90a38 100644
--- a/pengine/test10/utilization-order4.exp
+++ b/pengine/test10/utilization-order4.exp
@@ -1,280 +1,284 @@
-
+
+
+
+
+
diff --git a/pengine/test10/utilization-order4.summary b/pengine/test10/utilization-order4.summary
index 20fe903414..124483b8db 100644
--- a/pengine/test10/utilization-order4.summary
+++ b/pengine/test10/utilization-order4.summary
@@ -1,60 +1,60 @@
Current cluster status:
Node deglxen002: standby
Online: [ deglxen001 ]
degllx62-vm (ocf::heartbeat:Xen): Started deglxen002
degllx63-vm (ocf::heartbeat:Xen): Stopped
degllx61-vm (ocf::heartbeat:Xen): Started deglxen001
degllx64-vm (ocf::heartbeat:Xen): Stopped
stonith_sbd (stonith:external/sbd): Started deglxen001
Clone Set: clone-nfs [grp-nfs]
Started: [ deglxen001 deglxen002 ]
Clone Set: clone-ping [prim-ping]
Started: [ deglxen001 deglxen002 ]
Transition Summary:
* Migrate degllx62-vm (Started deglxen002 -> deglxen001)
* Stop degllx61-vm (deglxen001)
* Stop nfs-xen_config:1 (deglxen002)
* Stop nfs-xen_swapfiles:1 (deglxen002)
* Stop nfs-xen_images:1 (deglxen002)
* Stop prim-ping:1 (deglxen002)
Executing cluster transition:
- * Resource action: degllx62-vm migrate_to on deglxen002
* Resource action: degllx61-vm stop on deglxen001
* Pseudo action: load_stopped_deglxen001
+ * Resource action: degllx62-vm migrate_to on deglxen002
* Resource action: degllx62-vm migrate_from on deglxen001
* Resource action: degllx62-vm stop on deglxen002
* Pseudo action: clone-nfs_stop_0
* Pseudo action: load_stopped_deglxen002
* Pseudo action: degllx62-vm_start_0
* Pseudo action: grp-nfs:1_stop_0
* Resource action: nfs-xen_images:1 stop on deglxen002
* Resource action: degllx62-vm monitor=30000 on deglxen001
* Resource action: nfs-xen_swapfiles:1 stop on deglxen002
* Resource action: nfs-xen_config:1 stop on deglxen002
* Pseudo action: grp-nfs:1_stopped_0
* Pseudo action: clone-nfs_stopped_0
* Pseudo action: clone-ping_stop_0
* Resource action: prim-ping:0 stop on deglxen002
* Pseudo action: clone-ping_stopped_0
* Pseudo action: all_stopped
Revised cluster status:
Node deglxen002: standby
Online: [ deglxen001 ]
degllx62-vm (ocf::heartbeat:Xen): Started deglxen001
degllx63-vm (ocf::heartbeat:Xen): Stopped
degllx61-vm (ocf::heartbeat:Xen): Stopped deglxen002
degllx64-vm (ocf::heartbeat:Xen): Stopped
stonith_sbd (stonith:external/sbd): Started deglxen001
Clone Set: clone-nfs [grp-nfs]
Started: [ deglxen001 ]
Stopped: [ deglxen002 ]
Clone Set: clone-ping [prim-ping]
Started: [ deglxen001 ]
Stopped: [ deglxen002 ]