X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=cgroups.py;h=bbb74a3cb9f87d49aa411a6e224d9ab0c7c95e29;hb=ca3702d15c6992bcb3779f4c9097db32f42dbfa1;hp=67b20406f39d43a7247b36e421a138a82dc486e5;hpb=37fb58922dd8b6429ccb4a2b94d4ca907ee83232;p=nodemanager.git

diff --git a/cgroups.py b/cgroups.py
index 67b2040..bbb74a3 100644
--- a/cgroups.py
+++ b/cgroups.py
@@ -51,10 +51,20 @@ class CgroupWatch(pyinotify.ProcessEvent):
 #notifier.start()
 
 def get_cgroup_paths(subsystem="cpuset"):
-    cpusetBase  = os.path.join(BASE_DIR, subsystem, 'libvirt', 'lxc')
-    return filter(os.path.isdir,
-                  map(lambda f: os.path.join(cpusetBase, f),
-                      os.listdir(cpusetBase)))
+    cpusetBases = [ 
+        # observed on f16-f18
+        os.path.join(BASE_DIR, subsystem, 'libvirt', 'lxc'),
+        # as observed on f20
+        os.path.join(BASE_DIR, subsystem ),
+        ]
+    # 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: 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) ])
 
 def get_cgroup_path(name, subsystem="cpuset"):
     """ Returns the base path for the cgroup with a specific name or None."""