Skip to content

Use max_builds instead of a lock #734

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
encukou wants to merge 2 commits into
base: main
Choose a base branch
from
+8 −14
Open

Use max_builds instead of a lock #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5dd4097
Use max_builds instead of a lock
zware Nov 15, 2025
83a3688
Simplify
encukou Jun 4, 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
13 changes: 8 additions & 5 deletions master/custom/workers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def __init__(
tags=None,
branches=None,
not_branches=None,
parallel_builders=None,
parallel_builders=1,
parallel_tests=None,
timeout_factor=1,
exclude_test_resources=None,
Expand All @@ -40,7 +40,6 @@ def __init__(
self.tags = tags or set()
self.branches = branches
self.not_branches = not_branches
self.parallel_builders = parallel_builders
self.parallel_tests = parallel_tests
self.timeout_factor = timeout_factor
self.exclude_test_resources = exclude_test_resources or []
Expand All @@ -55,9 +54,13 @@ def __init__(
if settings.use_local_worker:
self.bb_worker = _worker.LocalWorker(name)
else:
self.bb_worker = _worker.Worker(name, str(pw),
notify_on_missing=emails,
keepalive_interval=KEEPALIVE)
self.bb_worker = _worker.Worker(
name,
str(pw),
notify_on_missing=emails,
keepalive_interval=KEEPALIVE,
max_builds=parallel_builders,
)

# Some of Itamar's workers are reprovisioned every Wednesday at 9am PT.
# Builds scheduled between 8am - 10am PT on Wednesdays will be delayed to
Expand Down
9 changes: 0 additions & 9 deletions master/master.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,14 +149,6 @@ GIT_KWDS = {
c["builders"] = []
c["schedulers"] = []

# The following with the worker owners' agreement
cpulock = locks.WorkerLock(
"cpu",
maxCountForWorker={
w.name: w.parallel_builders for w in WORKERS if w.parallel_builders
},
)


def is_important_file(filename):
unimportant_prefixes = (
Expand Down Expand Up @@ -274,7 +266,6 @@ for branch in BRANCHES:
builddir=f"{branch.builddir_name}.{worker.name}{f.buildersuffix}",
factory=f,
tags=tags,
locks=[cpulock.access("counting")],
)

if worker.downtime:
Expand Down