[ARVADOS] created: 1.1.2-18-g4b9a74f
Git user
git at public.curoverse.com
Mon Jan 8 09:35:56 EST 2018
at 4b9a74f8ce269ebd19b8cfa77c7ebb74df125429 (commit)
commit 4b9a74f8ce269ebd19b8cfa77c7ebb74df125429
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Fri Dec 15 14:08:16 2017 -0500
12720: Invoke StartLimitInterval three different ways.
Needed to convince various versions of systemd not to go into "leave
service down and wait for manual intervention" mode automatically.
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..6f8cca8 100644
--- a/services/arv-git-httpd/arvados-git-httpd.service
+++ b/services/arv-git-httpd/arvados-git-httpd.service
@@ -7,9 +7,11 @@ Description=Arvados git server
Documentation=https://doc.arvados.org/
After=network.target
AssertPathExists=/etc/arvados/git-httpd/git-httpd.yml
-# systemd<230
+
+# systemd==229 (ubuntu:xenial) obeys StartLimitInterval in the [Unit] section
StartLimitInterval=0
-# systemd>=230
+
+# systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section
StartLimitIntervalSec=0
[Service]
@@ -18,5 +20,8 @@ ExecStart=/usr/bin/arvados-git-httpd
Restart=always
RestartSec=1
+# systemd<=219 (centos:7, debian:8, ubuntu:trusty) obeys StartLimitInterval in the [Service] section
+StartLimitInterval=0
+
[Install]
WantedBy=multi-user.target
diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.service b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.service
index ac84243..508a0df 100644
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.service
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.service
@@ -7,9 +7,11 @@ 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
+
+# systemd==229 (ubuntu:xenial) obeys StartLimitInterval in the [Unit] section
StartLimitInterval=0
-# systemd>=230
+
+# systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section
StartLimitIntervalSec=0
[Service]
@@ -18,5 +20,8 @@ ExecStart=/usr/bin/crunch-dispatch-slurm
Restart=always
RestartSec=1
+# systemd<=219 (centos:7, debian:8, ubuntu:trusty) obeys StartLimitInterval in the [Service] section
+StartLimitInterval=0
+
[Install]
WantedBy=multi-user.target
diff --git a/services/dockercleaner/arvados-docker-cleaner.service b/services/dockercleaner/arvados-docker-cleaner.service
index 6ab3fdf..b48b46b 100644
--- a/services/dockercleaner/arvados-docker-cleaner.service
+++ b/services/dockercleaner/arvados-docker-cleaner.service
@@ -7,9 +7,11 @@ Description=Arvados Docker Image Cleaner
Documentation=https://doc.arvados.org/
After=network.target
AssertPathExists=/etc/arvados/docker-cleaner/docker-cleaner.json
-# systemd<230
+
+# systemd==229 (ubuntu:xenial) obeys StartLimitInterval in the [Unit] section
StartLimitInterval=0
-# systemd>=230
+
+# systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section
StartLimitIntervalSec=0
[Service]
@@ -23,5 +25,8 @@ RestartPreventExitStatus=2
# Collection, and if so, invokes it with the "scl" wrapper.
ExecStart=/bin/sh -c 'if [ -e /opt/rh/python33/root/bin/arvados-docker-cleaner ]; then exec scl enable python33 arvados-docker-cleaner; else exec arvados-docker-cleaner; fi'
+# systemd<=219 (centos:7, debian:8, ubuntu:trusty) obeys StartLimitInterval in the [Service] section
+StartLimitInterval=0
+
[Install]
WantedBy=multi-user.target
diff --git a/services/health/arvados-health.service b/services/health/arvados-health.service
index a3d0365..dac7c3a 100644
--- a/services/health/arvados-health.service
+++ b/services/health/arvados-health.service
@@ -7,16 +7,21 @@ Description=Arvados healthcheck server
Documentation=https://doc.arvados.org/
After=network.target
AssertPathExists=/etc/arvados/config.yml
-# systemd<230
+
+# systemd==229 (ubuntu:xenial) obeys StartLimitInterval in the [Unit] section
StartLimitInterval=0
-# systemd>=230
+
+# systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section
StartLimitIntervalSec=0
[Service]
Type=simple
ExecStart=/usr/bin/arvados-health
Restart=always
-RestartSec=1s
+RestartSec=1
+
+# systemd<=219 (centos:7, debian:8, ubuntu:trusty) obeys StartLimitInterval in the [Service] section
+StartLimitInterval=0
[Install]
WantedBy=multi-user.target
diff --git a/services/keep-balance/keep-balance.service b/services/keep-balance/keep-balance.service
index df08b5b..325affe 100644
--- a/services/keep-balance/keep-balance.service
+++ b/services/keep-balance/keep-balance.service
@@ -7,9 +7,11 @@ Description=Arvados Keep Balance
Documentation=https://doc.arvados.org/
After=network.target
AssertPathExists=/etc/arvados/keep-balance/keep-balance.yml
-# systemd<230
+
+# systemd==229 (ubuntu:xenial) obeys StartLimitInterval in the [Unit] section
StartLimitInterval=0
-# systemd>=230
+
+# systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section
StartLimitIntervalSec=0
[Service]
@@ -18,5 +20,8 @@ ExecStart=/usr/bin/keep-balance -commit-pulls -commit-trash
Restart=always
RestartSec=10s
+# systemd<=219 (centos:7, debian:8, ubuntu:trusty) obeys StartLimitInterval in the [Service] section
+StartLimitInterval=0
+
[Install]
WantedBy=multi-user.target
diff --git a/services/keep-web/keep-web.service b/services/keep-web/keep-web.service
index a8f8f1f..1931256 100644
--- a/services/keep-web/keep-web.service
+++ b/services/keep-web/keep-web.service
@@ -7,9 +7,11 @@ Description=Arvados Keep web gateway
Documentation=https://doc.arvados.org/
After=network.target
AssertPathExists=/etc/arvados/keep-web/keep-web.yml
-# systemd<230
+
+# systemd==229 (ubuntu:xenial) obeys StartLimitInterval in the [Unit] section
StartLimitInterval=0
-# systemd>=230
+
+# systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section
StartLimitIntervalSec=0
[Service]
@@ -18,5 +20,8 @@ ExecStart=/usr/bin/keep-web
Restart=always
RestartSec=1
+# systemd<=219 (centos:7, debian:8, ubuntu:trusty) obeys StartLimitInterval in the [Service] section
+StartLimitInterval=0
+
[Install]
WantedBy=multi-user.target
diff --git a/services/keepproxy/keepproxy.service b/services/keepproxy/keepproxy.service
index d7ee97e..96dec25 100644
--- a/services/keepproxy/keepproxy.service
+++ b/services/keepproxy/keepproxy.service
@@ -7,9 +7,11 @@ Description=Arvados Keep Proxy
Documentation=https://doc.arvados.org/
After=network.target
AssertPathExists=/etc/arvados/keepproxy/keepproxy.yml
-# systemd<230
+
+# systemd==229 (ubuntu:xenial) obeys StartLimitInterval in the [Unit] section
StartLimitInterval=0
-# systemd>=230
+
+# systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section
StartLimitIntervalSec=0
[Service]
@@ -18,5 +20,8 @@ ExecStart=/usr/bin/keepproxy
Restart=always
RestartSec=1
+# systemd<=219 (centos:7, debian:8, ubuntu:trusty) obeys StartLimitInterval in the [Service] section
+StartLimitInterval=0
+
[Install]
WantedBy=multi-user.target
diff --git a/services/keepstore/keepstore.service b/services/keepstore/keepstore.service
index 14572ae..8b448e7 100644
--- a/services/keepstore/keepstore.service
+++ b/services/keepstore/keepstore.service
@@ -7,9 +7,11 @@ Description=Arvados Keep Storage Daemon
Documentation=https://doc.arvados.org/
After=network.target
AssertPathExists=/etc/arvados/keepstore/keepstore.yml
-# systemd<230
+
+# systemd==229 (ubuntu:xenial) obeys StartLimitInterval in the [Unit] section
StartLimitInterval=0
-# systemd>=230
+
+# systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section
StartLimitIntervalSec=0
[Service]
@@ -18,5 +20,8 @@ ExecStart=/usr/bin/keepstore
Restart=always
RestartSec=1
+# systemd<=219 (centos:7, debian:8, ubuntu:trusty) obeys StartLimitInterval in the [Service] section
+StartLimitInterval=0
+
[Install]
WantedBy=multi-user.target
diff --git a/services/ws/arvados-ws.service b/services/ws/arvados-ws.service
index 4385261..9e02d41 100644
--- a/services/ws/arvados-ws.service
+++ b/services/ws/arvados-ws.service
@@ -7,9 +7,11 @@ Description=Arvados websocket server
Documentation=https://doc.arvados.org/
After=network.target
AssertPathExists=/etc/arvados/ws/ws.yml
-# systemd<230
+
+# systemd==229 (ubuntu:xenial) obeys StartLimitInterval in the [Unit] section
StartLimitInterval=0
-# systemd>=230
+
+# systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section
StartLimitIntervalSec=0
[Service]
@@ -18,5 +20,8 @@ ExecStart=/usr/bin/arvados-ws
Restart=always
RestartSec=1
+# systemd<=219 (centos:7, debian:8, ubuntu:trusty) obeys StartLimitInterval in the [Service] section
+StartLimitInterval=0
+
[Install]
WantedBy=multi-user.target
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list