Merge "[cgroups] Fix cpu controller name in runtime"
This commit is contained in:
commit
5f00a195e4
|
@ -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):
|
||||||
|
|
Loading…
Reference in New Issue