8287741: Fix of JDK-8287107 (unused cgv1 freezer controller) was inco…

…mplete Backport-of: 8d28734ede0ed3922c92451a172d1fa676e484e9
openjdk · Jan 30, 2023 · 563f7b5 · 563f7b5 · openjdk-notifier · Jan 30, 2023
1 parent b4ee9f8
commit 563f7b5
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/hotspot/src/os/linux/vm/cgroupSubsystem_linux.cpp b/hotspot/src/os/linux/vm/cgroupSubsystem_linux.cpp
@@ -270,7 +270,13 @@ bool CgroupSubsystemFactory::determine_type(CgroupInfo* cg_infos,
       }
     }
     if (is_cgroupsV2) {
+      // On some systems we have mixed cgroups v1 and cgroups v2 controllers (e.g. freezer on cg1 and
+      // all relevant controllers on cg2). Only set the cgroup path when we see a hierarchy id of 0.
+      if (hierarchy_id != 0) {
+        continue;
+      }
       for (int i = 0; i < CG_INFO_LENGTH; i++) {
+        assert(cg_infos[i]._cgroup_path == NULL, "cgroup path must only be set once");
         cg_infos[i]._cgroup_path = os::strdup(cgroup_path);
       }
     }