diff --git a/pengine/test10/attrs3.dot b/pengine/test10/attrs3.dot index dd70181e3f..3c278fbb52 100644 --- a/pengine/test10/attrs3.dot +++ b/pengine/test10/attrs3.dot @@ -1,13 +1,13 @@ digraph "g" { "probe_complete node1" -> "probe_complete" [ style = bold] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node2" -> "probe_complete" [ style = bold] "probe_complete node2" [ style=bold color="green" fontcolor="black" ] -"probe_complete" -> "rsc1_start_0 node2" [ style = bold] +"probe_complete" -> "rsc1_start_0 node1" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ] +"rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/attrs3.exp b/pengine/test10/attrs3.exp index 528ab040f6..cb326f48f6 100644 --- a/pengine/test10/attrs3.exp +++ b/pengine/test10/attrs3.exp @@ -1,73 +1,73 @@ <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0"> <synapse id="0"> <action_set> <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"> <primitive id="rsc1" long-id="rsc1" class="heartbeat" type="apache"/> <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.1"/> </rsc_op> </action_set> <inputs/> </synapse> <synapse id="1"> <action_set> <rsc_op id="6" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"> <primitive id="rsc1" long-id="rsc1" class="heartbeat" type="apache"/> <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.1"/> </rsc_op> </action_set> <inputs/> </synapse> <synapse id="2"> <action_set> - <rsc_op id="7" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="uuid2"> + <rsc_op id="7" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="uuid1"> <primitive id="rsc1" long-id="rsc1" class="heartbeat" type="apache"/> <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.1"/> </rsc_op> </action_set> <inputs> <trigger> <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/> </trigger> </inputs> </synapse> <synapse id="3"> <action_set> <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"> <attributes crm_feature_set="3.0.1"/> </pseudo_event> </action_set> <inputs> <trigger> <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"/> </trigger> <trigger> <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"/> </trigger> </inputs> </synapse> <synapse id="4" priority="1000000"> <action_set> <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="uuid1"> <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.1"/> </rsc_op> </action_set> <inputs> <trigger> <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"/> </trigger> </inputs> </synapse> <synapse id="5" priority="1000000"> <action_set> <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="uuid2"> <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.1"/> </rsc_op> </action_set> <inputs> <trigger> <rsc_op id="6" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/> </trigger> </inputs> </synapse> </transition_graph> diff --git a/pengine/test10/attrs3.scores b/pengine/test10/attrs3.scores index 474fc40fd8..b5d8e26719 100644 --- a/pengine/test10/attrs3.scores +++ b/pengine/test10/attrs3.scores @@ -1,3 +1,3 @@ Allocation scores: -native_color: rsc1 allocation score on node2: 1 native_color: rsc1 allocation score on node1: 1 +native_color: rsc1 allocation score on node2: 1