Skip to content

fix: ensure consistent node workload assignment by sorting nodes by gwid #1318

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
ttimonen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: ensure consistent node workload assignment by sorting nodes by gwid #1318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 0 deletions changelog/985.bugfix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
De-flaked test_workqueue_ordered_by_size.
5 changes: 3 additions & 2 deletions src/xdist/scheduler/loadscope.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,11 +394,12 @@ def schedule(self) -> None:
unused_node.shutdown()

# Assign initial workload
for node in self.nodes:
# Sort the nodes to keep assingment consistent (#985)
for node in sorted(self.nodes, key=lambda node: node.gateway.id):
self._assign_work_unit(node)

# Ensure nodes start with at least two work units if possible (#277)
for node in self.nodes:
for node in sorted(self.nodes, key=lambda node: node.gateway.id):
self._reschedule(node)

# Initial distribution sent all tests, start node shutdown
Expand Down
Loading