aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner2021-02-03 08:44:16 +0000
committerEfraim Flashner2021-02-03 08:44:27 +0000
commit8a00f84b33900a454c3b0822f412834ea7df5d8f (patch)
treeb4096443ffa90b763565d4c379fc761db63fd94a
parent3f8c84a33d18f932788c1132df35511d989879c1 (diff)
downloadguix-bioinformatics-8a00f84b33900a454c3b0822f412834ea7df5d8f.tar.gz
octopus config changes
-rw-r--r--gn/deploy/octopus.scm10
-rw-r--r--gn/services/science.scm18
2 files changed, 17 insertions, 11 deletions
diff --git a/gn/deploy/octopus.scm b/gn/deploy/octopus.scm
index d3a0a6a..51e9ded 100644
--- a/gn/deploy/octopus.scm
+++ b/gn/deploy/octopus.scm
@@ -4,7 +4,7 @@
(gn services file-systems)
(gn services science)
(srfi srfi-26))
-(use-service-modules networking ssh web)
+(use-service-modules networking ssh sysctl web)
(use-package-modules parallel shells)
(define %efraimf-ssh-pubkey
@@ -96,6 +96,11 @@
(authorized-keys
`(("efraimf" ,%efraimf-ssh-pubkey)))))
+ (service sysctl-service-type
+ (sysctl-configuration
+ (settings '(("vm.overcommit_memory" . "2")
+ ("vm.overcommit_ratio" . "90")))))
+
(service munge-service-type)
(service slurm-service-type
(slurm-configuration
@@ -110,9 +115,10 @@
(slurm-extra-content
(string-append
"StateSaveLocation=/var/spool/slurmd/ctld # default /var/spool\n"
- "ProctrackType=proctrack/pgid # default proctrack/cgroup\n"
"ReturnToService=1 # default 0\n"
"DebugFlags=NO_CONF_HASH # default empty\n"
+ "SelectType=select/cons_res # default select/linear\n"
+ "SelectTypeParameters=CR_CPU # default 0\n"
"# COMPUTE NODES\n"
"NodeName=octopus CPUs=1 Boards=1 SocketsPerBoard=1 CoresPerSocket=1 ThreadsPerCore=1 RealMemory=1024\n"
"PartitionName=debug Nodes=ALL Default=YES MaxTime=INFINITE State=UP"))
diff --git a/gn/services/science.scm b/gn/services/science.scm
index 1a25382..a28f7c5 100644
--- a/gn/services/science.scm
+++ b/gn/services/science.scm
@@ -48,11 +48,11 @@
(with-imported-modules '((guix build utils))
#~(begin
(define %user (getpw "munge"))
- (let* ((homedir (passwd:dir %user))
- (key #$(munge-configuration-key config))
- (etc-dir (dirname key))
- (run-dir (dirname #$(munge-configuration-pid-file config)))
- (log-dir (dirname #$(munge-configuration-log-file config))))
+ (let* ((homedir (passwd:dir %user))
+ (key #$(munge-configuration-key config))
+ (etc-dir (dirname key))
+ (run-dir (dirname #$(munge-configuration-pid-file config)))
+ (log-dir (dirname #$(munge-configuration-log-file config))))
(for-each (lambda (dir)
(unless (file-exists? dir)
(mkdir-p dir))
@@ -176,7 +176,7 @@
(slurm-conf-file slurm-configuration-slurm-conf-file
(default "/etc/slurm/slurm.conf"))
(SlurmdLogFile slurm-configuration-slurmd-log-file
- (default #f)) ; #f for syslog
+ (default #f)) ; #f for syslog
(SlurmdPidFile slurm-configuration-slurmd-pidfile
(default "/var/run/slurmd.pid"))
@@ -186,7 +186,7 @@
(run-slurmctld? slurm-configuration-run-slurmctld
(default #f))
(SlurmctldLogFile slurm-configuration-slurmctld-log-file
- (default #f)) ; #f for syslog
+ (default #f)) ; #f for syslog
(SlurmctldPidFile slurm-configuration-slurmctld-pidfile
(default "/var/run/slurmctld.pid"))
@@ -233,12 +233,12 @@
#$(slurm-configuration-slurmd-spooldir config))
(format port "SlurmdPidFile=~a\n"
#$(slurm-configuration-slurmd-pidfile config))
- (if #$(slurm-configuration-slurmd-log-file config)
+ (when #$(slurm-configuration-slurmd-log-file config)
(format port "SlurmdLogFile=~a\n"
#$(slurm-configuration-slurmd-log-file config)))
(format port "SlurmctldPidFile=~a\n"
#$(slurm-configuration-slurmctld-pidfile config))
- (if #$(slurm-configuration-slurmctld-log-file config)
+ (when #$(slurm-configuration-slurmctld-log-file config)
(format port "SlurmctldLogFile=~a\n"
#$(slurm-configuration-slurmctld-log-file config)))
(format port "SlurmUser=~a\n"