[Git][qa/jenkins.debian.net][master] 2 commits: drop openqa worker override (now use auto units)

[Holger Levsen (@holger)]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
b8c7e010 by Philip Hands at 2024-06-06T11:01:02+02:00
drop openqa worker override (now use auto units)

We now use the openqa-worker-auto-restart@ units, which have the
Restart=always setting built-in, so no need for an override.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
3e092dbd by Philip Hands at 2024-06-06T11:01:02+02:00
limit number of openqa-workers when load is high

I've increased the number of workers to 7, but made sure that the last 3
are only active when system load is relatively low, by individually
setting CRITICAL_LOAD_AVG_THRESHOLD to between 15 and 9, so all 7
workers will only run when the load is under 9.  This is an experiment,
so I guess those numbers might need adjusting.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


3 changed files:

- hosts/osuosl3-amd64/etc/openqa/workers.ini
- − hosts/osuosl3-amd64/etc/systemd/system/openqa-worker-plain\@.service.d/override.conf
- update_jdn.sh


Changes:

=====================================
hosts/osuosl3-amd64/etc/openqa/workers.ini
=====================================
@@ -79,15 +79,15 @@ PACKAGES_CMD = apt list --installed
 # The default value is 40 to prevent system overload based on experiences with
 # system stability so far.
 # Set to 0 to disable.
-#CRITICAL_LOAD_AVG_THRESHOLD = 40
+CRITICAL_LOAD_AVG_THRESHOLD = 15
 
 # This machine is under load, allow for longer timeouts
 TIMEOUT_SCALE = 1.8
 
 # The section ids are the instance of the workers.
 # The key/value pairs will appear in vars.json
-[1]
-WORKER_CLASS = qemu_x86_64
+#[1]
+#WORKER_CLASS = qemu_x86_64
 
 #[2]
 #WORKER_CLASS = qemu_x86_64_staging,qemu_x86_64
@@ -97,3 +97,14 @@ WORKER_CLASS = qemu_x86_64
 
 [https://openqa.debian.net]
 TESTPOOLSERVER = rsync://openqa.debian.net/tests
+
+# avoid over-loading the server when busy
+[5]
+CRITICAL_LOAD_AVG_THRESHOLD = 12
+
+[6]
+CRITICAL_LOAD_AVG_THRESHOLD = 10
+
+[7]
+CRITICAL_LOAD_AVG_THRESHOLD = 9
+


=====================================
hosts/osuosl3-amd64/etc/systemd/system/openqa-worker-plain\@.service.d/override.conf deleted
=====================================
@@ -1,6 +0,0 @@
-[Service]
-# this file is maintained in the jenkins.debian.net git repo
-
-# This setting is needed to keep workers running, because of the
-# TERMINATE_AFTER_JOBS_DONE setting in /etc/openqa/workers.ini
-Restart=always


=====================================
update_jdn.sh
=====================================
@@ -789,7 +789,7 @@ if ! $UP2DATE ; then
 						# openqa does not use slirpvde: reset its status and disable
 						sudo systemctl reset-failed openqa-slirpvde.service
 						sudo systemctl disable --now openqa-slirpvde.service
-						OPENQA_WORKERS_TO_RUN=5
+						OPENQA_WORKERS_TO_RUN=7
 						# disable any excess autostart instances, and all non-autostart workers
 						for id in $(systemctl show openqa-worker\*@\*.service --property=Id | sed 's/^Id=//'); do
 							autostart_instance=$(sed -nE 's/^.*auto-restart[@]([0-9]+).*$/\1/p' <<<$id)



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/c5bb6bb837293a025cffff89adf4a4f66bb3ceb1...3e092dbdd616a2ddca0ae7e8bb6b4e834e8f18da

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/c5bb6bb837293a025cffff89adf4a4f66bb3ceb1...3e092dbdd616a2ddca0ae7e8bb6b4e834e8f18da
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20240606/55c9079c/attachment-0001.htm>