[Git][qa/jenkins.debian.net][master] 3 commits: rdn: make cache cleanup more robust

[Holger Levsen (@holger)]

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


Commits:
24f6ff02 by Holger Levsen at 2025-05-12T15:51:14+02:00
rdn: make cache cleanup more robust

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

- - - - -
6bf9ac32 by Holger Levsen at 2025-05-12T15:53:02+02:00
rdn: run cache cleanup service as user rebuilderd

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

- - - - -
93e50d7e by Holger Levsen at 2025-05-12T16:00:33+02:00
rdn: refactoring

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

- - - - -


11 changed files:

- bin/debrebuild_cache_limiter.sh
- hosts/codethink01-arm64/etc/systemd/system/rebuilderd-cache-cleanup.service
- hosts/codethink02-arm64/etc/systemd/system/rebuilderd-cache-cleanup.service
- hosts/codethink05-arm64/etc/systemd/system/rebuilderd-cache-cleanup.service
- hosts/common-ppc64el/etc/systemd/system/rebuilderd-cache-cleanup.service
- hosts/common-riscv64/etc/systemd/system/rebuilderd-cache-cleanup.service
- hosts/infom07-i386/etc/systemd/system/rebuilderd-cache-cleanup.service
- hosts/infom08-i386/etc/systemd/system/rebuilderd-cache-cleanup.service
- hosts/ionos17-amd64/etc/systemd/system/rebuilderd-cache-cleanup.service
- hosts/osuosl4-amd64/etc/systemd/system/rebuilderd-cache-cleanup.service
- hosts/osuosl5-amd64/etc/systemd/system/rebuilderd-cache-cleanup.service


Changes:

=====================================
bin/debrebuild_cache_limiter.sh
=====================================
@@ -12,7 +12,7 @@ if [ ! -d $CACHE ] ; then
 fi
 
 # delete empty files from cache first
-find $CACHE -type f -size 0 -exec rm {} \;
+find $CACHE -type f -size 0 -exec rm {} \; || true
 
 # delete old files from cache if cache size is too big
 LIMIT=100
@@ -24,16 +24,20 @@ case $HOSTNAME in
 	riscv64*)		LIMIT=180 ;;
 	*)			;;
 esac
-SIZE=$(du -sh $CACHE | grep G | cut -d 'G' -f 1||echo 0)
-if [ $SIZE -gt $LIMIT ] ; then
+
+get_size() {
+	SIZE=$(du -sh $CACHE | grep G | cut -d 'G' -f 1||echo 0)
+}
+
+SIZE=0
+get_size
+
+while [ $SIZE -gt $LIMIT ] ; do
 	echo "$CACHE is still ${SIZE}G, reducing further."
 	# delete 1000 files which have old access times
 	set -e
-	find $CACHE -type f -printf '%A+ %p\n' | sort | head -n 1000|cut -d ' ' -f2-|xargs sudo rm -f || true
+	find $CACHE -type f -printf '%A+ %p\n' | sort | head -n 1000|cut -d ' ' -f2-|xargs rm -f || true
 	echo "checking again..."
-	$0
-else
-	echo "$CACHE is ${SIZE}G, voila."
-fi
-
-exit 0
+	get_size
+done
+echo "$CACHE is ${SIZE}G which is below ${LIMIT}G, the end."


=====================================
hosts/codethink01-arm64/etc/systemd/system/rebuilderd-cache-cleanup.service
=====================================
@@ -2,6 +2,8 @@
 Description=Periodically cleanup the cache used by rebuilderd
 
 [Service]
+User=rebuilderd
+Group=rebuilderd
 ExecStart=/srv/jenkins/bin/debrebuild_cache_limiter.sh
 RemainAfterExit=no
 Type=oneshot


=====================================
hosts/codethink02-arm64/etc/systemd/system/rebuilderd-cache-cleanup.service
=====================================
@@ -2,6 +2,8 @@
 Description=Periodically cleanup the cache used by rebuilderd
 
 [Service]
+User=rebuilderd
+Group=rebuilderd
 ExecStart=/srv/jenkins/bin/debrebuild_cache_limiter.sh
 RemainAfterExit=no
 Type=oneshot


=====================================
hosts/codethink05-arm64/etc/systemd/system/rebuilderd-cache-cleanup.service
=====================================
@@ -2,6 +2,8 @@
 Description=Periodically cleanup the cache used by rebuilderd
 
 [Service]
+User=rebuilderd
+Group=rebuilderd
 ExecStart=/srv/jenkins/bin/debrebuild_cache_limiter.sh
 RemainAfterExit=no
 Type=oneshot


=====================================
hosts/common-ppc64el/etc/systemd/system/rebuilderd-cache-cleanup.service
=====================================
@@ -2,6 +2,8 @@
 Description=Periodically cleanup the cache used by rebuilderd
 
 [Service]
+User=rebuilderd
+Group=rebuilderd
 ExecStart=/srv/jenkins/bin/debrebuild_cache_limiter.sh
 RemainAfterExit=no
 Type=oneshot


=====================================
hosts/common-riscv64/etc/systemd/system/rebuilderd-cache-cleanup.service
=====================================
@@ -2,6 +2,8 @@
 Description=Periodically cleanup the cache used by rebuilderd
 
 [Service]
+User=rebuilderd
+Group=rebuilderd
 ExecStart=/srv/jenkins/bin/debrebuild_cache_limiter.sh
 RemainAfterExit=no
 Type=oneshot


=====================================
hosts/infom07-i386/etc/systemd/system/rebuilderd-cache-cleanup.service
=====================================
@@ -2,6 +2,8 @@
 Description=Periodically cleanup the cache used by rebuilderd
 
 [Service]
+User=rebuilderd
+Group=rebuilderd
 ExecStart=/srv/jenkins/bin/debrebuild_cache_limiter.sh
 RemainAfterExit=no
 Type=oneshot


=====================================
hosts/infom08-i386/etc/systemd/system/rebuilderd-cache-cleanup.service
=====================================
@@ -2,6 +2,8 @@
 Description=Periodically cleanup the cache used by rebuilderd
 
 [Service]
+User=rebuilderd
+Group=rebuilderd
 ExecStart=/srv/jenkins/bin/debrebuild_cache_limiter.sh
 RemainAfterExit=no
 Type=oneshot


=====================================
hosts/ionos17-amd64/etc/systemd/system/rebuilderd-cache-cleanup.service
=====================================
@@ -2,6 +2,8 @@
 Description=Periodically cleanup the cache used by rebuilderd
 
 [Service]
+User=rebuilderd
+Group=rebuilderd
 ExecStart=/srv/jenkins/bin/debrebuild_cache_limiter.sh
 RemainAfterExit=no
 Type=oneshot


=====================================
hosts/osuosl4-amd64/etc/systemd/system/rebuilderd-cache-cleanup.service
=====================================
@@ -2,6 +2,8 @@
 Description=Periodically cleanup the cache used by rebuilderd
 
 [Service]
+User=rebuilderd
+Group=rebuilderd
 ExecStart=/srv/jenkins/bin/debrebuild_cache_limiter.sh
 RemainAfterExit=no
 Type=oneshot


=====================================
hosts/osuosl5-amd64/etc/systemd/system/rebuilderd-cache-cleanup.service
=====================================
@@ -2,6 +2,8 @@
 Description=Periodically cleanup the cache used by rebuilderd
 
 [Service]
+User=rebuilderd
+Group=rebuilderd
 ExecStart=/srv/jenkins/bin/debrebuild_cache_limiter.sh
 RemainAfterExit=no
 Type=oneshot



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/79fd109a9b980f1b8d315ce7c47d22f2cbd0382e...93e50d7e0572dee93517fbeb7a2bebe825b72c00

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/79fd109a9b980f1b8d315ce7c47d22f2cbd0382e...93e50d7e0572dee93517fbeb7a2bebe825b72c00
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/20250512/0681fffa/attachment-0001.htm>