Merge "libprocessgroup: Proceed if activation of an optional controller fails"
This commit is contained in:
commit
05c7e3c0c2
1 changed files with 6 additions and 1 deletions
|
|
@ -234,7 +234,12 @@ int CgroupMap::ActivateControllers(const std::string& path) const {
|
||||||
std::string str("+");
|
std::string str("+");
|
||||||
str.append(ACgroupController_getName(controller));
|
str.append(ACgroupController_getName(controller));
|
||||||
if (!WriteStringToFile(str, path + "/cgroup.subtree_control")) {
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue