X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=cgroups.py;h=7ccbf0bdb7a005b8dcb723a3e191f4b73cce721e;hb=430195a2b1382182d28dbcd16b21864ed758f52d;hp=1f0d889a60418601b38eaa8fc534e9c0848f1ebc;hpb=1daa08914a2d49ebf5e8b49fd4381ce01800bcca;p=nodemanager.git

diff --git a/cgroups.py b/cgroups.py
index 1f0d889..7ccbf0b 100644
--- a/cgroups.py
+++ b/cgroups.py
@@ -51,25 +51,40 @@ class CgroupWatch(pyinotify.ProcessEvent):
 #notifier.start()
 
 def get_cgroup_paths(subsystem="cpuset"):
-    cpusetBases = [ 
+    subsystem_bases = [ 
         # observed on f16-f18
         os.path.join(BASE_DIR, subsystem, 'libvirt', 'lxc'),
         # as observed on f20
         os.path.join(BASE_DIR, subsystem ),
+        # f21
+        os.path.join(BASE_DIR, subsystem, 'machine.slice'),
+        # as observed on f16 libvirt 1.2.1
+        os.path.join(BASE_DIR, subsystem, 'machine'),
         ]
     # try several locations and return all the results
     # get_cgroup_path will sort it out
-    def merge(l1,l2): return l1+l2
-    return reduce (lambda l1,l2: return l1+l2, 
-                   [ [ dir for dir in 
-                       [ os.path.join(cpusetBase, f) for f in os.listdir(cpusetBase) ]
-                       if os.path.isdir(dir) ]
-                     for cpusetBase in cpusetBases if os.path.isdir (cpusetBase) ]
+    
+    # just return all the subdirs in the listed bases 
+    return [ subdir
+                 # scan the bases
+                 for subsystem_base in subsystem_bases if os.path.isdir(subsystem_base)
+                     # in each base search the immediate sons that are also dirs
+                     for subdir in [ os.path.join(subsystem_base, f) for f in os.listdir(subsystem_base) ]
+                         if os.path.isdir(subdir) ]
 
 def get_cgroup_path(name, subsystem="cpuset"):
-    """ Returns the base path for the cgroup with a specific name or None."""
-    return reduce(lambda a, b: b if os.path.basename(b) == name else a,
-                  get_cgroup_paths(subsystem), None)
+    """
+    Returns the base path for the cgroup with a specific name or None.
+    """
+    result = reduce(lambda a, b: b if name in os.path.basename(b) else a,
+                    get_cgroup_paths(subsystem), None)
+
+    if result is None:
+        name = name + ".libvirt-lxc"
+        result = reduce(lambda a, b: b if name in os.path.basename(b) else a,
+                        get_cgroup_paths(subsystem), None)
+
+    return result
 
 def get_base_path():
     return BASE_DIR
@@ -89,3 +104,16 @@ def append(name, key, value, subsystem="cpuset"):
     base_path = get_cgroup_path(name, subsystem)
     with open(os.path.join(base_path, key), 'a') as f:
         print >>f, value
+
+if __name__ == '__main__':
+
+    # goes with the system tests
+    name='inri_sl1' 
+
+    subsystems = 'blkio cpu cpu,cpuacct cpuacct cpuset devices freezer memory net_cls perf_event systemd'.split()
+
+    for subsystem in subsystems:
+        print 'get_cgroup_path({}, {}) =  {}'.\
+            format(name, subsystem, get_cgroup_path(name, subsystem))
+
+#        print 'get_cgroup_paths = {}'.format(get_cgroup_paths(subsystem))