Permalink
Browse files

Low: pengine: Regression test updates

  • Loading branch information...
1 parent de446b6 commit dd7599e0641ab8b32374fd9b3e017ef6f89acfaf @davidvossel davidvossel committed Mar 3, 2014
Showing with 27 additions and 53 deletions.
  1. +6 −10 pengine/test10/remote-move.dot
  2. +17 −37 pengine/test10/remote-move.exp
  3. +4 −6 pengine/test10/remote-move.summary
@@ -1,17 +1,13 @@
digraph "g" {
-"FAKE2_monitor_60000 remote1" [ style=bold color="green" fontcolor="black"]
-"FAKE2_start_0 remote1" -> "FAKE2_monitor_60000 remote1" [ style = bold]
-"FAKE2_start_0 remote1" [ style=bold color="green" fontcolor="black"]
-"FAKE2_stop_0 remote1" -> "FAKE2_start_0 remote1" [ style = bold]
-"FAKE2_stop_0 remote1" -> "all_stopped" [ style = bold]
-"FAKE2_stop_0 remote1" -> "remote1_stop_0 18builder" [ style = bold]
-"FAKE2_stop_0 remote1" [ style=bold color="green" fontcolor="black"]
"all_stopped" [ style=bold color="green" fontcolor="orange"]
+"remote1_migrate_from_0 18node1" -> "remote1_start_0 18node1" [ style = bold]
+"remote1_migrate_from_0 18node1" -> "remote1_stop_0 18builder" [ style = bold]
+"remote1_migrate_from_0 18node1" [ style=bold color="green" fontcolor="black"]
+"remote1_migrate_to_0 18builder" -> "remote1_migrate_from_0 18node1" [ style = bold]
+"remote1_migrate_to_0 18builder" [ style=bold color="green" fontcolor="black"]
"remote1_monitor_60000 18node1" [ style=bold color="green" fontcolor="black"]
-"remote1_start_0 18node1" -> "FAKE2_monitor_60000 remote1" [ style = bold]
-"remote1_start_0 18node1" -> "FAKE2_start_0 remote1" [ style = bold]
"remote1_start_0 18node1" -> "remote1_monitor_60000 18node1" [ style = bold]
-"remote1_start_0 18node1" [ style=bold color="green" fontcolor="black"]
+"remote1_start_0 18node1" [ style=bold color="green" fontcolor="orange"]
"remote1_stop_0 18builder" -> "all_stopped" [ style = bold]
"remote1_stop_0 18builder" -> "remote1_start_0 18node1" [ style = bold]
"remote1_stop_0 18builder" [ style=bold color="green" fontcolor="black"]
@@ -36,85 +36,68 @@
</synapse>
<synapse id="3">
<action_set>
- <rsc_op id="19" operation="monitor" operation_key="remote1_monitor_60000" on_node="18node1" on_node_uuid="1">
+ <rsc_op id="21" operation="migrate_from" operation_key="remote1_migrate_from_0" on_node="18node1" on_node_uuid="1">
<primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
- <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+ <attributes CRM_meta_migrate_source="18builder" CRM_meta_migrate_target="18node1" CRM_meta_timeout="20000" />
</rsc_op>
</action_set>
<inputs>
<trigger>
- <rsc_op id="18" operation="start" operation_key="remote1_start_0" on_node="18node1" on_node_uuid="1"/>
+ <rsc_op id="20" operation="migrate_to" operation_key="remote1_migrate_to_0" on_node="18builder" on_node_uuid="5"/>
</trigger>
</inputs>
</synapse>
<synapse id="4">
<action_set>
- <rsc_op id="18" operation="start" operation_key="remote1_start_0" on_node="18node1" on_node_uuid="1">
+ <rsc_op id="20" operation="migrate_to" operation_key="remote1_migrate_to_0" on_node="18builder" on_node_uuid="5">
<primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
- <attributes CRM_meta_timeout="20000" />
+ <attributes CRM_meta_migrate_source="18builder" CRM_meta_migrate_target="18node1" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
</rsc_op>
</action_set>
- <inputs>
- <trigger>
- <rsc_op id="17" operation="stop" operation_key="remote1_stop_0" on_node="18builder" on_node_uuid="5"/>
- </trigger>
- </inputs>
+ <inputs/>
</synapse>
<synapse id="5">
<action_set>
- <rsc_op id="17" operation="stop" operation_key="remote1_stop_0" on_node="18builder" on_node_uuid="5">
+ <rsc_op id="19" operation="monitor" operation_key="remote1_monitor_60000" on_node="18node1" on_node_uuid="1">
<primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
- <attributes CRM_meta_timeout="20000" />
+ <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
</rsc_op>
</action_set>
<inputs>
<trigger>
- <rsc_op id="22" operation="stop" operation_key="FAKE2_stop_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/>
+ <pseudo_event id="18" operation="start" operation_key="remote1_start_0"/>
</trigger>
</inputs>
</synapse>
<synapse id="6">
<action_set>
- <rsc_op id="23" operation="start" operation_key="FAKE2_start_0" on_node="remote1" on_node_uuid="remote1" router_node="18node1">
- <primitive id="FAKE2" class="ocf" provider="heartbeat" type="Dummy"/>
+ <pseudo_event id="18" operation="start" operation_key="remote1_start_0">
<attributes CRM_meta_timeout="20000" />
- </rsc_op>
+ </pseudo_event>
</action_set>
<inputs>
<trigger>
- <rsc_op id="18" operation="start" operation_key="remote1_start_0" on_node="18node1" on_node_uuid="1"/>
+ <rsc_op id="17" operation="stop" operation_key="remote1_stop_0" on_node="18builder" on_node_uuid="5"/>
</trigger>
<trigger>
- <rsc_op id="22" operation="stop" operation_key="FAKE2_stop_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/>
+ <rsc_op id="21" operation="migrate_from" operation_key="remote1_migrate_from_0" on_node="18node1" on_node_uuid="1"/>
</trigger>
</inputs>
</synapse>
<synapse id="7">
<action_set>
- <rsc_op id="22" operation="stop" operation_key="FAKE2_stop_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder">
- <primitive id="FAKE2" class="ocf" provider="heartbeat" type="Dummy"/>
+ <rsc_op id="17" operation="stop" operation_key="remote1_stop_0" on_node="18builder" on_node_uuid="5">
+ <primitive id="remote1" class="ocf" provider="pacemaker" type="remote"/>
<attributes CRM_meta_timeout="20000" />
</rsc_op>
</action_set>
- <inputs/>
- </synapse>
- <synapse id="8">
- <action_set>
- <rsc_op id="6" operation="monitor" operation_key="FAKE2_monitor_60000" on_node="remote1" on_node_uuid="remote1" router_node="18node1">
- <primitive id="FAKE2" class="ocf" provider="heartbeat" type="Dummy"/>
- <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
- </rsc_op>
- </action_set>
<inputs>
<trigger>
- <rsc_op id="18" operation="start" operation_key="remote1_start_0" on_node="18node1" on_node_uuid="1"/>
- </trigger>
- <trigger>
- <rsc_op id="23" operation="start" operation_key="FAKE2_start_0" on_node="remote1" on_node_uuid="remote1" router_node="18node1"/>
+ <rsc_op id="21" operation="migrate_from" operation_key="remote1_migrate_from_0" on_node="18node1" on_node_uuid="1"/>
</trigger>
</inputs>
</synapse>
- <synapse id="9">
+ <synapse id="8">
<action_set>
<pseudo_event id="7" operation="all_stopped" operation_key="all_stopped">
<attributes />
@@ -127,9 +110,6 @@
<trigger>
<rsc_op id="17" operation="stop" operation_key="remote1_stop_0" on_node="18builder" on_node_uuid="5"/>
</trigger>
- <trigger>
- <rsc_op id="22" operation="stop" operation_key="FAKE2_stop_0" on_node="remote1" on_node_uuid="remote1" router_node="18builder"/>
- </trigger>
</inputs>
</synapse>
</transition_graph>
@@ -12,19 +12,17 @@ RemoteOnline: [ remote1 ]
Transition Summary:
* Move shooter (Started 18node1 -> 18builder)
- * Move remote1 (Started 18builder -> 18node1)
- * Restart FAKE2 (Started remote1)
+ * Migrate remote1 (Started 18builder -> 18node1)
Executing cluster transition:
* Resource action: shooter stop on 18node1
- * Resource action: FAKE2 stop on remote1
+ * Resource action: remote1 migrate_to on 18builder
* Resource action: shooter start on 18builder
+ * Resource action: remote1 migrate_from on 18node1
* Resource action: remote1 stop on 18builder
* Pseudo action: all_stopped
* Resource action: shooter monitor=60000 on 18builder
- * Resource action: remote1 start on 18node1
- * Resource action: FAKE2 start on remote1
- * Resource action: FAKE2 monitor=60000 on remote1
+ * Pseudo action: remote1_start_0
* Resource action: remote1 monitor=60000 on 18node1
Revised cluster status:

0 comments on commit dd7599e

Please sign in to comment.