From 7e310dd8e82cbbaae9132756d7da9bf85ad10ab3 Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Mon, 10 May 2021 12:08:56 +0200 Subject: [PATCH] nixos/containerd: StartLimit* options must be in the unit-section also, raise limits to ensure reasonable startup time, now that StartLimits are actually enforced --- nixos/modules/virtualisation/containerd.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/virtualisation/containerd.nix b/nixos/modules/virtualisation/containerd.nix index 6d6ba454bd8..b554bc6ea24 100644 --- a/nixos/modules/virtualisation/containerd.nix +++ b/nixos/modules/virtualisation/containerd.nix @@ -44,9 +44,7 @@ in KillMode = "process"; Type = "notify"; Restart = "always"; - RestartSec = "5"; - StartLimitBurst = "8"; - StartLimitIntervalSec = "120s"; + RestartSec = "10"; # "limits" defined below are adopted from upstream: https://github.com/containerd/containerd/blob/master/containerd.service LimitNPROC = "infinity"; @@ -58,6 +56,10 @@ in StateDirectory = "containerd"; RuntimeDirectory = "containerd"; }; + unitConfig = { + StartLimitBurst = "16"; + StartLimitIntervalSec = "120s"; + }; }; }; }