diff --git a/pengine/test10/migrate-begin.dot b/pengine/test10/migrate-begin.dot index 36c3acd0b8..b7424a8e5d 100644 --- a/pengine/test10/migrate-begin.dot +++ b/pengine/test10/migrate-begin.dot @@ -1,16 +1,15 @@ 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_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 fa817f3353..a19bb7b09a 100644 --- a/pengine/test10/migrate-begin.exp +++ b/pengine/test10/migrate-begin.exp @@ -1,89 +1,85 @@ - - - - - + diff --git a/pengine/test10/migrate-begin.summary b/pengine/test10/migrate-begin.summary index b4b58703f1..3dea03a7fb 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: - * Pseudo action: load_stopped_hex-13 * Resource action: test-vm migrate_to on hex-14 + * Pseudo action: load_stopped_hex-13 * 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/utilization-order3.dot b/pengine/test10/utilization-order3.dot index 9d9c4d2646..84659beccf 100644 --- a/pengine/test10/utilization-order3.dot +++ b/pengine/test10/utilization-order3.dot @@ -1,20 +1,19 @@ 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_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 d8e0dfc057..2975e70050 100644 --- a/pengine/test10/utilization-order3.exp +++ b/pengine/test10/utilization-order3.exp @@ -1,118 +1,114 @@ - - - - - + diff --git a/pengine/test10/utilization-order3.summary b/pengine/test10/utilization-order3.summary index cfeea48924..23411ee578 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: - * Pseudo action: load_stopped_node2 * Resource action: rsc1 migrate_to on node1 + * Pseudo action: load_stopped_node2 * 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 8f4ee501e5..7439bd9846 100644 --- a/pengine/test10/utilization-order4.dot +++ b/pengine/test10/utilization-order4.dot @@ -1,54 +1,53 @@ 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_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 8a3557ecf8..078b5733de 100644 --- a/pengine/test10/utilization-order4.exp +++ b/pengine/test10/utilization-order4.exp @@ -1,281 +1,277 @@ - - - - - + diff --git a/pengine/test10/utilization-order4.summary b/pengine/test10/utilization-order4.summary index 469bd4bf99..22a9610507 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: [ grp-nfs:1 ] Clone Set: clone-ping [prim-ping] Started: [ deglxen001 ] Stopped: [ prim-ping:1 ]