Skip to content

[WIP] allow attribute based self-colocation of promotable roles #4166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wenningerk wants to merge 4 commits into
base: 2.1
Choose a base branch
from
+1,671 −30
Open

[WIP] allow attribute based self-colocation of promotable roles #4166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c16fa5f
Test: scheduler: promoted state with promoted state with attribute
wenningerk Aug 18, 2026
9f62d96
Fix: scheduler: promoted state with promoted state with attribute
wenningerk Aug 18, 2026
ec2a25a
Test: scheduler: check for self-colocation of promotable role with at…
wenningerk Aug 17, 2026
8a25a6e
Feature: scheduler: allow self-colocation of promotable role with att…
wenningerk Aug 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions cts/cts-scheduler.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,7 @@ TESTS = [
[ "no_quorum_demote", "Promotable demotion and primitive stop with no-quorum-policy=\"demote\"" ],
[ "no-promote-on-unrunnable-guest", "Don't select bundle instance for promotion when container can't run" ],
[ "leftover-pending-monitor", "Prevent a leftover pending monitor from causing unexpected stop of other instances" ],
[ "promotable-colocation-with-node-attribute", "Promote dependent clone on nodes belonging to a site that has a primary clone promoted" ],
],
[
[ "history-1", "Correctly parse stateful-1 resource state" ],
Expand Down Expand Up @@ -747,6 +748,12 @@ TESTS = [
"Verify ordered sets work with symmetrical=true" ],
[ "clbz5007-promotable-colocation",
"Verify use of colocation scores other than INFINITY and -INFINITY work on multi-state resources" ],
[ "promotable-self-colocation-with-node-attribute",
"Group promotions on a single site via self-colocation with node attribute" ],
[ "promotable-self-colocation-with-node-attribute-2",
"Group promotions on siteB (not siteA) via self-colocation with node attribute" ],
[ "promotable-self-colocation-with-node-attribute-3",
"Correct wrong-site promotions via self-colocation with node attribute" ],
[ "bug-5038", "Prevent restart of anonymous clones when clone-max decreases" ],
[ "bug-5025-1", "Automatically clean up failcount after resource config change with reload" ],
[ "bug-5025-2", "Make sure clear failcount action isn't set when config does not change" ],
Expand Down
28 changes: 28 additions & 0 deletions cts/scheduler/dot/promotable-colocation-with-node-attribute.dot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
digraph "g" {
"dependent-clone_demote_0" -> "dependent-clone_demoted_0" [ style = bold]
"dependent-clone_demote_0" -> "dependent-rsc_demote_0 node3" [ style = bold]
"dependent-clone_demote_0" [ style=bold color="green" fontcolor="orange"]
"dependent-clone_demoted_0" -> "dependent-clone_promote_0" [ style = bold]
"dependent-clone_demoted_0" [ style=bold color="green" fontcolor="orange"]
"dependent-clone_promote_0" -> "dependent-rsc_promote_0 node1" [ style = bold]
"dependent-clone_promote_0" -> "dependent-rsc_promote_0 node2" [ style = bold]
"dependent-clone_promote_0" [ style=bold color="green" fontcolor="orange"]
"dependent-clone_promoted_0" [ style=bold color="green" fontcolor="orange"]
"dependent-rsc_demote_0 node3" -> "dependent-clone_demoted_0" [ style = bold]
"dependent-rsc_demote_0 node3" -> "dependent-rsc_monitor_11000 node3" [ style = bold]
"dependent-rsc_demote_0 node3" [ style=bold color="green" fontcolor="black"]
"dependent-rsc_monitor_10000 node1" [ style=bold color="green" fontcolor="black"]
"dependent-rsc_monitor_10000 node2" [ style=bold color="green" fontcolor="black"]
"dependent-rsc_monitor_11000 node3" [ style=bold color="green" fontcolor="black"]
"dependent-rsc_monitor_11000 node4" [ style=bold color="green" fontcolor="black"]
"dependent-rsc_promote_0 node1" -> "dependent-clone_promoted_0" [ style = bold]
"dependent-rsc_promote_0 node1" -> "dependent-rsc_monitor_10000 node1" [ style = bold]
"dependent-rsc_promote_0 node1" [ style=bold color="green" fontcolor="black"]
"dependent-rsc_promote_0 node2" -> "dependent-clone_promoted_0" [ style = bold]
"dependent-rsc_promote_0 node2" -> "dependent-rsc_monitor_10000 node2" [ style = bold]
"dependent-rsc_promote_0 node2" [ style=bold color="green" fontcolor="black"]
"primary-rsc_monitor_10000 node1" [ style=bold color="green" fontcolor="black"]
"primary-rsc_monitor_11000 node2" [ style=bold color="green" fontcolor="black"]
"primary-rsc_monitor_11000 node3" [ style=bold color="green" fontcolor="black"]
"primary-rsc_monitor_11000 node4" [ style=bold color="green" fontcolor="black"]
}
16 changes: 16 additions & 0 deletions cts/scheduler/dot/promotable-self-colocation-with-node-attribute-2.dot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
digraph "g" {
"site-clone_promote_0" -> "site-rsc_promote_0 node3" [ style = bold]
"site-clone_promote_0" -> "site-rsc_promote_0 node4" [ style = bold]
"site-clone_promote_0" [ style=bold color="green" fontcolor="orange"]
"site-clone_promoted_0" [ style=bold color="green" fontcolor="orange"]
"site-rsc_monitor_10000 node3" [ style=bold color="green" fontcolor="black"]
"site-rsc_monitor_10000 node4" [ style=bold color="green" fontcolor="black"]
"site-rsc_monitor_11000 node1" [ style=bold color="green" fontcolor="black"]
"site-rsc_monitor_11000 node2" [ style=bold color="green" fontcolor="black"]
"site-rsc_promote_0 node3" -> "site-clone_promoted_0" [ style = bold]
"site-rsc_promote_0 node3" -> "site-rsc_monitor_10000 node3" [ style = bold]
"site-rsc_promote_0 node3" [ style=bold color="green" fontcolor="black"]
"site-rsc_promote_0 node4" -> "site-clone_promoted_0" [ style = bold]
"site-rsc_promote_0 node4" -> "site-rsc_monitor_10000 node4" [ style = bold]
"site-rsc_promote_0 node4" [ style=bold color="green" fontcolor="black"]
}
28 changes: 28 additions & 0 deletions cts/scheduler/dot/promotable-self-colocation-with-node-attribute-3.dot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
digraph "g" {
"site-clone_demote_0" -> "site-clone_demoted_0" [ style = bold]
"site-clone_demote_0" -> "site-rsc_demote_0 node3" [ style = bold]
"site-clone_demote_0" -> "site-rsc_demote_0 node4" [ style = bold]
"site-clone_demote_0" [ style=bold color="green" fontcolor="orange"]
"site-clone_demoted_0" -> "site-clone_promote_0" [ style = bold]
"site-clone_demoted_0" [ style=bold color="green" fontcolor="orange"]
"site-clone_promote_0" -> "site-rsc_promote_0 node1" [ style = bold]
"site-clone_promote_0" -> "site-rsc_promote_0 node2" [ style = bold]
"site-clone_promote_0" [ style=bold color="green" fontcolor="orange"]
"site-clone_promoted_0" [ style=bold color="green" fontcolor="orange"]
"site-rsc_demote_0 node3" -> "site-clone_demoted_0" [ style = bold]
"site-rsc_demote_0 node3" -> "site-rsc_monitor_11000 node3" [ style = bold]
"site-rsc_demote_0 node3" [ style=bold color="green" fontcolor="black"]
"site-rsc_demote_0 node4" -> "site-clone_demoted_0" [ style = bold]
"site-rsc_demote_0 node4" -> "site-rsc_monitor_11000 node4" [ style = bold]
"site-rsc_demote_0 node4" [ style=bold color="green" fontcolor="black"]
"site-rsc_monitor_10000 node1" [ style=bold color="green" fontcolor="black"]
"site-rsc_monitor_10000 node2" [ style=bold color="green" fontcolor="black"]
"site-rsc_monitor_11000 node3" [ style=bold color="green" fontcolor="black"]
"site-rsc_monitor_11000 node4" [ style=bold color="green" fontcolor="black"]
"site-rsc_promote_0 node1" -> "site-clone_promoted_0" [ style = bold]
"site-rsc_promote_0 node1" -> "site-rsc_monitor_10000 node1" [ style = bold]
"site-rsc_promote_0 node1" [ style=bold color="green" fontcolor="black"]
"site-rsc_promote_0 node2" -> "site-clone_promoted_0" [ style = bold]
"site-rsc_promote_0 node2" -> "site-rsc_monitor_10000 node2" [ style = bold]
"site-rsc_promote_0 node2" [ style=bold color="green" fontcolor="black"]
}
16 changes: 16 additions & 0 deletions cts/scheduler/dot/promotable-self-colocation-with-node-attribute.dot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
digraph "g" {
"site-clone_promote_0" -> "site-rsc_promote_0 node1" [ style = bold]
"site-clone_promote_0" -> "site-rsc_promote_0 node2" [ style = bold]
"site-clone_promote_0" [ style=bold color="green" fontcolor="orange"]
"site-clone_promoted_0" [ style=bold color="green" fontcolor="orange"]
"site-rsc_monitor_10000 node1" [ style=bold color="green" fontcolor="black"]
"site-rsc_monitor_10000 node2" [ style=bold color="green" fontcolor="black"]
"site-rsc_monitor_11000 node3" [ style=bold color="green" fontcolor="black"]
"site-rsc_monitor_11000 node4" [ style=bold color="green" fontcolor="black"]
"site-rsc_promote_0 node1" -> "site-clone_promoted_0" [ style = bold]
"site-rsc_promote_0 node1" -> "site-rsc_monitor_10000 node1" [ style = bold]
"site-rsc_promote_0 node1" [ style=bold color="green" fontcolor="black"]
"site-rsc_promote_0 node2" -> "site-clone_promoted_0" [ style = bold]
"site-rsc_promote_0 node2" -> "site-rsc_monitor_10000 node2" [ style = bold]
"site-rsc_promote_0 node2" [ style=bold color="green" fontcolor="black"]
}
Loading