Skip to content

feat(bench): Use bench_config for worker limits on dedicated servers #6045

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
kehwar wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

feat(bench): Use bench_config for worker limits on dedicated servers #6045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79b5d95
feature: use bench_config for worker limits on private servers
kehwar Apr 7, 2026
a0118bf
fix: restrict bench_config override only to min values, fix tests set…
kehwar Apr 23, 2026
79d7b8f
fix: test
kehwar Apr 23, 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
5 changes: 5 additions & 0 deletions press/press/doctype/bench/bench.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,11 @@ def allocate_workers(
"min_background_workers",
),
)[0]
is_public = frappe.get_cached_value("Server", self.server, "public")
if not is_public:
bench_config = json.loads(self.bench_config or "{}")
min_gn = bench_config.get("min_gunicorn_workers") or min_gn
min_bg = bench_config.get("min_background_workers") or min_bg
self.gunicorn_workers = min(
max_gn or MAX_GUNICORN_WORKERS,
max(
Expand Down
23 changes: 23 additions & 0 deletions press/press/doctype/bench/test_bench.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,29 @@ def test_auto_scale_uses_release_groups_max_and_min_workers_when_set(self):
self.assertEqual(bench.gunicorn_workers, 10)
self.assertEqual(bench.background_workers, 5)

def test_auto_scale_uses_release_groups_max_and_min_workers_when_set_at_bench_config(self):
bench = self._create_bench_with_n_sites_with_cpu_time(3, 5)
self.assertEqual(bench.gunicorn_workers, 2)
self.assertEqual(bench.background_workers, 1)
group = frappe.get_doc("Release Group", bench.group)
group.db_set("max_gunicorn_workers", 10)
group.db_set("max_background_workers", 5)
bench.bench_config = json.dumps({"max_gunicorn_workers": 20, "max_background_workers": 10}) # bench config should not override max workers
scale_workers()
bench.reload()
self.assertEqual(bench.gunicorn_workers, 10)
self.assertEqual(bench.background_workers, 5)
frappe.db.set_value("Server", bench.server, "ram", 1600)
scale_workers()
bench.reload()
self.assertEqual(bench.gunicorn_workers, 5) # autoscaled for for such low ram
self.assertEqual(bench.background_workers, 2)
bench.bench_config = json.dumps({"min_gunicorn_workers": 8, "min_background_workers": 4})
scale_workers()
bench.reload()
self.assertEqual(bench.gunicorn_workers, 8)
self.assertEqual(bench.background_workers, 4)

def test_set_bench_memory_limits_on_server_adds_memory_limit_on_bench_on_auto_scale(
self,
):
Expand Down
Loading