archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8287107: CgroupSubsystemFactory.setCgroupV2Path asserts with freezer controller

Browse source 
Reviewed-by: mseledtsov, sgehwolf
This commit is contained in:
Ioi Lam 2022-05-26 04:16:45 +00:00
parent 94811c0dc7
commit 704b9a66bb
3 changed files with 117 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/java.base/linux/classes/jdk/internal/platform/CgroupSubsystemFactory.java
View file

@ -143,6 +143,10 @@ public class CgroupSubsystemFactory {
}
CgroupInfo info = CgroupInfo.fromCgroupsLine(line);
switch (info.getName()) {
// Only the following controllers are important to Java. All
// other controllers (such as freezer) are ignored and
// are not considered in the checks below for
// anyCgroupsV1Controller/anyCgroupsV2Controller.
case CPU_CTRL: infos.put(CPU_CTRL, info); break;
case CPUACCT_CTRL: infos.put(CPUACCT_CTRL, info); break;
case CPUSET_CTRL: infos.put(CPUSET_CTRL, info); break;
@ -220,6 +224,12 @@ public class CgroupSubsystemFactory {
*/
private static void setCgroupV2Path(Map<String, CgroupInfo> infos,
String[] tokens) {
String name = tokens[1];
if (!name.equals("")) {
// This must be a v1 controller that we have ignored (e.g., freezer)
assert infos.get(name) == null;
return;
}
int hierarchyId = Integer.parseInt(tokens[0]);
String cgroupPath = tokens[2];
for (CgroupInfo info: infos.values()) {