Merge pull request os-autoinst#5323 from os-autoinst/memory-limits

Apply memory limit for openqa-worker services
asdil12 · Oct 11, 2023 · c52fd98 · c52fd98
2 parents b53571d + 858bf7a
commit c52fd98
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -99,7 +99,7 @@ install-generic:
 	install -d -m 755 "$(DESTDIR)"/usr/lib/systemd/system
 	install -d -m 755 "$(DESTDIR)"/usr/lib/systemd/system-generators
 	install -d -m 755 "$(DESTDIR)"/usr/lib/tmpfiles.d
-	for i in systemd/*.{service,target,timer,path}; do \
+	for i in systemd/*.{service,slice,target,timer,path}; do \
 		install -m 644 $$i "$(DESTDIR)"/usr/lib/systemd/system ;\
 	done
 	ln -s [email protected] "$(DESTDIR)"/usr/lib/systemd/system/[email protected]

diff --git a/dist/rpm/openQA.spec b/dist/rpm/openQA.spec
@@ -695,6 +695,7 @@ fi
 %dir %{_unitdir}
 %{_systemdgeneratordir}
 %{_unitdir}/openqa-worker.target
+%{_unitdir}/openqa-worker.slice
 %{_unitdir}/[email protected]
 %{_unitdir}/[email protected]
 %{_unitdir}/openqa-worker-cacheservice-minion.service

diff --git a/systemd/openqa-worker.slice b/systemd/openqa-worker.slice
@@ -0,0 +1,7 @@
+[Unit]
+Description=Slice for openqa-worker units
+
+[Slice]
+# Apply memory limit to this slice to ensure that memory cannot be exhausted
+# exclusively by openqa-worker services.
+MemoryMax=90%