From d8b3e28a9a83a09093c16ebf40b8153141faee70 Mon Sep 17 00:00:00 2001 From: JEAN-FRANCOIS GUILLAUME Date: Wed, 30 Nov 2022 17:24:39 +0100 Subject: [PATCH] slurm --- glicid/services/parallel.scm | 69 ++++++++++++++---------------------- 1 file changed, 27 insertions(+), 42 deletions(-) diff --git a/glicid/services/parallel.scm b/glicid/services/parallel.scm index 35936f8..a48ad27 100644 --- a/glicid/services/parallel.scm +++ b/glicid/services/parallel.scm @@ -29,8 +29,7 @@ slurmd-service-type %slurm-group %slurm-account - %slurm-accounts - )) + %slurm-accounts )) ; ; Munged ; @@ -58,23 +57,21 @@ "-f" ; until we fix the permissions "--key-file" #$key-file ) - #:log-file #$log-file - )) + #:log-file #$log-file )) (stop #~(make-kill-destructor))))))) (define %munged-activation #~(begin (mkdir-p "/var/run/munge") (mkdir-p "/var/lib/munge") - #t - )) + #t )) (define munged-service-type (service-type (name 'munged) (extensions (list (service-extension shepherd-root-service-type munged-service) - (service-extension activation-service-type (const %munged-activation)) ) ) + (service-extension activation-service-type (const %munged-activation)))) (description "Run munged"))) ; @@ -90,8 +87,7 @@ (home-directory "/var/spool/slurm") (shell (file-append bash "/bin/bash")))) -(define %slurm-accounts - (list %slurm-group %slurm-account)) +(define %slurm-accounts (list %slurm-group %slurm-account)) ; ; slurmdbd @@ -100,9 +96,9 @@ slurmdbd-configuration make-slurmdbd-configuration slurmdbd-configuration? - (slurm slurm-configuration-slurm (default slurm)) - (slurmdbd-conf slurmdbd-slurmdbd-conf (default (file-append slurm "/etc/slurm/slurmdbd.conf"))) - (log-file slurmdbd-log-file (default "/var/log/slurm/slurmdbd.log"))) + (slurm slurm (default slurm)) + (slurmdbd-conf slurmdbd-conf (default (file-append slurm "/etc/slurm/slurmdbd.conf"))) + (log-file log-file (default "/var/log/slurm/slurmdbd.log"))) (define slurmdbd-service (match-lambda @@ -116,12 +112,10 @@ (start #~(make-forkexec-constructor (list #$(file-append slurm "/sbin/slurmdbd") - "-D" - ) + "-D" ) #:log-file #$log-file #:user (passwd:uid (getpwnam "slurm")) - #:group (passwd:gid (getpwnam "slurm")) - )) + #:group (passwd:gid (getpwnam "slurm")))) (stop #~(make-kill-destructor))))))) (define %slurmdbd-activation @@ -144,8 +138,7 @@ (chown slurm-file (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (chmod slurm-file #o600) )(find-files "/etc/slurm/")) - #t - )) + #t )) (define slurmdbd-service-type (service-type @@ -153,7 +146,7 @@ (extensions (list (service-extension shepherd-root-service-type slurmdbd-service) (service-extension activation-service-type (const %slurmdbd-activation)) - (service-extension account-service-type (const %slurm-accounts)) ) ) + (service-extension account-service-type (const %slurm-accounts)))) (description "Run slurmdbd"))) ; @@ -163,9 +156,9 @@ slurmctld-configuration make-slurmctld-configuration slurmctld-configuration? - (slurm slurm-configuration-slurm (default slurm)) - (slurmctld-conf slurmctld-slurmctld-conf (default (file-append slurm "/etc/slurm/slurmctld.conf"))) - (log-file slurmctld-log-file (default "/var/log/slurm/slurmctld.log"))) + (slurm slurm (default slurm)) + (slurmctld-conf slurmctld-conf (default (file-append slurm "/etc/slurm/slurmctld.conf"))) + (log-file log-file (default "/var/log/slurm/slurmctld.log"))) (define slurmctld-service (match-lambda @@ -180,12 +173,10 @@ (list #$(file-append slurm "/sbin/slurmctld") "-D" "-R" - "-f" #$slurmctld-conf - ) + "-f" #$slurmctld-conf ) #:log-file #$log-file #:user (passwd:uid (getpwnam "slurm")) - #:group (passwd:gid (getpwnam "slurm")) - )) + #:group (passwd:gid (getpwnam "slurm")))) (stop #~(make-kill-destructor))))))) (define %slurmctld-activation @@ -216,7 +207,7 @@ (extensions (list (service-extension shepherd-root-service-type slurmctld-service) (service-extension activation-service-type (const %slurmctld-activation)) - (service-extension account-service-type (const %slurm-accounts)) ) ) + (service-extension account-service-type (const %slurm-accounts)))) (description "Run slurmctld"))) ; @@ -226,12 +217,11 @@ slurmd-configuration make-slurmd-configuration slurmd-configuration? - (slurm slurm-configuration-slurm (default slurm)) - (slurmd-conf slurmd-slurmd-conf (default (file-append slurm "/etc/slurm/slurm.conf"))) - (log-file slurmd-log-file (default "/var/log/slurm/slurmd.log")) - (slurmctld-host slurmd-slurmctld-host (default #f)); string slurmctld-host[:port] - (log-level slurmd-log-level (default #f)); string Verbose mode. Multiple -v's increase verbosity - ) + (slurm slurm (default slurm)) + (slurmd-conf slurmd-conf (default (file-append slurm "/etc/slurm/slurm.conf"))) + (log-file log-file (default "/var/log/slurm/slurmd.log")) + (slurmctld-host slurmctld-host (default #f)) + (log-level log-level (default #f))) (define slurmd-service (match-lambda @@ -248,16 +238,11 @@ "-D" #$@(if slurmctld-host (list (string-append "--conf-server" slurmctld-host)) - (list (string-append "-f" slurmd-conf)) - ) + (list (string-append "-f" slurmd-conf))) #$@(if log-level (list log-level) - '() - ) - - ) - #:log-file #$log-file - )) + '())) + #:log-file #$log-file )) (stop #~(make-kill-destructor))))))) (define %slurmd-activation @@ -277,5 +262,5 @@ (extensions (list (service-extension shepherd-root-service-type slurmd-service) (service-extension activation-service-type (const %slurmd-activation)) - (service-extension account-service-type (const %slurm-accounts)) ) ) + (service-extension account-service-type (const %slurm-accounts)))) (description "Run slurmd")))