From 4b9a74f8ce269ebd19b8cfa77c7ebb74df125429 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Fri, 15 Dec 2017 14:08:16 -0500 Subject: [PATCH] 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 --- services/arv-git-httpd/arvados-git-httpd.service | 9 +++++++-- .../crunch-dispatch-slurm.service | 9 +++++++-- services/dockercleaner/arvados-docker-cleaner.service | 9 +++++++-- services/health/arvados-health.service | 11 ++++++++--- services/keep-balance/keep-balance.service | 9 +++++++-- services/keep-web/keep-web.service | 9 +++++++-- services/keepproxy/keepproxy.service | 9 +++++++-- services/keepstore/keepstore.service | 9 +++++++-- services/ws/arvados-ws.service | 9 +++++++-- 9 files changed, 64 insertions(+), 19 deletions(-) diff --git a/services/arv-git-httpd/arvados-git-httpd.service b/services/arv-git-httpd/arvados-git-httpd.service index 300b5c1d12..6f8cca856b 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 ac842433d5..508a0dfc13 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 6ab3fdfac9..b48b46bb9a 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 a3d036549c..dac7c3a194 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 df08b5be7f..325affe587 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 a8f8f1ffa1..1931256209 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 d7ee97e963..96dec25ecf 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 14572ae905..8b448e72c3 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 4385261181..9e02d41ca8 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 -- 2.30.2