mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-13 16:06:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

app-containers/containerd: Migrate to Type=notify in containerd.service

Browse Source 
Race condition arises when the containerd service unit assumes services are
ready as soon as they start running, rather than when they can actually accept
socket requests. To rectify this, changing the unit to Type=notify is required,
utilizing the existing containerd support for sd_notify call after socket setup.
In addition to this, the configuration is more aligned with upstream.

https://www.freedesktop.org/software/systemd/man/systemd.service.html#Type=
This commit is contained in:
krishjainx 2023-06-05 16:57:54 +02:00
parent 813f7f5f5a
commit 00c4a289b6
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sdk_container/src/third_party/coreos-overlay/app-containers/containerd/files/containerd.service vendored
View File

@ -1,20 +1,24 @@
[Unit] [Unit]
Description=Containerd Container Daemon Description=containerd container runtime
Documentation=http://github.com/docker/containerd Documentation=https://containerd.io
After=network.target local-fs.target
[Service] [Service]
Type=simple ExecStartPre=-/sbin/modprobe overlay
ExecStart=/usr/bin/containerd --listen unix:///var/run/docker/libcontainerd/docker-containerd.sock --shim /usr/bin/containerd-shim --state-dir /var/run/docker/libcontainerd/containerd --start-timeout 2m ExecStart=/usr/bin/containerd --listen unix:///var/run/docker/libcontainerd/docker-containerd.sock --shim /usr/bin/containerd-shim --state-dir /var/run/docker/libcontainerd/containerd --start-timeout 2m
Restart=always
# (lack of) limits from the upstream docker service unit Type=notify
LimitNOFILE=1048576 Delegate=yes
KillMode=process
Restart=always
RestartSec=5
# Having non-zero Limit*s causes performance problems due to accounting overhead
# in the kernel. We recommend using cgroups to do container-local accounting.
LimitNPROC=infinity LimitNPROC=infinity
LimitCORE=infinity LimitCORE=infinity
LimitNOFILE=infinity
TasksMax=infinity TasksMax=infinity
OOMScoreAdjust=-999
# set delegate yes so that systemd does not reset the cgroups of containers
Delegate=yes
[Install] [Install]
WantedBy=multi-user.target early-docker.target WantedBy=multi-user.target early-docker.target