summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGordian Edenhofer2016-10-03 21:57:33 +0200
committerGordian Edenhofer2016-10-03 22:10:08 +0200
commit15d077667179781c8d7884df25d19b1a9bde8f3a (patch)
tree11685007fe7da9cd59681bc51fc880ce0506c019
parenta33031becf0704c8e3898f52dc4faf915a406429 (diff)
downloadaur-15d077667179781c8d7884df25d19b1a9bde8f3a.tar.gz
upgpkg: slurm-llnl 16.05.5-1
Streamline systemd service files with upstream templates. upgpkg: slurm-llnl-dev 17.02.0_0pre2-1 upgpkg: slurm-llnl-git 17.02.0.0pre2.r9.ga9934d4-1
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD6
-rw-r--r--slurmctld.service9
-rw-r--r--slurmd.service13
-rw-r--r--slurmdbd.service9
5 files changed, 25 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 173287e8a85..391b274a4a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -37,9 +37,9 @@ pkgbase = slurm-llnl-git
source = slurm-llnl-git::git+https://github.com/SchedMD/slurm.git
md5sums = 51e4ae2c51edf7c145d1b87bec4c344e
md5sums = cae664b8ef44d01783dade9088e25b53
- md5sums = 834b641efbcb45d300630f51f08a9122
- md5sums = 231a6634fcf774642021377920fffe39
- md5sums = cef9d45137b9bd431dce3cbe85ef9bca
+ md5sums = 06b572524c0e419d91c81d84c169358b
+ md5sums = 5cfc5d7bf548dd0dd3b6ac3708daccb7
+ md5sums = da7a52451ce31c9269211b309f9ebe1c
md5sums = SKIP
pkgname = slurm-llnl-git
diff --git a/PKGBUILD b/PKGBUILD
index 9e90e8d26c8..479a21e97f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -38,9 +38,9 @@ source=("slurm-tmpfiles.conf"
"${pkgname}"::"git+https://github.com/SchedMD/slurm.git")
md5sums=('51e4ae2c51edf7c145d1b87bec4c344e'
'cae664b8ef44d01783dade9088e25b53'
- '834b641efbcb45d300630f51f08a9122'
- '231a6634fcf774642021377920fffe39'
- 'cef9d45137b9bd431dce3cbe85ef9bca'
+ '06b572524c0e419d91c81d84c169358b'
+ '5cfc5d7bf548dd0dd3b6ac3708daccb7'
+ 'da7a52451ce31c9269211b309f9ebe1c'
'SKIP')
pkgver() {
diff --git a/slurmctld.service b/slurmctld.service
index a9388b32a14..543bb55f0f2 100644
--- a/slurmctld.service
+++ b/slurmctld.service
@@ -5,10 +5,11 @@ Requires=munge.service
ConditionPathExists=/etc/slurm-llnl/slurm.conf
[Service]
-Type=simple
-EnvironmentFile=/etc/default/slurm-llnl
-ExecStart=/usr/bin/slurmctld -D $SLURMCTLD_OPTIONS
-PIDFile=/var/run/slurm/slurmctld.pid
+Type=forking
+EnvironmentFile=-/etc/default/slurm-llnl
+ExecStart=/usr/bin/slurmctld $SLURMCTLD_OPTIONS
+ExecReload=/bin/kill -HUP $MAINPID
+PIDFile=/run/slurm-llnl/slurmctld.pid
[Install]
WantedBy=multi-user.target
diff --git a/slurmd.service b/slurmd.service
index 382935c2ea3..35629cf3bda 100644
--- a/slurmd.service
+++ b/slurmd.service
@@ -5,10 +5,15 @@ Requires=munge.service
ConditionPathExists=/etc/slurm-llnl/slurm.conf
[Service]
-Type=simple
-EnvironmentFile=/etc/default/slurm-llnl
-ExecStart=/usr/bin/slurmd -D $SLURMD_OPTIONS
-PIDFile=/var/run/slurm/slurmd.pid
+Type=forking
+EnvironmentFile=-/etc/default/slurm-llnl
+ExecStart=/usr/bin/slurmd $SLURMD_OPTIONS
+ExecReload=/bin/kill -HUP $MAINPID
+PIDFile=/run/slurm-llnl/slurmd.pid
+KillMode=process
+LimitNOFILE=51200
+LimitMEMLOCK=infinity
+LimitSTACK=infinity
[Install]
WantedBy=multi-user.target
diff --git a/slurmdbd.service b/slurmdbd.service
index 262db447468..5ac617854f6 100644
--- a/slurmdbd.service
+++ b/slurmdbd.service
@@ -4,10 +4,11 @@ After=network.target mysqld.service
ConditionPathExists=/etc/slurm-llnl/slurmdbd.conf
[Service]
-Type=simple
-EnvironmentFile=/etc/default/slurm-llnl
-ExecStart=/usr/bin/slurmdbd -D $SLURMDBD_OPTIONS
-PIDFile=/var/run/slurm/slurmdbd.pid
+Type=forking
+EnvironmentFile=-/etc/default/slurm-llnl
+ExecStart=/usr/bin/slurmdbd $SLURMDBD_OPTIONS
+ExecReload=/bin/kill -HUP $MAINPID
+PIDFile=/run/slurm-llnl/slurmdbd.pid
[Install]
WantedBy=multi-user.target