Skip to content
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

Allow assigning resources to nodes with finite negative scores #3802

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
+3,476 −3,395
Open

Allow assigning resources to nodes with finite negative scores #3802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ae46153
Refactor: scheduler: convert boolean arguments to flags
kgaillot Jan 14, 2025
68181f4
Refactor: scheduler: use pcmk__node_available() in more places
kgaillot Jan 14, 2025
8aca980
Refactor: scheduler: make guest check a node availablity option
kgaillot Jan 14, 2025
fa3345b
Refactor: scheduler: make positive score check a node availablity option
kgaillot Jan 14, 2025
247609b
Refactor: scheduler: add option for disallowing banned nodes
kgaillot Jan 15, 2025
d48abd1
Fix: scheduler: allow assigning to nodes with finite negative scores
kgaillot Jan 15, 2025
5f72eec
Test: cts-scheduler: update tests for assignment change
kgaillot Jan 15, 2025
c475296
Refactor: scheduler: allow pcmk__any_node_available() to take flags
kgaillot Jan 15, 2025
72e5f98
Doc: scheduler: add TODO
kgaillot Jan 15, 2025
03559af
Refactor: scheduler: sort clone children only when needed
kgaillot Jan 15, 2025
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
1 change: 0 additions & 1 deletion cts/scheduler/dot/node-maintenance-1.dot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
digraph "g" {
"Cancel rsc2_monitor_10000 node2" [ style=bold color="green" fontcolor="black"]
"rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black"]
}
3 changes: 3 additions & 0 deletions cts/scheduler/dot/systemhealthp2.dot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
"nfs_1_start_0 hs21c" [ style=bold color="green" fontcolor="black"]
"stonith 'reboot' hs21d" -> "apache_1_start_0 hs21c" [ style = bold]
"stonith 'reboot' hs21d" -> "nfs_1_start_0 hs21c" [ style = bold]
"stonith 'reboot' hs21d" -> "stonith-1_start_0 hs21c" [ style = bold]
"stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"]
"stonith-1_monitor_0 hs21c" -> "stonith-1_start_0 hs21c" [ style = bold]
"stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black"]
"stonith-1_start_0 hs21c" [ style=bold color="green" fontcolor="black"]
}
4 changes: 2 additions & 2 deletions cts/scheduler/exp/1494.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="1">
<synapse id="0">
<action_set>
<rsc_op id="1" operation="stop" operation_key="ima_rscid:0_stop_0" on_node="hb1" on_node_uuid="1ce670eb-d670-4f6d-811f-d415ffde76b7">
<rsc_op id="3" operation="stop" operation_key="ima_rscid:0_stop_0" on_node="hb1" on_node_uuid="1ce670eb-d670-4f6d-811f-d415ffde76b7">
<primitive id="ima_rscid:0" class="ocf" provider="heartbeat" type="Dummy"/>
<attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hb1" CRM_meta_on_node_uuid="1ce670eb-d670-4f6d-811f-d415ffde76b7" CRM_meta_timeout="20000" target_role="started"/>
</rsc_op>
Expand All @@ -20,7 +20,7 @@
</action_set>
<inputs>
<trigger>
<rsc_op id="1" operation="stop" operation_key="ima_rscid:0_stop_0" on_node="hb1" on_node_uuid="1ce670eb-d670-4f6d-811f-d415ffde76b7"/>
<rsc_op id="3" operation="stop" operation_key="ima_rscid:0_stop_0" on_node="hb1" on_node_uuid="1ce670eb-d670-4f6d-811f-d415ffde76b7"/>
</trigger>
<trigger>
<pseudo_event id="6" operation="stop" operation_key="ima_cloneid_stop_0"/>
Expand Down
30 changes: 15 additions & 15 deletions cts/scheduler/exp/594.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@
</synapse>
<synapse id="9">
<action_set>
<rsc_op id="24" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
<primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
<attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_timeout="20000" hostlist="hadev3 hadev2 hadev1 "/>
<rsc_op id="26" operation="stop" operation_key="child_DoFencing:2_stop_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
<primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
<attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_timeout="20000" hostlist="hadev3 hadev2 hadev1 "/>
</rsc_op>
</action_set>
<inputs>
Expand All @@ -123,18 +123,18 @@
</synapse>
<synapse id="10">
<action_set>
<rsc_op id="11" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
<primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
<attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" hostlist="hadev3 hadev2 hadev1 "/>
<rsc_op id="13" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
<primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
<attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" hostlist="hadev3 hadev2 hadev1 "/>
</rsc_op>
</action_set>
<inputs/>
</synapse>
<synapse id="11">
<action_set>
<rsc_op id="27" operation="stop" operation_key="child_DoFencing:2_stop_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
<primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
<attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_timeout="20000" hostlist="hadev3 hadev2 hadev1 "/>
<rsc_op id="27" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
<primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
<attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_timeout="20000" hostlist="hadev3 hadev2 hadev1 "/>
</rsc_op>
</action_set>
<inputs>
Expand All @@ -145,9 +145,9 @@
</synapse>
<synapse id="12">
<action_set>
<rsc_op id="13" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3">
<primitive id="child_DoFencing:2" class="stonith" type="ssh"/>
<attributes CRM_meta_clone="2" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev2" CRM_meta_on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" hostlist="hadev3 hadev2 hadev1 "/>
<rsc_op id="11" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36">
<primitive id="child_DoFencing:0" class="stonith" type="ssh"/>
<attributes CRM_meta_clone="0" CRM_meta_clone_max="3" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hadev1" CRM_meta_on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" hostlist="hadev3 hadev2 hadev1 "/>
</rsc_op>
</action_set>
<inputs/>
Expand All @@ -166,10 +166,10 @@
<rsc_op id="13" operation="monitor" operation_key="child_DoFencing:2_monitor_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
</trigger>
<trigger>
<rsc_op id="24" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
<rsc_op id="26" operation="stop" operation_key="child_DoFencing:2_stop_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
</trigger>
<trigger>
<rsc_op id="27" operation="stop" operation_key="child_DoFencing:2_stop_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
<rsc_op id="27" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
</trigger>
<trigger>
<pseudo_event id="30" operation="stop" operation_key="DoFencing_stop_0"/>
Expand Down Expand Up @@ -201,7 +201,7 @@
<rsc_op id="19" operation="stop" operation_key="rsc_hadev2_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
</trigger>
<trigger>
<rsc_op id="24" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
<rsc_op id="27" operation="stop" operation_key="child_DoFencing:0_stop_0" on_node="hadev2" on_node_uuid="190b75b6-5585-42d9-8cde-eb6041843ae3"/>
</trigger>
</inputs>
</synapse>
Expand Down
Loading