Skip to content

Fix reading cgroup controller error #6381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix reading cgroup controller error #6381

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 41 additions & 36 deletions ...le.svm.core.containers/src/com/oracle/svm/core/containers/cgroupv1/CgroupV1Subsystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,50 +163,55 @@ private static void createSubSystemController(CgroupV1Subsystem subsystem, Strin
private static void setSubSystemControllerPath(CgroupV1Subsystem subsystem, String[] entry) {
String controllerName;
String base;
CgroupV1SubsystemController controller = null;
CgroupV1SubsystemController controller2 = null;
CgroupV1SubsystemController[] controllers = null;

controllerName = entry[1];
base = entry[2];
if (controllerName != null && base != null) {
switch (controllerName) {
case "memory":
controller = subsystem.memoryController();
break;
case "cpuset":
controller = subsystem.cpuSetController();
break;
case "cpu,cpuacct":
case "cpuacct,cpu":
controller = subsystem.cpuController();
controller2 = subsystem.cpuAcctController();
break;
case "cpuacct":
controller = subsystem.cpuAcctController();
break;
case "cpu":
controller = subsystem.cpuController();
break;
case "blkio":
controller = subsystem.blkIOController();
break;
// Ignore subsystems that we don't support
default:
break;
// Multiple controllers can set be set on the same hierarchy and separated by comma
String[] controllerNames = controllerName.split(",");
controllers = new CgroupV1SubsystemController[controllerNames.length];

for (int i = 0; i < controllerNames.length; i++) {
switch (controllerNames[i]) {
case "memory":
controllers[i] = subsystem.memoryController();
break;
case "cpuset":
controllers[i] = subsystem.cpuSetController();
break;
case "cpuacct":
controllers[i] = subsystem.cpuAcctController();
break;
case "cpu":
controllers[i] = subsystem.cpuController();
break;
case "blkio":
controllers[i] = subsystem.blkIOController();
break;
// Ignore subsystems that we don't support
default:
break;
}
}
}

if (controller != null) {
controller.setPath(base);
if (controller instanceof CgroupV1MemorySubSystemController) {
CgroupV1MemorySubSystemController memorySubSystem = (CgroupV1MemorySubSystemController)controller;
boolean isHierarchial = getHierarchical(memorySubSystem);
memorySubSystem.setHierarchical(isHierarchial);
if (controllers != null) {
boolean isActive = false;
for (CgroupV1SubsystemController controller : controllers) {
if (controller != null) {
isActive = true;
controller.setPath(base);
if (controller instanceof CgroupV1MemorySubSystemController) {
CgroupV1MemorySubSystemController memorySubSystem = (CgroupV1MemorySubSystemController) controller;
boolean isHierarchial = getHierarchical(memorySubSystem);
memorySubSystem.setHierarchical(isHierarchial);
}
}
}
if (isActive) {
subsystem.setActiveSubSystems();
}
subsystem.setActiveSubSystems();
}
if (controller2 != null) {
controller2.setPath(base);
}
}

Expand Down