[ARVADOS] created: 1.1.1-263-g061972f
Git user
git at public.curoverse.com
Fri Dec 15 13:29:22 EST 2017
at 061972fbd9f77ac3b0c0cadfa2ed3ecddcb100d4 (commit)
commit 061972fbd9f77ac3b0c0cadfa2ed3ecddcb100d4
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Fri Dec 15 13:20:05 2017 -0500
12720: Avoid systemd compatibility problems.
StartLimitInterval=0 fails in systemd>=230 (debian:9).
StartLimitIntervalSec=0 fails in systemd<230 (centos:7, debian:8,
ubuntu:trusty, ubuntu:xenial).
StartLimitBurst=12 is supported by all, and when combined with
RestartSec=1 it accomplishes the same thing as StartLimitInterval=0 in
a default systemd installation.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/services/arv-git-httpd/arvados-git-httpd.service b/services/arv-git-httpd/arvados-git-httpd.service
index 300b5c1..0c3a17a 100644
--- a/services/arv-git-httpd/arvados-git-httpd.service
+++ b/services/arv-git-httpd/arvados-git-httpd.service
@@ -7,10 +7,7 @@ Description=Arvados git server
Documentation=https://doc.arvados.org/
After=network.target
AssertPathExists=/etc/arvados/git-httpd/git-httpd.yml
-# systemd<230
-StartLimitInterval=0
-# systemd>=230
-StartLimitIntervalSec=0
+StartLimitBurst=12
[Service]
Type=notify
diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.service b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.service
index ac84243..ece8187 100644
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.service
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.service
@@ -7,10 +7,7 @@ Description=Arvados Crunch Dispatcher for SLURM
Documentation=https://doc.arvados.org/
After=network.target
AssertPathExists=/etc/arvados/crunch-dispatch-slurm/crunch-dispatch-slurm.yml
-# systemd<230
-StartLimitInterval=0
-# systemd>=230
-StartLimitIntervalSec=0
+StartLimitBurst=12
[Service]
Type=notify
diff --git a/services/dockercleaner/arvados-docker-cleaner.service b/services/dockercleaner/arvados-docker-cleaner.service
index 6ab3fdf..9e128b5 100644
--- a/services/dockercleaner/arvados-docker-cleaner.service
+++ b/services/dockercleaner/arvados-docker-cleaner.service
@@ -7,10 +7,7 @@ Description=Arvados Docker Image Cleaner
Documentation=https://doc.arvados.org/
After=network.target
AssertPathExists=/etc/arvados/docker-cleaner/docker-cleaner.json
-# systemd<230
-StartLimitInterval=0
-# systemd>=230
-StartLimitIntervalSec=0
+StartLimitBurst=12
[Service]
Type=simple
diff --git a/services/keep-balance/keep-balance.service b/services/keep-balance/keep-balance.service
index df08b5b..5cfb429 100644
--- a/services/keep-balance/keep-balance.service
+++ b/services/keep-balance/keep-balance.service
@@ -7,10 +7,7 @@ Description=Arvados Keep Balance
Documentation=https://doc.arvados.org/
After=network.target
AssertPathExists=/etc/arvados/keep-balance/keep-balance.yml
-# systemd<230
-StartLimitInterval=0
-# systemd>=230
-StartLimitIntervalSec=0
+StartLimitBurst=12
[Service]
Type=simple
diff --git a/services/keep-web/keep-web.service b/services/keep-web/keep-web.service
index a8f8f1f..73da532 100644
--- a/services/keep-web/keep-web.service
+++ b/services/keep-web/keep-web.service
@@ -7,10 +7,7 @@ Description=Arvados Keep web gateway
Documentation=https://doc.arvados.org/
After=network.target
AssertPathExists=/etc/arvados/keep-web/keep-web.yml
-# systemd<230
-StartLimitInterval=0
-# systemd>=230
-StartLimitIntervalSec=0
+StartLimitBurst=12
[Service]
Type=notify
diff --git a/services/keepproxy/keepproxy.service b/services/keepproxy/keepproxy.service
index d7ee97e..b5aebf9 100644
--- a/services/keepproxy/keepproxy.service
+++ b/services/keepproxy/keepproxy.service
@@ -7,10 +7,7 @@ Description=Arvados Keep Proxy
Documentation=https://doc.arvados.org/
After=network.target
AssertPathExists=/etc/arvados/keepproxy/keepproxy.yml
-# systemd<230
-StartLimitInterval=0
-# systemd>=230
-StartLimitIntervalSec=0
+StartLimitBurst=12
[Service]
Type=notify
diff --git a/services/keepstore/keepstore.service b/services/keepstore/keepstore.service
index 14572ae..d6607ba 100644
--- a/services/keepstore/keepstore.service
+++ b/services/keepstore/keepstore.service
@@ -7,10 +7,7 @@ Description=Arvados Keep Storage Daemon
Documentation=https://doc.arvados.org/
After=network.target
AssertPathExists=/etc/arvados/keepstore/keepstore.yml
-# systemd<230
-StartLimitInterval=0
-# systemd>=230
-StartLimitIntervalSec=0
+StartLimitBurst=12
[Service]
Type=notify
diff --git a/services/ws/arvados-ws.service b/services/ws/arvados-ws.service
index 4385261..b4d5b4d 100644
--- a/services/ws/arvados-ws.service
+++ b/services/ws/arvados-ws.service
@@ -7,10 +7,7 @@ Description=Arvados websocket server
Documentation=https://doc.arvados.org/
After=network.target
AssertPathExists=/etc/arvados/ws/ws.yml
-# systemd<230
-StartLimitInterval=0
-# systemd>=230
-StartLimitIntervalSec=0
+StartLimitBurst=12
[Service]
Type=notify
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list