ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "libprocessgroup: Proceed if activation of an optional controller fails" am: 05c7e3c0c2

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

Change-Id: I91475c113e0e22aee1b489e7e085d9ec850ca5b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bart Van Assche 2023-02-13 18:41:19 +00:00 • committed by Automerger Merge Worker
commit 850bac57b9
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libprocessgroup/cgroup_map.cpp
View file

@ -234,7 +234,12 @@ int CgroupMap::ActivateControllers(const std::string& path) const {
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;
}
}
}
}