ftests-062: 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 9cf49e499ebfb5b128e3e34d7db69af99ff40b3e)

diff --git a/tests/ftests/062-sudo-g_flag_controller_only_systemd-v2.py b/tests/ftests/062-sudo-g_flag_controller_only_systemd-v2.py
index 9e7e2734b2870594c2d1b07b2bf5edd1c2833108..e77eb6aae37e9821b755adb7b75d45c86a912df3 100755 (executable)
--- a/tests/ftests/062-sudo-g_flag_controller_only_systemd-v2.py
+++ b/tests/ftests/062-sudo-g_flag_controller_only_systemd-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 test062.scope. Attach the task from test062.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):