From 368827e9078e29a3a1b07f07718411f35d3767d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Jeanneret?= Date: Tue, 25 Aug 2020 07:51:13 +0200 Subject: [PATCH] [USSURI-ONLY] Add new parameter: pids_limit The default PID limit in a container is set to 4096. This limit might be reached in a nova_libvirt container, after launching about 150 VMs. Change-Id: Iebad9919caf805715da9268f9ee8a40b4392642a Related: https://bugzilla.redhat.com/show_bug.cgi?id=1871885 Closes-Bug: #1892817 --- paunch/builder/podman.py | 1 + paunch/tests/test_builder_podman.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/paunch/builder/podman.py b/paunch/builder/podman.py index 057e5c4..43add52 100644 --- a/paunch/builder/podman.py +++ b/paunch/builder/podman.py @@ -67,6 +67,7 @@ class PodmanBuilder(base.BaseBuilder): self.string_arg(cconfig, cmd, 'ipc', '--ipc') self.string_arg(cconfig, cmd, 'pid', '--pid') self.string_arg(cconfig, cmd, 'uts', '--uts') + self.string_arg(cconfig, cmd, 'pids_limit', '--pids-limit') # TODO(sbaker): implement ulimits property, deprecate this ulimit # property for u in cconfig.get('ulimit', []): diff --git a/paunch/tests/test_builder_podman.py b/paunch/tests/test_builder_podman.py index 669baa7..77ec29f 100644 --- a/paunch/tests/test_builder_podman.py +++ b/paunch/tests/test_builder_podman.py @@ -41,6 +41,7 @@ class TestPodmanBuilder(base.TestBaseBuilder): 'cap_add': ['SYS_ADMIN', 'SETUID'], 'cap_drop': ['NET_RAW'], 'hostname': 'foohostname', + 'pids_limit': '1024', 'extra_hosts': [ 'foohost:127.0.0.1', 'barhost:127.0.0.2' @@ -56,7 +57,8 @@ class TestPodmanBuilder(base.TestBaseBuilder): '--conmon-pidfile=/var/run/one.pid', '--detach=true', '--env-file=/tmp/foo.env', '--net=host', '--ipc=host', '--pid=container:bar', - '--uts=host', '--privileged=true', '--user=bar', + '--uts=host', '--pids-limit=1024', + '--privileged=true', '--user=bar', '--log-opt=tag={{.ImageName}}/{{.Name}}/{{.ID}}', '--cpu-shares=600', '--memory=1G',