Merge branch 'devel' into 'main'

add a «magic number» uid for slurm (has to be consistent on the cluster)

See merge request glicid-public/guix-glicid!174
This commit is contained in:
Yann Dupont 2023-01-02 16:38:21 +00:00
commit 1cdf8d2db9

View file

@ -10,9 +10,7 @@
#:use-module (gnu packages parallel) #:use-module (gnu packages parallel)
#:use-module (glicid system file-systems) #:use-module (glicid system file-systems)
#:use-module (glicid utils) #:use-module (glicid utils)
#:export ( #:export (munged-configuration munged-configuration?
munged-configuration
munged-configuration?
munged-service munged-service
munged-service-type munged-service-type
slurmdbd-configuration slurmdbd-configuration
@ -33,89 +31,97 @@
; ;
; Munged ; Munged
; ;
(define-record-type* (define-record-type* <munged-configuration> munged-configuration
<munged-configuration> make-munged-configuration
munged-configuration make-munged-configuration
munged-configuration? munged-configuration?
(munge munge-configuration-munge (default munge)) (munge munge-configuration-munge
(key-file munged-key-file (default (file-append munge "/etc/munge/munged.key"))) (default munge))
(log-file munged-log-file (default "/var/log/munged.log"))) (key-file munged-key-file
(default (file-append munge "/etc/munge/munged.key")))
(log-file munged-log-file
(default "/var/log/munged.log")))
(define munged-service (define munged-service
(match-lambda (match-lambda
(($ <munged-configuration> munge key-file log-file) (($ <munged-configuration> munge key-file log-file)
(list (list (shepherd-service (provision '(munged))
(shepherd-service
(provision '(munged))
(documentation "Run munged.") (documentation "Run munged.")
(requirement '(user-processes)) (requirement '(user-processes))
(respawn? #t) (respawn? #t)
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor (list #$(file-append
(list munge
#$(file-append munge "/sbin/munged") "/sbin/munged")
"-F" "-F" "-f"
"-f" ; until we fix the permissions "--key-file"
"--key-file" #$key-file #$key-file)
)
#:log-file #$log-file)) #:log-file #$log-file))
(stop #~(make-kill-destructor))))))) (stop #~(make-kill-destructor)))))))
(define %munged-activation (define %munged-activation
#~(begin #~(begin
(mkdir-p "/var/run/munge") (mkdir-p "/var/run/munge")
(mkdir-p "/var/lib/munge") (mkdir-p "/var/lib/munge") #t))
#t ))
(define munged-service-type (define munged-service-type
(service-type (service-type (name 'munged)
(name 'munged) (extensions (list (service-extension
(extensions (list shepherd-root-service-type munged-service)
(service-extension shepherd-root-service-type munged-service) (service-extension activation-service-type
(service-extension activation-service-type (const %munged-activation)))) (const %munged-activation))))
(description "Run munged"))) (description "Run munged")))
; ;
; Shared slurm account ; Shared slurm account
; ;
(define %slurm-group (user-group (name "slurm") (system? #t))) (define %slurm-group
(define %slurm-account (user-account (user-group
(name "slurm")
(system? #t)))
(define %slurm-account
(user-account
(name "slurm") (name "slurm")
(group "slurm") (group "slurm")
(system? #t) (system? #t)
(comment "slurm server user") (comment "slurm server user")
(uid 721) ;«magic number…»
(home-directory "/var/spool/slurm") (home-directory "/var/spool/slurm")
(shell (file-append bash "/bin/bash")))) (shell (file-append bash "/bin/bash"))))
(define %slurm-accounts (list %slurm-group %slurm-account)) (define %slurm-accounts
(list %slurm-group %slurm-account))
; ;
; slurmdbd ; slurmdbd
; ;
(define-record-type* (define-record-type* <slurmdbd-configuration> slurmdbd-configuration
<slurmdbd-configuration> make-slurmdbd-configuration
slurmdbd-configuration make-slurmdbd-configuration
slurmdbd-configuration? slurmdbd-configuration?
(slurm slurm (default slurm)) (slurm slurm
(slurmdbd-conf slurmdbd-conf (default (file-append slurm "/etc/slurm/slurmdbd.conf"))) (default slurm))
(log-file log-file (default "/var/log/slurm/slurmdbd.log"))) (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 (define slurmdbd-service
(match-lambda (match-lambda
(($ <slurmdbd-configuration> slurm slurmdbd-conf log-file) (($ <slurmdbd-configuration> slurm slurmdbd-conf log-file)
(list (list (shepherd-service (provision '(slurmdbd))
(shepherd-service
(provision '(slurmdbd))
(documentation "Run slurmdbd.") (documentation "Run slurmdbd.")
(requirement '(user-processes)) (requirement '(user-processes))
(respawn? #t) (respawn? #t)
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor (list #$(file-append
(list slurm
#$(file-append slurm "/sbin/slurmdbd") "/sbin/slurmdbd")
"-D") "-D")
#:log-file #$log-file #:log-file #$log-file
#:user (passwd:uid (getpwnam "slurm")) #:user (passwd:uid
#:group (passwd:gid (getpwnam "slurm")))) (getpwnam
"slurm"))
#:group (passwd:gid
(getpwnam
"slurm"))))
(stop #~(make-kill-destructor))))))) (stop #~(make-kill-destructor)))))))
(define %slurmdbd-activation (define %slurmdbd-activation
@ -127,56 +133,80 @@
(mkdir-p "/var/spool/slurmctld") (mkdir-p "/var/spool/slurmctld")
(touch "/var/log/slurm/slurmdbd.log") (touch "/var/log/slurm/slurmdbd.log")
(touch "/var/run/slurmdbd.pid") (touch "/var/run/slurmdbd.pid")
(chown "/var/run/slurmdbd.pid" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (chown "/var/run/slurmdbd.pid"
(chown "/var/log/slurm" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (passwd:uid (getpwnam "slurm"))
(chown "/var/log/slurm/slurmdbd.log" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (passwd:gid (getpwnam "slurm")))
(chown "/var/lib/slurm-archives" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (chown "/var/log/slurm"
(chown "/var/lib/slurm" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (passwd:uid (getpwnam "slurm"))
(chown "/var/spool/slurmctld" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (passwd:gid (getpwnam "slurm")))
(chown "/etc/slurm" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (chown "/var/log/slurm/slurmdbd.log"
(passwd:uid (getpwnam "slurm"))
(passwd:gid (getpwnam "slurm")))
(chown "/var/lib/slurm-archives"
(passwd:uid (getpwnam "slurm"))
(passwd:gid (getpwnam "slurm")))
(chown "/var/lib/slurm"
(passwd:uid (getpwnam "slurm"))
(passwd:gid (getpwnam "slurm")))
(chown "/var/spool/slurmctld"
(passwd:uid (getpwnam "slurm"))
(passwd:gid (getpwnam "slurm")))
(chown "/etc/slurm"
(passwd:uid (getpwnam "slurm"))
(passwd:gid (getpwnam "slurm")))
(for-each (lambda (slurm-file) (for-each (lambda (slurm-file)
(chown slurm-file (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (chown slurm-file
(chmod slurm-file #o600) (passwd:uid (getpwnam "slurm"))
)(find-files "/etc/slurm/")) (passwd:gid (getpwnam "slurm")))
(chmod slurm-file #o600))
(find-files "/etc/slurm/"))
#t)) #t))
(define slurmdbd-service-type (define slurmdbd-service-type
(service-type (service-type (name 'slurmdbd)
(name 'slurmdbd) (extensions (list (service-extension
(extensions (list shepherd-root-service-type slurmdbd-service)
(service-extension shepherd-root-service-type slurmdbd-service) (service-extension activation-service-type
(service-extension activation-service-type (const %slurmdbd-activation)) (const
(service-extension account-service-type (const %slurm-accounts)))) %slurmdbd-activation))
(service-extension account-service-type
(const %slurm-accounts))))
(description "Run slurmdbd"))) (description "Run slurmdbd")))
; ;
; slurmctld ; slurmctld
; ;
(define-record-type* (define-record-type* <slurmctld-configuration> slurmctld-configuration
<slurmctld-configuration> make-slurmctld-configuration
slurmctld-configuration make-slurmctld-configuration
slurmctld-configuration? slurmctld-configuration?
(slurm slurm (default slurm)) (slurm slurm
(slurmctld-conf slurmctld-conf (default (file-append slurm "/etc/slurm/slurmctld.conf"))) (default slurm))
(log-file log-file (default "/var/log/slurm/slurmctld.log"))) (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 (define slurmctld-service
(match-lambda (match-lambda
(($ <slurmctld-configuration> slurm slurmctld-conf log-file) (($ <slurmctld-configuration> slurm slurmctld-conf log-file)
(list (list (shepherd-service (provision '(slurmctld))
(shepherd-service
(provision '(slurmctld))
(documentation "Run slurmctld.") (documentation "Run slurmctld.")
(requirement '(user-processes)) (requirement '(user-processes))
(respawn? #t) (respawn? #t)
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor (list #$(file-append
(list slurm
#$(file-append slurm "/sbin/slurmctld") "/sbin/slurmctld")
"-D" "-R" "-D"
"-f" #$slurmctld-conf ) "-R"
"-f"
#$slurmctld-conf)
#:log-file #$log-file #:log-file #$log-file
#:user (passwd:uid (getpwnam "slurm")) #:user (passwd:uid
#:group (passwd:gid (getpwnam "slurm")))) (getpwnam
"slurm"))
#:group (passwd:gid
(getpwnam
"slurm"))))
(stop #~(make-kill-destructor))))))) (stop #~(make-kill-destructor)))))))
(define %slurmctld-activation (define %slurmctld-activation
@ -188,59 +218,94 @@
(mkdir-p "/var/spool/slurmctld") (mkdir-p "/var/spool/slurmctld")
(touch "/var/log/slurm/slurmctld.log") (touch "/var/log/slurm/slurmctld.log")
(touch "/var/run/slurmctld.pid") (touch "/var/run/slurmctld.pid")
(chown "/var/log/slurm" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (chown "/var/log/slurm"
(chown "/var/log/slurm/slurmctld.log" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (passwd:uid (getpwnam "slurm"))
(chown "/var/run/slurmctld.pid" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (passwd:gid (getpwnam "slurm")))
(chown "/var/lib/slurm-archives" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (chown "/var/log/slurm/slurmctld.log"
(chown "/var/lib/slurm" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (passwd:uid (getpwnam "slurm"))
(chown "/var/spool/slurmctld" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (passwd:gid (getpwnam "slurm")))
(chown "/etc/slurm" (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (chown "/var/run/slurmctld.pid"
(passwd:uid (getpwnam "slurm"))
(passwd:gid (getpwnam "slurm")))
(chown "/var/lib/slurm-archives"
(passwd:uid (getpwnam "slurm"))
(passwd:gid (getpwnam "slurm")))
(chown "/var/lib/slurm"
(passwd:uid (getpwnam "slurm"))
(passwd:gid (getpwnam "slurm")))
(chown "/var/spool/slurmctld"
(passwd:uid (getpwnam "slurm"))
(passwd:gid (getpwnam "slurm")))
(chown "/etc/slurm"
(passwd:uid (getpwnam "slurm"))
(passwd:gid (getpwnam "slurm")))
(for-each (lambda (slurm-file) (for-each (lambda (slurm-file)
(chown slurm-file (passwd:uid (getpwnam "slurm")) (passwd:gid (getpwnam "slurm"))) (chown slurm-file
(chmod slurm-file #o600) (passwd:uid (getpwnam "slurm"))
)(find-files "/etc/slurm/")) (passwd:gid (getpwnam "slurm")))
(chmod slurm-file #o600))
(find-files "/etc/slurm/"))
#t)) #t))
(define slurmctld-service-type (define slurmctld-service-type
(service-type (service-type (name 'slurmctld)
(name 'slurmctld) (extensions (list (service-extension
(extensions (list shepherd-root-service-type
(service-extension shepherd-root-service-type slurmctld-service) slurmctld-service)
(service-extension activation-service-type (const %slurmctld-activation)) (service-extension activation-service-type
(service-extension account-service-type (const %slurm-accounts)))) (const
%slurmctld-activation))
(service-extension account-service-type
(const %slurm-accounts))))
(description "Run slurmctld"))) (description "Run slurmctld")))
; ;
; slurmd ; slurmd
; ;
(define-record-type* (define-record-type* <slurmd-configuration> slurmd-configuration
<slurmd-configuration> make-slurmd-configuration
slurmd-configuration make-slurmd-configuration
slurmd-configuration? slurmd-configuration?
(slurm slurm (default slurm)) (slurm slurm
(slurmd-conf slurmd-conf (default (file-append slurm "/etc/slurm/slurm.conf"))) (default slurm))
(log-file log-file (default "/var/log/slurm/slurmd.log")) (slurmd-conf slurmd-conf
(slurmctld-host slurmctld-host (default #f)) (default (file-append slurm "/etc/slurm/slurm.conf")))
(log-level log-level (default #f))) (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 (define slurmd-service
(match-lambda (match-lambda
(($ <slurmd-configuration> slurm slurmd-conf slurmctld-host log-file log-level) (($ <slurmd-configuration>
(list slurm
(shepherd-service slurmd-conf
(provision '(slurmd)) slurmctld-host
log-file
log-level)
(list (shepherd-service (provision '(slurmd))
(documentation "Run slurmd.") (documentation "Run slurmd.")
(requirement '(user-processes)) (requirement '(user-processes))
(respawn? #t) (respawn? #t)
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor (list #$(file-append
(list slurm
#$(file-append slurm "/sbin/slurmd") "/sbin/slurmd")
"-D" "-D"
#$@(if slurmctld-host #$@(if
(list (string-append "--conf-server" slurmctld-host)) slurmctld-host
(list (string-append "-f" slurmd-conf))) (list
#$@(if log-level (string-append
(list log-level) "--conf-server"
slurmctld-host))
(list
(string-append
"-f"
slurmd-conf)))
#$@(if
log-level
(list
log-level)
'())) '()))
#:log-file #$log-file)) #:log-file #$log-file))
(stop #~(make-kill-destructor))))))) (stop #~(make-kill-destructor)))))))
@ -257,10 +322,11 @@
#t)) #t))
(define slurmd-service-type (define slurmd-service-type
(service-type (service-type (name 'slurmd)
(name 'slurmd) (extensions (list (service-extension
(extensions (list shepherd-root-service-type slurmd-service)
(service-extension shepherd-root-service-type slurmd-service) (service-extension activation-service-type
(service-extension activation-service-type (const %slurmd-activation)) (const %slurmd-activation))
(service-extension account-service-type (const %slurm-accounts)))) (service-extension account-service-type
(const %slurm-accounts))))
(description "Run slurmd"))) (description "Run slurmd")))