[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible trbo monitor: also monitor number of diffoscope processes

[Holger Levsen]

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


Commits:
a10c53c9 by Holger Levsen at 2020-09-14T21:51:36+02:00
reproducible trbo monitor: also monitor number of diffoscope processes

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

- - - - -


1 changed file:

- bin/jenkins-shell-monitor.sh


Changes:

=====================================
bin/jenkins-shell-monitor.sh
=====================================
@@ -38,6 +38,7 @@ main_loop() {
 	fi
 	SCHROOT_MOUNTS=$(mount | grep /run/schroot| wc -l)
 	SCHROOT_BASE_DIRS=$(find /schroots/ -maxdepth 1 -type d | wc -l)
+	DIFFOSCOPE_PROCS=$(grep -c '/usr/bin/python3 /usr/bin/diffoscope' $PSFAX || true)
 	REPRO_JOBS=$(ls ~jenkins/jobs/reproducible_* -1d | wc -l)
 	JOBS_RUNNING_TOTAL=$(grep '_ /bin/bash /srv/jenkins/bin/' $PSFAX | egrep -v 'reproducible_worker.sh|reproducible_build.sh|jenkins-shell-monitor.sh' | wc -l)
 	if [ $JOBS_RUNNING_TOTAL -eq 0 ] ; then
@@ -46,9 +47,9 @@ main_loop() {
 		JOBS_RUNNING_TOTAL="\033[93m$JOBS_RUNNING_TOTAL\033[0m"
 	fi
 	JOBS_RUNNING_LOCAL=$(grep '_ /bin/bash /srv/jenkins/bin/' $PSFAX | egrep -v 'reproducible_worker.sh|reproducible_build.sh|jenkins-shell-monitor.sh|jenkins_master_wrapper.sh' | wc -l)
-	JOBS_RUNNING_REMOTE=$(grep jenkins_master_wrapper.sh $PSFAX | wc -l)
-	REPRO_WORKERS=$(grep reproducible_worker.sh $PSFAX | wc -l)
-	JENKINS_AGENTS=$(grep jenkins/agent.jar $PSFAX | wc -l)
+	JOBS_RUNNING_REMOTE=$(grep -c jenkins_master_wrapper.sh $PSFAX || true)
+	REPRO_WORKERS=$(grep -c reproducible_worker.sh $PSFAX || true)
+	JENKINS_AGENTS=$(grep -c jenkins/agent.jar $PSFAX || true)
 	NODES_TOTAL=$(find ~/nodes -type d | wc -l)
 	SOME_AGE="$(date -u)"
 	for i in $SEQ1 ; do
@@ -100,6 +101,7 @@ main_loop() {
 		echo    "logged in users:                              $(w -h | awk '{print $1}' | sort -u | xargs echo)"
 		echo    "number of open files:                         $LSOF"
 		echo -e "schroot: (sessions / mounts / base dirs)      $SCHROOT_SESSIONS / $SCHROOT_MOUNTS / $SCHROOT_BASE_DIRS"
+		echo    "diffoscope processes:                         $DIFFOSCOPE_PROCS"
 		echo    "configured r-b jobs:                          $REPRO_JOBS"
 		echo -e "running jenkins jobs: (total/local/remote)    $JOBS_RUNNING_TOTAL / $JOBS_RUNNING_LOCAL / $JOBS_RUNNING_REMOTE"
 		echo    "running debian r-b workers:                   $REPRO_WORKERS"



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/a10c53c96a5da9002a36871e051c01c6a8245d68

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/a10c53c96a5da9002a36871e051c01c6a8245d68
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/20200914/6773d5d0/attachment-0001.html>