diff --git a/cts/scheduler/dot/colocation-priority-group.dot b/cts/scheduler/dot/colocation-priority-group.dot index df2aa3dc4ec..6e88e6b14dd 100644 --- a/cts/scheduler/dot/colocation-priority-group.dot +++ b/cts/scheduler/dot/colocation-priority-group.dot @@ -9,7 +9,7 @@ "group1_start_0" -> "member1a_start_0 node1" [ style = bold] "group1_start_0" -> "member1b_start_0 node1" [ style = bold] "group1_start_0" [ style=bold color="green" fontcolor="orange"] -"load_stopped_node1 node1" -> "rsc2_start_0 node1" [ style = bold] +"load_stopped_node1 node1" -> "rsc3_start_0 node1" [ style = bold] "load_stopped_node1 node1" [ style=bold color="green" fontcolor="orange"] "load_stopped_node2 node2" [ style=bold color="green" fontcolor="orange"] "member1a_monitor_0 node1" -> "member1a_start_0 node1" [ style = bold] @@ -29,15 +29,15 @@ "member1b_start_0 node1" -> "group1_running_0" [ style = bold] "member1b_start_0 node1" -> "member1b_monitor_10000 node1" [ style = bold] "member1b_start_0 node1" [ style=bold color="green" fontcolor="black"] -"rsc2_monitor_0 node1" -> "rsc2_start_0 node1" [ style = bold] "rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black"] -"rsc2_monitor_0 node2" -> "rsc2_start_0 node1" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc2_monitor_10000 node1" [ style=bold color="green" fontcolor="black"] -"rsc2_start_0 node1" -> "rsc2_monitor_10000 node1" [ style = bold] -"rsc2_start_0 node1" [ style=bold color="green" fontcolor="black"] +"rsc3_monitor_0 node1" -> "rsc3_start_0 node1" [ style = bold] "rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black"] +"rsc3_monitor_0 node2" -> "rsc3_start_0 node1" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black"] +"rsc3_monitor_10000 node1" [ style=bold color="green" fontcolor="black"] +"rsc3_start_0 node1" -> "rsc3_monitor_10000 node1" [ style = bold] +"rsc3_start_0 node1" [ style=bold color="green" fontcolor="black"] "rsc4_monitor_0 node1" -> "rsc4_start_0 node2" [ style = bold] "rsc4_monitor_0 node1" [ style=bold color="green" fontcolor="black"] "rsc4_monitor_0 node2" -> "rsc4_start_0 node2" [ style = bold] diff --git a/cts/scheduler/exp/colocation-priority-group.exp b/cts/scheduler/exp/colocation-priority-group.exp index cd3e88e5f40..ae79d836130 100644 --- a/cts/scheduler/exp/colocation-priority-group.exp +++ b/cts/scheduler/exp/colocation-priority-group.exp @@ -130,39 +130,21 @@ - - - - - - - - - - + - - - - - - - - - - + - + - - + + @@ -171,13 +153,31 @@ - + - + + + + + + + + + + + + + + + + + + + diff --git a/cts/scheduler/scores/colocation-priority-group.scores b/cts/scheduler/scores/colocation-priority-group.scores index 49d4e847b78..89028f60466 100644 --- a/cts/scheduler/scores/colocation-priority-group.scores +++ b/cts/scheduler/scores/colocation-priority-group.scores @@ -11,9 +11,9 @@ pcmk__primitive_assign: member1a allocation score on node1: 0 pcmk__primitive_assign: member1a allocation score on node2: -4000 pcmk__primitive_assign: member1b allocation score on node1: 0 pcmk__primitive_assign: member1b allocation score on node2: -INFINITY -pcmk__primitive_assign: rsc2 allocation score on node1: 0 +pcmk__primitive_assign: rsc2 allocation score on node1: 16 pcmk__primitive_assign: rsc2 allocation score on node2: 0 -pcmk__primitive_assign: rsc3 allocation score on node1: 16 +pcmk__primitive_assign: rsc3 allocation score on node1: 0 pcmk__primitive_assign: rsc3 allocation score on node2: 0 pcmk__primitive_assign: rsc4 allocation score on node1: 0 pcmk__primitive_assign: rsc4 allocation score on node2: 0 diff --git a/cts/scheduler/summary/colocation-priority-group.summary b/cts/scheduler/summary/colocation-priority-group.summary index 8ac20e2dcd7..3a7cf2aee5c 100644 --- a/cts/scheduler/summary/colocation-priority-group.summary +++ b/cts/scheduler/summary/colocation-priority-group.summary @@ -14,7 +14,7 @@ Current cluster status: Transition Summary: * Start member1a ( node1 ) * Start member1b ( node1 ) - * Start rsc2 ( node1 ) + * Start rsc3 ( node1 ) * Move Fencing ( node1 -> node2 ) * Start rsc4 ( node2 ) @@ -35,13 +35,13 @@ Executing Cluster Transition: * Pseudo action: load_stopped_node1 * Resource action: member1a start on node1 * Resource action: member1b start on node1 - * Resource action: rsc2 start on node1 + * Resource action: rsc3 start on node1 * Resource action: Fencing start on node2 * Resource action: rsc4 start on node2 * Pseudo action: group1_running_0 * Resource action: member1a monitor=10000 on node1 * Resource action: member1b monitor=10000 on node1 - * Resource action: rsc2 monitor=10000 on node1 + * Resource action: rsc3 monitor=10000 on node1 * Resource action: Fencing monitor=120000 on node2 * Resource action: rsc4 monitor=10000 on node2 @@ -53,7 +53,7 @@ Revised Cluster Status: * Resource Group: group1: * member1a (ocf:pacemaker:Dummy): Started node1 * member1b (ocf:pacemaker:Dummy): Started node1 - * rsc3 (ocf:pacemaker:Dummy): Stopped - * rsc2 (ocf:pacemaker:Dummy): Started node1 + * rsc3 (ocf:pacemaker:Dummy): Started node1 + * rsc2 (ocf:pacemaker:Dummy): Stopped * Fencing (stonith:fence_xvm): Started node2 * rsc4 (ocf:pacemaker:Dummy): Started node2