2024-11-12 10:34:28 +00:00
|
|
|
From 065584036f8072c994a8bdab210bcfd0ff483960 Mon Sep 17 00:00:00 2001
|
2024-09-04 20:19:58 +00:00
|
|
|
From: Lubomir Rintel <lkundrak@v3.sk>
|
|
|
|
|
Date: Tue, 27 Aug 2024 00:29:17 +0200
|
|
|
|
|
Subject: [PATCH] cloud-setup: allow bigger restart bursts
|
|
|
|
|
|
|
|
|
|
On daemon startup, we may end up enqueueing many nm-cloud-setup.service
|
|
|
|
|
restarts in very a short time. That is perfectly fine, just bump the
|
|
|
|
|
thresholds so that systemd doesn't get in the way too quickly.
|
|
|
|
|
|
|
|
|
|
100 requests in 1 seconds seem like a fair choice -- little bit on the
|
|
|
|
|
conservative side, yet still giving the service manager some room to
|
|
|
|
|
interfere on a chance things really go awry.
|
|
|
|
|
|
|
|
|
|
https://issues.redhat.com/browse/RHEL-49694
|
|
|
|
|
(cherry picked from commit 927cff9f178911b2a146259a89bfcc9727cbd8c3)
|
|
|
|
|
(cherry picked from commit 4dc35c72744f8820575ab0ea4638c4ddd880547d)
|
|
|
|
|
---
|
|
|
|
|
src/nm-cloud-setup/nm-cloud-setup.service.in | 11 +++++++++++
|
|
|
|
|
1 file changed, 11 insertions(+)
|
|
|
|
|
|
|
|
|
|
diff --git a/src/nm-cloud-setup/nm-cloud-setup.service.in b/src/nm-cloud-setup/nm-cloud-setup.service.in
|
2024-11-12 10:34:28 +00:00
|
|
|
index e73654d892..ecb70e1c8e 100644
|
2024-09-04 20:19:58 +00:00
|
|
|
--- a/src/nm-cloud-setup/nm-cloud-setup.service.in
|
|
|
|
|
+++ b/src/nm-cloud-setup/nm-cloud-setup.service.in
|
|
|
|
|
@@ -8,6 +8,17 @@ After=NetworkManager.service
|
|
|
|
|
Type=oneshot
|
|
|
|
|
ExecStart=@libexecdir@/nm-cloud-setup
|
|
|
|
|
|
|
|
|
|
+# The service restart gets triggered from dispatcher script
|
|
|
|
|
+# (pre-up and dhcp4-change actions), possibly ending up with many
|
|
|
|
|
+# restart requests at the same time (e.g. on initial daemon startup
|
|
|
|
|
+# on a machine with multiple NICs). The systemd handles multiple
|
|
|
|
|
+# concurrent restart requests gracefully (the newer requests supersede
|
|
|
|
|
+# older, which wait for them to finish), but the default limits are way
|
|
|
|
|
+# too low: 5 restarts in 10 seconds. Raise that high enough for us to
|
|
|
|
|
+# be on the safe side.
|
|
|
|
|
+StartLimitIntervalSec=1
|
|
|
|
|
+StartLimitBurst=100
|
|
|
|
|
+
|
|
|
|
|
#Environment=NM_CLOUD_SETUP_LOG=TRACE
|
|
|
|
|
|
|
|
|
|
# Cloud providers are disabled by default. You need to
|
|
|
|
|
--
|
|
|
|
|
2.46.0
|
|
|
|
|
|
