21361: Remove StartLimitInterval from service units

CentOS 7 was the last distribution we supported with systemd this old,
and that ends with Arvados 3.0.

Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith@curii.com>

diff --git a/cmd/arvados-server/arvados-controller.service b/cmd/arvados-server/arvados-controller.service
index f96532de5ef30d167944dfc23b958a16e26bcce9..a66db787a765241c551e85a63d9a8e187ad9a4c8 100644 (file)
--- a/cmd/arvados-server/arvados-controller.service
+++ b/cmd/arvados-server/arvados-controller.service
@@ -7,8 +7,6 @@ Description=Arvados controller
 Documentation=https://doc.arvados.org/
 After=network.target
 AssertPathExists=/etc/arvados/config.yml
-
-# systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section
 StartLimitIntervalSec=0
 
 [Service]
@@ -21,8 +19,5 @@ Restart=always
 RestartSec=1
 RestartPreventExitStatus=2
 
-# systemd<=219 (centos:7, debian:8, ubuntu:trusty) obeys StartLimitInterval in the [Service] section
-StartLimitInterval=0
-
 [Install]
 WantedBy=multi-user.target

diff --git a/cmd/arvados-server/arvados-dispatch-cloud.service b/cmd/arvados-server/arvados-dispatch-cloud.service
index 11887b8f8c5ca99324cd4c82075d83a11325042c..09b0ba94a91eb4eb30665cfa46d5d4ab4e88a074 100644 (file)
--- a/cmd/arvados-server/arvados-dispatch-cloud.service
+++ b/cmd/arvados-server/arvados-dispatch-cloud.service
@@ -7,8 +7,6 @@ Description=arvados-dispatch-cloud
 Documentation=https://doc.arvados.org/
 After=network.target
 AssertPathExists=/etc/arvados/config.yml
-
-# systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section
 StartLimitIntervalSec=0
 
 [Service]
@@ -21,8 +19,5 @@ Restart=always
 RestartSec=1
 RestartPreventExitStatus=2
 
-# systemd<=219 (centos:7, debian:8, ubuntu:trusty) obeys StartLimitInterval in the [Service] section
-StartLimitInterval=0
-
 [Install]
 WantedBy=multi-user.target

diff --git a/cmd/arvados-server/arvados-dispatch-lsf.service b/cmd/arvados-server/arvados-dispatch-lsf.service
index f90cd9033d4b444932519cb8c230f242eaea5c1c..a683e856885a5d1696507a1fe87b410374701027 100644 (file)
--- a/cmd/arvados-server/arvados-dispatch-lsf.service
+++ b/cmd/arvados-server/arvados-dispatch-lsf.service
@@ -7,8 +7,6 @@ Description=arvados-dispatch-lsf
 Documentation=https://doc.arvados.org/
 After=network.target
 AssertPathExists=/etc/arvados/config.yml
-
-# systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section
 StartLimitIntervalSec=0
 
 [Service]
@@ -21,8 +19,5 @@ Restart=always
 RestartSec=1
 RestartPreventExitStatus=2
 
-# systemd<=219 (centos:7, debian:8, ubuntu:trusty) obeys StartLimitInterval in the [Service] section
-StartLimitInterval=0
-
 [Install]
 WantedBy=multi-user.target

diff --git a/cmd/arvados-server/arvados-git-httpd.service b/cmd/arvados-server/arvados-git-httpd.service
index 6e5b0dc8e284d64ff5bf2b50bfceded013dfbcd0..517a75c03d027d66268773fbcf1e7c711c8dfd26 100644 (file)
--- a/cmd/arvados-server/arvados-git-httpd.service
+++ b/cmd/arvados-server/arvados-git-httpd.service
@@ -7,8 +7,6 @@ Description=Arvados git server
 Documentation=https://doc.arvados.org/
 After=network.target
 AssertPathExists=/etc/arvados/config.yml
-
-# systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section
 StartLimitIntervalSec=0
 
 [Service]
@@ -21,8 +19,5 @@ Restart=always
 RestartSec=1
 RestartPreventExitStatus=2
 
-# systemd<=219 (centos:7, debian:8, ubuntu:trusty) obeys StartLimitInterval in the [Service] section
-StartLimitInterval=0
-
 [Install]
 WantedBy=multi-user.target

diff --git a/cmd/arvados-server/arvados-health.service b/cmd/arvados-server/arvados-health.service
index ef145e26ebcb1989dc3c3f60d6e7a7e69f8cb0b5..899bfac219c879fec682cdcb71b0725b10445f05 100644 (file)
--- a/cmd/arvados-server/arvados-health.service
+++ b/cmd/arvados-server/arvados-health.service
@@ -7,8 +7,6 @@ Description=Arvados healthcheck server
 Documentation=https://doc.arvados.org/
 After=network.target
 AssertPathExists=/etc/arvados/config.yml
-
-# systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section
 StartLimitIntervalSec=0
 
 [Service]
@@ -21,8 +19,5 @@ Restart=always
 RestartSec=1
 RestartPreventExitStatus=2
 
-# systemd<=219 (centos:7, debian:8, ubuntu:trusty) obeys StartLimitInterval in the [Service] section
-StartLimitInterval=0
-
 [Install]
 WantedBy=multi-user.target

diff --git a/cmd/arvados-server/arvados-ws.service b/cmd/arvados-server/arvados-ws.service
index 2e884495998280936a4dc4375bcac6d9d26006ae..fc6eb4978a156a28fec5df3ce4a362a151a70152 100644 (file)
--- a/cmd/arvados-server/arvados-ws.service
+++ b/cmd/arvados-server/arvados-ws.service
@@ -7,8 +7,6 @@ Description=Arvados websocket server
 Documentation=https://doc.arvados.org/
 After=network.target
 AssertPathExists=/etc/arvados/config.yml
-
-# systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section
 StartLimitIntervalSec=0
 
 [Service]
@@ -20,8 +18,5 @@ Restart=always
 RestartSec=1
 RestartPreventExitStatus=2
 
-# systemd<=219 (centos:7, debian:8, ubuntu:trusty) obeys StartLimitInterval in the [Service] section
-StartLimitInterval=0
-
 [Install]
 WantedBy=multi-user.target

diff --git a/cmd/arvados-server/crunch-dispatch-slurm.service b/cmd/arvados-server/crunch-dispatch-slurm.service
index d2a2fb39d9dca39a3df99f57989ae9d7db1c4fbf..83933c17604376a45589c76edcbcbea930735515 100644 (file)
--- a/cmd/arvados-server/crunch-dispatch-slurm.service
+++ b/cmd/arvados-server/crunch-dispatch-slurm.service
@@ -7,8 +7,6 @@ Description=Arvados Crunch Dispatcher for SLURM
 Documentation=https://doc.arvados.org/
 After=network.target
 AssertPathExists=/etc/arvados/config.yml
-
-# systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section
 StartLimitIntervalSec=0
 
 [Service]
@@ -21,8 +19,5 @@ Restart=always
 RestartSec=1
 RestartPreventExitStatus=2
 
-# systemd<=219 (centos:7, debian:8, ubuntu:trusty) obeys StartLimitInterval in the [Service] section
-StartLimitInterval=0
-
 [Install]
 WantedBy=multi-user.target

diff --git a/cmd/arvados-server/keep-balance.service b/cmd/arvados-server/keep-balance.service
index f282f0a65021ad78e7f628ee3d94fef976231836..1d759d623786cbfb89a55351bcc32fbeb67568d3 100644 (file)
--- a/cmd/arvados-server/keep-balance.service
+++ b/cmd/arvados-server/keep-balance.service
@@ -7,8 +7,6 @@ Description=Arvados Keep Balance
 Documentation=https://doc.arvados.org/
 After=network.target
 AssertPathExists=/etc/arvados/config.yml
-
-# systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section
 StartLimitIntervalSec=0
 
 [Service]
@@ -22,8 +20,5 @@ RestartSec=10s
 Nice=19
 RestartPreventExitStatus=2
 
-# systemd<=219 (centos:7, debian:8, ubuntu:trusty) obeys StartLimitInterval in the [Service] section
-StartLimitInterval=0
-
 [Install]
 WantedBy=multi-user.target

diff --git a/cmd/arvados-server/keep-web.service b/cmd/arvados-server/keep-web.service
index 4ecd0b49782561da91c49f0a3dea38e9306a2b7b..d94124c6de69c4c520037144e1c63f45a53bf9d5 100644 (file)
--- a/cmd/arvados-server/keep-web.service
+++ b/cmd/arvados-server/keep-web.service
@@ -7,8 +7,6 @@ Description=Arvados Keep WebDAV and S3 gateway
 Documentation=https://doc.arvados.org/
 After=network.target
 AssertPathExists=/etc/arvados/config.yml
-
-# systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section
 StartLimitIntervalSec=0
 
 [Service]
@@ -21,8 +19,5 @@ Restart=always
 RestartSec=1
 RestartPreventExitStatus=2
 
-# systemd<=219 (centos:7, debian:8, ubuntu:trusty) obeys StartLimitInterval in the [Service] section
-StartLimitInterval=0
-
 [Install]
 WantedBy=multi-user.target

diff --git a/cmd/arvados-server/keepproxy.service b/cmd/arvados-server/keepproxy.service
index 139df1c3fade823cf8950e8b8e7d3c4678a80c19..c4083f23c95d2ef22150ef7f2c80a6d6b72b0a42 100644 (file)
--- a/cmd/arvados-server/keepproxy.service
+++ b/cmd/arvados-server/keepproxy.service
@@ -7,8 +7,6 @@ Description=Arvados Keep Proxy
 Documentation=https://doc.arvados.org/
 After=network.target
 AssertPathExists=/etc/arvados/config.yml
-
-# systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section
 StartLimitIntervalSec=0
 
 [Service]
@@ -21,8 +19,5 @@ Restart=always
 RestartSec=1
 RestartPreventExitStatus=2
 
-# systemd<=219 (centos:7, debian:8, ubuntu:trusty) obeys StartLimitInterval in the [Service] section
-StartLimitInterval=0
-
 [Install]
 WantedBy=multi-user.target

diff --git a/cmd/arvados-server/keepstore.service b/cmd/arvados-server/keepstore.service
index de0fd1dbd7e989a9ad7e33e93ee5149c034b4217..aa5e013dee5dd81e30a7bb39d29e440032c41437 100644 (file)
--- a/cmd/arvados-server/keepstore.service
+++ b/cmd/arvados-server/keepstore.service
@@ -7,8 +7,6 @@ Description=Arvados Keep Storage Daemon
 Documentation=https://doc.arvados.org/
 After=network.target
 AssertPathExists=/etc/arvados/config.yml
-
-# systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section
 StartLimitIntervalSec=0
 
 [Service]
@@ -25,8 +23,5 @@ Restart=always
 RestartSec=1
 RestartPreventExitStatus=2
 
-# systemd<=219 (centos:7, debian:8, ubuntu:trusty) obeys StartLimitInterval in the [Service] section
-StartLimitInterval=0
-
 [Install]
 WantedBy=multi-user.target

diff --git a/lib/install/arvados.service b/lib/install/arvados.service
index 3b68f31e9fac07208c8b4dcff46ee58f4e99deda..f536001f77ca9abdb3b1883ad8dd9051ab202961 100644 (file)
--- a/lib/install/arvados.service
+++ b/lib/install/arvados.service
@@ -7,8 +7,6 @@ Description=Arvados server
 Documentation=https://doc.arvados.org/
 After=network.target
 AssertPathExists=/etc/arvados/config.yml
-
-# systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section
 StartLimitIntervalSec=0
 
 [Service]
@@ -21,8 +19,5 @@ Restart=always
 RestartSec=1
 LimitNOFILE=65536
 
-# 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-local/crunch-dispatch-local.service b/services/crunch-dispatch-local/crunch-dispatch-local.service
index e3dd113c710cd8cf5b1cede361d794ad7fd67839..b4fc10f83ee02232b411cb101d1e7ea6b938f7cf 100644 (file)
--- a/services/crunch-dispatch-local/crunch-dispatch-local.service
+++ b/services/crunch-dispatch-local/crunch-dispatch-local.service
@@ -5,8 +5,6 @@
 Description=Arvados Crunch Dispatcher for LOCAL service
 Documentation=https://doc.arvados.org/
 After=network.target
-
-# systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section
 StartLimitIntervalSec=0
 
 [Service]
@@ -19,8 +17,5 @@ Restart=always
 RestartSec=1
 LimitNOFILE=1000000
 
-# 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 2aab42b2a37c7c4be9a6ff6907a6b6c38c3373cf..1aceb111655fa3c97c6c2dd94ffb33d57cadfb69 100644 (file)
--- a/services/dockercleaner/arvados-docker-cleaner.service
+++ b/services/dockercleaner/arvados-docker-cleaner.service
@@ -6,8 +6,6 @@
 Description=Arvados Docker Image Cleaner
 Documentation=https://doc.arvados.org/
 After=network.target
-
-# systemd>=230 (debian:9) obeys StartLimitIntervalSec in the [Unit] section
 StartLimitIntervalSec=0
 
 [Service]
@@ -21,8 +19,5 @@ RestartPreventExitStatus=2
 # Collection, and if so, invokes it with the "scl" wrapper.
 ExecStart=/bin/sh -c 'if [ -e /opt/rh/rh-python36/root/bin/arvados-docker-cleaner ]; then exec scl enable rh-python36 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