From 241c923e569c7f11b614fd1f33c3d163dd0c15e5 Mon Sep 17 00:00:00 2001
From: Joerg Behrmann <behrmann@physik.fu-berlin.de>
Date: Tue, 26 Sep 2023 11:48:53 +0200
Subject: [PATCH] Support: Increase startup limit interval for Puma and Sidekiq

Both Puma and Sidekiq are systemd services of type notify, which means that they
notify systemd once they have started. If they run into the startup timeout,
they will be restarted, but they will neer hit their start limit burst
threshold, since the window is smaller than their startup timeout times the
number of startups (DefaultStartLimitBurst=5).

This commit increases the start limit interval so that the service can fail when
repeatedly running into the startup timeout instead of being constantly
restarted.
---
 lib/support/systemd/gitlab-puma.service    | 2 +-
 lib/support/systemd/gitlab-sidekiq.service | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/support/systemd/gitlab-puma.service b/lib/support/systemd/gitlab-puma.service
index 66c411adbb293..7978dc898fc67 100644
--- a/lib/support/systemd/gitlab-puma.service
+++ b/lib/support/systemd/gitlab-puma.service
@@ -4,7 +4,7 @@ Conflicts=gitlab.service
 ReloadPropagatedFrom=gitlab.target
 PartOf=gitlab.target
 After=network.target
-StartLimitIntervalSec=100s
+StartLimitIntervalSec=11min
 
 [Service]
 Type=notify
diff --git a/lib/support/systemd/gitlab-sidekiq.service b/lib/support/systemd/gitlab-sidekiq.service
index cccf85b4ae268..0f475ba6b0d09 100644
--- a/lib/support/systemd/gitlab-sidekiq.service
+++ b/lib/support/systemd/gitlab-sidekiq.service
@@ -4,6 +4,7 @@ ReloadPropagatedFrom=gitlab.target
 PartOf=gitlab.target
 After=network.target
 JoinsNamespaceOf=gitlab-puma.service
+StartLimitIntervalSec=11min
 
 [Service]
 Type=notify
-- 
GitLab