[cgroups] Fix cpu controller name in runtime

Change-Id: Ibe2bd7cb6d63389cce6677a2c4552d06f3f02e9c
Related-Bug: #1669747
This commit is contained in:
Michael Polenchuk 2017-03-23 12:28:09 +04:00
parent 703edb8c71
commit fad31f80a6
1 changed files with 4 additions and 1 deletions

View File

@ -79,7 +79,10 @@ class TestCgroupHa(TestBasic):
def generate_lscgroups(cgroups): def generate_lscgroups(cgroups):
"""Generate a list of lscgroups entities from cgroups dicts.""" """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] for cgroup in cgroups]
def apply_cgroups(self, cgroups, node_ids): def apply_cgroups(self, cgroups, node_ids):