commit c049af4e37bbb0c99408fcbfe8c90195627acce7
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Nov 17 20:23:03 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 17 20:23:03 2023 +0000
tree 6726e9984a02f8eea6f0e25b7592f7373153994a
parent b190d944690372eafe07e6f24f0e906caeeb4d58
parent 2953a9273ea610a18f489b7edb8eafd8e5a38732

Merge "libprocessgroup: Reject JoinCgroup actions for v2 controllers" into main

libprocessgroup/task_profiles.cpp

diff --git a/libprocessgroup/task_profiles.cpp b/libprocessgroup/task_profiles.cpp
index fe3c375..d5bd47c 100644
--- a/libprocessgroup/task_profiles.cpp
+++ b/libprocessgroup/task_profiles.cpp
@@ -868,7 +868,13 @@
 
                 auto controller = cg_map.FindController(controller_name);
                 if (controller.HasValue()) {
-                    profile->Add(std::make_unique<SetCgroupAction>(controller, path));
+                    if (controller.version() == 1) {
+                        profile->Add(std::make_unique<SetCgroupAction>(controller, path));
+                    } else {
+                        LOG(WARNING) << "A JoinCgroup action in the " << profile_name
+                                     << " profile is used for controller " << controller_name
+                                     << " in the cgroup v2 hierarchy and will be ignored";
+                    }
                 } else {
                     LOG(WARNING) << "JoinCgroup: controller " << controller_name << " is not found";
                 }