diff options
| author | Johan Thomsen <jth@dbc.dk> | 2021-05-10 12:08:56 +0200 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-05-17 06:17:18 +1000 |
| commit | 7e310dd8e82cbbaae9132756d7da9bf85ad10ab3 (patch) | |
| tree | 3ce92fe559729bc8c13169641fa13395f355e486 /nixos | |
| parent | 2142f885261a690a17a9e208b4cff270c6e3386a (diff) | |
| download | nixpkgs-7e310dd8e82cbbaae9132756d7da9bf85ad10ab3.tar nixpkgs-7e310dd8e82cbbaae9132756d7da9bf85ad10ab3.tar.gz nixpkgs-7e310dd8e82cbbaae9132756d7da9bf85ad10ab3.tar.bz2 nixpkgs-7e310dd8e82cbbaae9132756d7da9bf85ad10ab3.tar.lz nixpkgs-7e310dd8e82cbbaae9132756d7da9bf85ad10ab3.tar.xz nixpkgs-7e310dd8e82cbbaae9132756d7da9bf85ad10ab3.tar.zst nixpkgs-7e310dd8e82cbbaae9132756d7da9bf85ad10ab3.zip | |
nixos/containerd: StartLimit* options must be in the unit-section
also, raise limits to ensure reasonable startup time, now that StartLimits are actually enforced
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/virtualisation/containerd.nix | 8 |
1 files 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"; + }; }; }; } |