From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 21 Jul 2023 18:16:53 +0000 (+0000)
Subject: builders: Include disabled builders in autoscale
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=551220413dc13bf6d363af2ed214e4f709a20df4;p=pbs.git

builders: Include disabled builders in autoscale

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/buildservice/builders.py b/src/buildservice/builders.py
index 753e3419..788b4c50 100644
--- a/src/buildservice/builders.py
+++ b/src/buildservice/builders.py
@@ -116,8 +116,8 @@ class Builders(base.Object):
 		# XXX max queue length
 		threshold = datetime.timedelta(minutes=5)
 
-		# Fetch all enabled builders
-		builders = [b for b in self if b.enabled]
+		# Fetch all builders
+		builders = [b for b in self]
 
 		# Fetch the priority for each builder
 		builders = dict(
@@ -728,6 +728,10 @@ class Builder(base.DataObject):
 		if not self.instance:
 			return 0
 
+		# Move disabled builders towards the end
+		if not self.enabled:
+			return -1
+
 		# Running builders should come first
 		if await self.is_running():
 			return 1