public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/containerd: StartLimit* options must be in the unit-section

Browse Source 
also, raise limits to ensure reasonable startup time, now that StartLimits are actually enforced
This commit is contained in:
Johan Thomsen 2021-05-10 12:08:56 +02:00 committed by zowoq
parent 2142f88526
commit 7e310dd8e8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/virtualisation/containerd.nix
View File

@ -44,9 +44,7 @@ in
KillMode = "process"; KillMode = "process";
Type = "notify"; Type = "notify";
Restart = "always"; Restart = "always";
RestartSec = "5"; RestartSec = "10";
StartLimitBurst = "8";
StartLimitIntervalSec = "120s";
# "limits" defined below are adopted from upstream: https://github.com/containerd/containerd/blob/master/containerd.service # "limits" defined below are adopted from upstream: https://github.com/containerd/containerd/blob/master/containerd.service
LimitNPROC = "infinity"; LimitNPROC = "infinity";
@ -58,6 +56,10 @@ in
StateDirectory = "containerd"; StateDirectory = "containerd";
RuntimeDirectory = "containerd"; RuntimeDirectory = "containerd";
}; };
unitConfig = {
StartLimitBurst = "16";
StartLimitIntervalSec = "120s";
};
}; };
}; };
} }