X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=cgroups.py;h=cbdfbe23c9ac52a3d6b4299c457332ff0435369a;hb=ecee05390277f57b02d21ffca0195292bde1defa;hp=ebd4b56e2211cd413d462f616fda862afd09d90c;hpb=dd451f27a57f53eb716aaf3ff9b545953df8882a;p=nodemanager.git

diff --git a/cgroups.py b/cgroups.py
index ebd4b56..cbdfbe2 100644
--- a/cgroups.py
+++ b/cgroups.py
@@ -50,16 +50,35 @@ class CgroupWatch(pyinotify.ProcessEvent):
 #notifier.daemon = True
 #notifier.start()
 
-def get_cgroup_paths():
-    cpusetBase  = os.path.join(BASE_DIR, 'cpuset', 'libvirt', 'lxc')
-    return filter(os.path.isdir,
-                  map(lambda f: os.path.join(cpusetBase, f),
-                      os.listdir(cpusetBase)))
+def get_cgroup_paths(subsystem="cpuset"):
+    cpusetBases = [ 
+        # observed on f16-f18
+        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: 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):
+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(), None)
+    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
@@ -68,14 +87,14 @@ def get_cgroups():
     """ Returns the list of cgroups active at this moment on the node """
     return map(os.path.basename, get_cgroup_paths())
 
-def write(name, key, value):
+def write(name, key, value, subsystem="cpuset"):
     """ Writes a value to the file key with the cgroup with name """
-    base_path = get_cgroup_path(name)
+    base_path = get_cgroup_path(name, subsystem)
     with open(os.path.join(base_path, key), 'w') as f:
         print >>f, value
 
-def append(name, key, value):
+def append(name, key, value, subsystem="cpuset"):
     """ Appends a value to the file key with the cgroup with name """
-    base_path = get_cgroup_path(name)
+    base_path = get_cgroup_path(name, subsystem)
     with open(os.path.join(base_path, key), 'a') as f:
         print >>f, value