Adding --cpuset-cpus tfb argument to set it on the server container

franz1981 · May 17, 2024 · 308a130 · 308a130
1 parent fa7221b
commit 308a130
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/toolset/run-tests.py b/toolset/run-tests.py
@@ -67,6 +67,11 @@ def main(argv=None):
         ''')
 
     # Suite options
+    # CPU set  options
+    parser.add_argument(
+        '--cpuset-cpus',
+        default=None,
+        help='The cpu set to run framework container on')
     parser.add_argument(
         '--audit',
         action='store_true',

diff --git a/toolset/utils/benchmark_config.py b/toolset/utils/benchmark_config.py
@@ -52,6 +52,7 @@ def __init__(self, args):
         self.database_docker_host = None
         self.client_docker_host = None
         self.network = None
+        self.cpuset_cpus = args.cpuset_cpus
         self.test_container_memory = args.test_container_memory
         self.extra_docker_runtime_args = args.extra_docker_runtime_args
 

diff --git a/toolset/utils/docker_helper.py b/toolset/utils/docker_helper.py
@@ -189,6 +189,13 @@ def watch_container(docker_container, docker_file):
                 'soft': 99
             }]
 
+            cpuset_cpus = ''
+
+            if self.benchmarker.config.cpuset_cpus is not None:
+                    cpuset_cpus = self.benchmarker.config.cpuset_cpus
+
+            log("Running docker container with cpu set: %s" %cpuset_cpus)
+
             docker_cmd = ''
             if hasattr(test, 'docker_cmd'):
                 docker_cmd = test.docker_cmd
@@ -235,6 +242,7 @@ def watch_container(docker_container, docker_file):
                 sysctls=sysctl,
                 remove=True,
                 log_config={'type': None},
+                cpuset_cpus=cpuset_cpus,
                 **extra_docker_args
                 )