Allow to limit cgroup cpu shares

Related-bug: #1755605 Change-Id: I1f24866ea2ec01e3ef22571145efa25ab219bb3a Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
openstack-archive · Mar 26, 2018 · 4a4f43a · 4a4f43a
1 parent 9b8c252
commit 4a4f43a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/paunch/builder/compose1.py b/paunch/builder/compose1.py
@@ -182,6 +182,8 @@ def docker_run_args(self, cmd, container):
                 cmd.append('--volumes-from=%s' % v)
         if 'log_tag' in cconfig:
             cmd.append('--log-opt=tag=%s' % cconfig['log_tag'])
+        if 'cpu_shares' in cconfig:
+            cmd.append('--cpu-shares=%s' % cconfig['cpu_shares'])
         if 'security_opt' in cconfig:
             cmd.append('--security-opt=%s' % cconfig['security_opt'])
 

diff --git a/paunch/tests/test_builder_compose1.py b/paunch/tests/test_builder_compose1.py
@@ -419,6 +419,7 @@ def test_docker_run_args(self):
                 },
                 'env_file': '/tmp/foo.env',
                 'log_tag': '{{.ImageName}}/{{.Name}}/{{.ID}}',
+                'cpu_shares': 600,
                 'security_opt': 'label:disable'
             }
         }
@@ -434,6 +435,7 @@ def test_docker_run_args(self):
              '--health-timeout=10s', '--health-retries=3',
              '--privileged=true', '--restart=always', '--user=bar',
              '--log-opt=tag={{.ImageName}}/{{.Name}}/{{.ID}}',
+             '--cpu-shares=600',
              '--security-opt=label:disable', 'centos:7'],
             cmd
         )

diff --git a/releasenotes/notes/cgroups-cpu-shares-038ced471b862b4e.yaml b/releasenotes/notes/cgroups-cpu-shares-038ced471b862b4e.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Add `--cpu-shares=xxx` option for the action run a container. Allows to
+    define upper `cpu.shares` limits in the cpu cgroup.