commit 7fabf57e12fbc9f2a37e9b5138cfb69074c1f6d1
author Bart Van Assche <bvanassche@google.com> Mon Feb 13 21:09:20 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 13 21:09:20 2023 +0000
tree 773e4dd0d9966a32240dfcfa33ac3abe4eb64090
parent 91fefaf269c04c7b1bc92d9d8a5af6737d8e1259
parent 7191e510d0f82463fed4fc461462fbfd7fd6c6c7

Merge "libprocessgroup: Proceed if activation of an optional controller fails" am: 05c7e3c0c2 am: 850bac57b9 am: 7191e510d0

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2424613

Change-Id: I77c9be65b68b576129434a560c1a08eeac292f35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libprocessgroup/cgroup_map.cpp

diff --git a/libprocessgroup/cgroup_map.cpp b/libprocessgroup/cgroup_map.cpp
index ac369d2..ce7f10b 100644
--- a/libprocessgroup/cgroup_map.cpp
+++ b/libprocessgroup/cgroup_map.cpp
@@ -234,7 +234,12 @@
                 std::string str("+");
                 str.append(ACgroupController_getName(controller));
                 if (!WriteStringToFile(str, path + "/cgroup.subtree_control")) {
-                    return -errno;
+                    if (flags & CGROUPRC_CONTROLLER_FLAG_OPTIONAL) {
+                        PLOG(WARNING) << "Activation of cgroup controller " << str
+                                      << " failed in path " << path;
+                    } else {
+                        return -errno;
+                    }
                 }
             }
         }