Skip to content

Commit

Permalink
Add LimitNPROC, LimitNOFILE and LimitCORE for containerd and
Browse files Browse the repository at this point in the history
cri-containerd.

Signed-off-by: Lantao Liu <lantaol@google.com>
  • Loading branch information
Random-Liu committed Dec 1, 2017
1 parent 0db6e04 commit 5a17149
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 0 deletions.
5 changes: 5 additions & 0 deletions contrib/systemd-units/containerd.service
Expand Up @@ -11,6 +11,11 @@ RestartSec=5
Delegate=yes
KillMode=process
OOMScoreAdjust=-999
LimitNOFILE=1048576
# 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
LimitCORE=infinity

[Install]
WantedBy=multi-user.target
5 changes: 5 additions & 0 deletions contrib/systemd-units/cri-containerd.service
Expand Up @@ -6,6 +6,11 @@ After=containerd.service
[Service]
Restart=always
RestartSec=5
LimitNOFILE=1048576
# 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
LimitCORE=infinity
ExecStart=/usr/local/bin/cri-containerd --logtostderr

[Install]
Expand Down
10 changes: 10 additions & 0 deletions test/e2e/master.yaml
Expand Up @@ -51,6 +51,11 @@ write_files:
RestartSec=5
Delegate=yes
KillMode=process
LimitNOFILE=1048576
# 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
LimitCORE=infinity
ExecStartPre=/sbin/modprobe overlay
ExecStart=/home/cri-containerd/usr/local/bin/containerd --log-level debug
Expand All @@ -70,6 +75,11 @@ write_files:
[Service]
Restart=always
RestartSec=5
LimitNOFILE=1048576
# 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
LimitCORE=infinity
# cri-containerd on master uses the cni binary and config in the
# release tarball.
ExecStart=/home/cri-containerd/usr/local/bin/cri-containerd \
Expand Down
10 changes: 10 additions & 0 deletions test/e2e/node.yaml
Expand Up @@ -54,6 +54,11 @@ write_files:
RestartSec=5
Delegate=yes
KillMode=process
LimitNOFILE=1048576
# 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
LimitCORE=infinity
ExecStartPre=/sbin/modprobe overlay
ExecStart=/home/cri-containerd/usr/local/bin/containerd --log-level debug
Expand All @@ -73,6 +78,11 @@ write_files:
[Service]
Restart=always
RestartSec=5
LimitNOFILE=1048576
# 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
LimitCORE=infinity
# Point to /home/kubernetes/bin where calico setup cni binary in kube-up.sh.
# Point to /etc/cni/net.d where calico put cni config in kube-up.sh.
ExecStart=/home/cri-containerd/usr/local/bin/cri-containerd \
Expand Down
10 changes: 10 additions & 0 deletions test/e2e_node/init.yaml
Expand Up @@ -49,6 +49,11 @@ write_files:
RestartSec=5
Delegate=yes
KillMode=process
LimitNOFILE=1048576
# 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
LimitCORE=infinity
ExecStartPre=/sbin/modprobe overlay
ExecStart=/home/cri-containerd/usr/local/bin/containerd --log-level debug
Expand All @@ -68,6 +73,11 @@ write_files:
[Service]
Restart=always
RestartSec=5
LimitNOFILE=1048576
# 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
LimitCORE=infinity
ExecStart=/home/cri-containerd/usr/local/bin/cri-containerd \
--logtostderr --v=4 \
--network-bin-dir=/home/cri-containerd/opt/cni/bin \
Expand Down

0 comments on commit 5a17149

Please sign in to comment.