fix coresched locating cgroup and reduce verbosity

[nodemanager.git] / cgroups.py

diff --git a/cgroups.py b/cgroups.py
index 1f0d889..cbdfbe2 100644 (file)
--- a/cgroups.py
+++ b/cgroups.py
@@ -56,21 +56,30 @@ def get_cgroup_paths(subsystem="cpuset"):
         os.path.join(BASE_DIR, subsystem, 'libvirt', 'lxc'),
         # as observed on f20
         os.path.join(BASE_DIR, subsystem ),
+        # 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, 
+    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) ]
+                     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."""
-    return reduce(lambda a, b: b if os.path.basename(b) == name else a,
+    result = reduce(lambda a, b: b if os.path.basename(b) == name else a,
                   get_cgroup_paths(subsystem), None)
 
+    if result is None:
+        name = name + ".libvirt-lxc"
+        result = reduce(lambda a, b: b if os.path.basename(b) == name else a,
+                      get_cgroup_paths(subsystem), None)
+
+    return result
+
 def get_base_path():
     return BASE_DIR