Merge "[cgroups] Fix cpu controller name in runtime"

This commit is contained in:
Jenkins 2017-03-27 12:38:06 +00:00 committed by Gerrit Code Review
commit 5f00a195e4
1 changed files with 4 additions and 1 deletions

View File

@ -79,7 +79,10 @@ class TestCgroupHa(TestBasic):
def generate_lscgroups(cgroups):
"""Generate a list of lscgroups entities from cgroups dicts."""
return ["{}:/{}".format(cgroup["controller"], cgroup["process"])
cpu_controller = "cpu,cpuacct"
return ["{}:/{}".format(cpu_controller
if cgroup["controller"] in cpu_controller
else cgroup["controller"], cgroup["process"])
for cgroup in cgroups]
def apply_cgroups(self, cgroups, node_ids):