ftests-064: avoid enabling controller on leaf cgroup node

cgroup v2, has no internal process constraint, where the process runs
only on the leaf node of the cgroup hierarchy and no controllers should
be enabled on the leaf cgroup node too. Let's not enable cpu controller
on the leaf cgroup node.

Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit ddadfd67a161da5052e6e2eba97d3052fd976cca)

diff --git a/tests/ftests/064-sudo-systemd_cgset-v2.py b/tests/ftests/064-sudo-systemd_cgset-v2.py
index 09a71f3c420036a7e0c4d133fc0557a25e00412a..c42bc5010ed1db3e97cd72beb8ad8e7c412414b8 100755 (executable)
--- a/tests/ftests/064-sudo-systemd_cgset-v2.py
+++ b/tests/ftests/064-sudo-systemd_cgset-v2.py
@@ -60,15 +60,14 @@ def setup(config):
 
     # With cgroup v2, we can't enable controller for the child cgroup, while
     # a task is attached to test064.scope. Attach the task from test064.scope
-    # to child cgroup SYSTEMD_CGNAME and then enable cpu controller in the parent
-    # and then in the SYSTEMD_CGNAME cgroup, so that the cgroup.get() works
+    # to child cgroup SYSTEMD_CGNAME and then enable cpu controller in the parent,
+    # so that the cgroup.get() works
     Cgroup.set(config, cgname=SYSTEMD_CGNAME, setting='cgroup.procs', value=pid)
 
     Cgroup.set(
                 config, cgname=(os.path.join(SLICE, SCOPE)), setting='cgroup.subtree_control',
                 value='+cpu', ignore_systemd=True
               )
-    Cgroup.set(config, cgname=SYSTEMD_CGNAME, setting='cgroup.subtree_control', value='+cpu')
 
     # create and check if the cgroup was created under the controller root
     if not Cgroup.create_and_validate(config, CONTROLLER, OTHER_CGNAME, ignore_systemd=True):