Skip to content

Commit

Permalink
Merge pull request #2929 from kgaillot/groups
Browse files Browse the repository at this point in the history 
Fix a colocation corner case
  • Loading branch information
@kgaillot
kgaillot authored Nov 14, 2022
2 parents 4b5789d + 721670a commit 7abf528
Show file tree
Hide file tree
Showing 13 changed files with 748 additions and 36 deletions.
1 change: 1 addition & 0 deletions cts/cts-scheduler.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ TESTS = [
[ "colocation-influence", "Respect colocation influence" ],
[ "colocation-priority-group", "Apply group colocations in order of primary priority" ],
[ "colocation-vs-stickiness", "Group stickiness outweighs anti-colocation score" ],
[ "promoted-with-blocked", "Promoted role colocated with a resource with blocked start" ],
],
[
[ "rsc-sets-seq-true", "Resource Sets - sequential=false" ],
Expand Down
63 changes: 63 additions & 0 deletions cts/scheduler/dot/promoted-with-blocked.dot
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
digraph "g" {
"rsc1_monitor_0 node1" -> "rsc1_start_0 node2" [ style = dashed]
"rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black"]
"rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = dashed]
"rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black"]
"rsc1_monitor_0 node3" -> "rsc1_start_0 node2" [ style = dashed]
"rsc1_monitor_0 node3" [ style=bold color="green" fontcolor="black"]
"rsc1_monitor_0 node4" -> "rsc1_start_0 node2" [ style = dashed]
"rsc1_monitor_0 node4" [ style=bold color="green" fontcolor="black"]
"rsc1_monitor_0 node5" -> "rsc1_start_0 node2" [ style = dashed]
"rsc1_monitor_0 node5" [ style=bold color="green" fontcolor="black"]
"rsc1_monitor_10000 node2" [ style=dashed color="red" fontcolor="black"]
"rsc1_start_0 node2" -> "rsc1_monitor_10000 node2" [ style = dashed]
"rsc1_start_0 node2" [ style=dashed color="red" fontcolor="black"]
"rsc2-clone_promote_0" -> "rsc2:4_promote_0 node2" [ style = dashed]
"rsc2-clone_promote_0" [ style=dashed color="red" fontcolor="orange"]
"rsc2-clone_promoted_0" [ style=dashed color="red" fontcolor="orange"]
"rsc2-clone_running_0" -> "rsc2-clone_promote_0" [ style = dashed]
"rsc2-clone_running_0" [ style=bold color="green" fontcolor="orange"]
"rsc2-clone_start_0" -> "rsc2-clone_running_0" [ style = bold]
"rsc2-clone_start_0" -> "rsc2:0_start_0 node3" [ style = bold]
"rsc2-clone_start_0" -> "rsc2:1_start_0 node4" [ style = bold]
"rsc2-clone_start_0" -> "rsc2:2_start_0 node5" [ style = bold]
"rsc2-clone_start_0" -> "rsc2:3_start_0 node1" [ style = bold]
"rsc2-clone_start_0" -> "rsc2:4_start_0 node2" [ style = bold]
"rsc2-clone_start_0" [ style=bold color="green" fontcolor="orange"]
"rsc2:0_monitor_0 node3" -> "rsc2-clone_start_0" [ style = bold]
"rsc2:0_monitor_0 node3" [ style=bold color="green" fontcolor="black"]
"rsc2:0_monitor_10000 node3" [ style=bold color="green" fontcolor="black"]
"rsc2:0_start_0 node3" -> "rsc2-clone_running_0" [ style = bold]
"rsc2:0_start_0 node3" -> "rsc2:0_monitor_10000 node3" [ style = bold]
"rsc2:0_start_0 node3" [ style=bold color="green" fontcolor="black"]
"rsc2:1_monitor_0 node4" -> "rsc2-clone_start_0" [ style = bold]
"rsc2:1_monitor_0 node4" [ style=bold color="green" fontcolor="black"]
"rsc2:1_monitor_10000 node4" [ style=bold color="green" fontcolor="black"]
"rsc2:1_start_0 node4" -> "rsc2-clone_running_0" [ style = bold]
"rsc2:1_start_0 node4" -> "rsc2:1_monitor_10000 node4" [ style = bold]
"rsc2:1_start_0 node4" [ style=bold color="green" fontcolor="black"]
"rsc2:2_monitor_0 node5" -> "rsc2-clone_start_0" [ style = bold]
"rsc2:2_monitor_0 node5" [ style=bold color="green" fontcolor="black"]
"rsc2:2_monitor_10000 node5" [ style=bold color="green" fontcolor="black"]
"rsc2:2_start_0 node5" -> "rsc2-clone_running_0" [ style = bold]
"rsc2:2_start_0 node5" -> "rsc2:2_monitor_10000 node5" [ style = bold]
"rsc2:2_start_0 node5" [ style=bold color="green" fontcolor="black"]
"rsc2:3_monitor_0 node1" -> "rsc2-clone_start_0" [ style = bold]
"rsc2:3_monitor_0 node1" [ style=bold color="green" fontcolor="black"]
"rsc2:3_monitor_10000 node1" [ style=bold color="green" fontcolor="black"]
"rsc2:3_start_0 node1" -> "rsc2-clone_running_0" [ style = bold]
"rsc2:3_start_0 node1" -> "rsc2:3_monitor_10000 node1" [ style = bold]
"rsc2:3_start_0 node1" [ style=bold color="green" fontcolor="black"]
"rsc2:4_monitor_0 node2" -> "rsc2-clone_start_0" [ style = bold]
"rsc2:4_monitor_0 node2" [ style=bold color="green" fontcolor="black"]
"rsc2:4_promote_0 node2" -> "rsc2-clone_promoted_0" [ style = dashed]
"rsc2:4_promote_0 node2" [ style=dashed color="red" fontcolor="black"]
"rsc2:4_start_0 node2" -> "rsc2-clone_running_0" [ style = bold]
"rsc2:4_start_0 node2" -> "rsc2:4_promote_0 node2" [ style = dashed]
"rsc2:4_start_0 node2" [ style=bold color="green" fontcolor="black"]
"rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black"]
"rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black"]
"rsc3_monitor_0 node3" [ style=bold color="green" fontcolor="black"]
"rsc3_monitor_0 node4" [ style=bold color="green" fontcolor="black"]
"rsc3_monitor_0 node5" [ style=bold color="green" fontcolor="black"]
}
Loading

0 comments on commit 7abf528

Please sign in to comment.