Support cgroup fs head path on distros where unified is default

deb11 rhel9 ...
opensvc · Nov 15, 2021 · 91221a4 · 91221a4
1 parent cb1c03a
commit 91221a4
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/opensvc/drivers/pg/linux.py b/opensvc/drivers/pg/linux.py
@@ -4,10 +4,18 @@
 import core.exceptions as ex
 from utilities.converters import convert_size
 
-UNIFIED_MNT = "/sys/fs/cgroup/unified"
-UNIFIED = os.path.exists(UNIFIED_MNT)
 DRIVER_BASENAME = 'pg'
 
+if os.path.exists("/sys/fs/cgroup/cgroup.procs"):
+    UNIFIED_MNT = "/sys/fs/cgroup"
+    UNIFIED = True
+elif os.path.exists("/sys/fs/cgroup/unified"):
+    UNIFIED_MNT = "/sys/fs/cgroup/unified"
+    UNIFIED = True
+else:
+    UNIFIED_MNT = "/sys/fs/cgroup/unified"
+    UNIFIED = False
+
 CONTROLLERS = [
     "blkio",
     "cpu",
@@ -25,7 +33,7 @@
 ]
 
 def get_cgroup_mntpt(t):
-    if UNIFIED and t is None:
+    if UNIFIED:
         return UNIFIED_MNT
     p = '/proc/mounts'
     if not os.path.exists(p):