Fixes for F16.

[nodemanager.git] / cgroups.py

diff --git a/cgroups.py b/cgroups.py
index cf6ca98..ebd4b56 100644 (file)
--- a/cgroups.py
+++ b/cgroups.py
@@ -8,7 +8,8 @@ import pyinotify
 import logger
 
 # Base dir for libvirt
-BASE_DIR = '/cgroup/libvirt/'
+BASE_DIR = '/sys/fs/cgroup'
+SUB_SYSTEMS = ['blkio', 'freezer', 'devices', 'memory', 'cpu,cpuacct', 'cpuset']
 VIRT_TECHS = ['lxc']
 
 # Global cgroup mapping. 
@@ -31,36 +32,41 @@ class CgroupWatch(pyinotify.ProcessEvent):
                        (event.name, event.path))
 
 
-logger.verbose("Cgroups: Recognizing already existing cgroups...")
-for virt in VIRT_TECHS:
-    filenames = os.listdir(os.path.join(BASE_DIR, virt))
-    for filename in filenames:
-       path = os.path.join(BASE_DIR, virt, filename)
-       if os.path.isdir(path):
-           CGROUPS[filename] = path
+#logger.verbose("Cgroups: Recognizing already existing cgroups...")
+#for virt in VIRT_TECHS:
+#    filenames = os.listdir(os.path.join(BASE_DIR, virt))
+#    for filename in filenames:
+#        path = os.path.join(BASE_DIR, virt, filename)
+#        if os.path.isdir(path):
+#            CGROUPS[filename] = path
 
-logger.verbose("Cgroups: Initializing watchers...")
-wm = pyinotify.WatchManager()
-notifier = pyinotify.ThreadedNotifier(wm, CgroupWatch())
-for virt in VIRT_TECHS:
-       wdd = wm.add_watch(os.path.join(BASE_DIR, virt),
-                          pyinotify.IN_DELETE | pyinotify.IN_CREATE,
-                          rec=False)
-notifier.daemon = True
-notifier.start()
+#logger.verbose("Cgroups: Initializing watchers...")
+#wm = pyinotify.WatchManager()
+#notifier = pyinotify.ThreadedNotifier(wm, CgroupWatch())
+#for virt in VIRT_TECHS:
+#    wdd = wm.add_watch(os.path.join(BASE_DIR, virt),
+#               pyinotify.IN_DELETE | pyinotify.IN_CREATE,
+#               rec=False)
+#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_path(name):
-    """ Returns the base path for the cgroup with a specific name """
-    assert CGROUPS.has_key(name), \
-           "No sliver %s managed by libvirt through cgroup!" % name
-    return CGROUPS[name]
+    """ 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)
 
 def get_base_path():
     return BASE_DIR
 
 def get_cgroups():
     """ Returns the list of cgroups active at this moment on the node """
-    return CGROUPS.keys()
+    return map(os.path.basename, get_cgroup_paths())
 
 def write(name, key, value):
     """ Writes a value to the file key with the cgroup with name """
@@ -72,4 +78,4 @@ def append(name, key, value):
     """ Appends a value to the file key with the cgroup with name """
     base_path = get_cgroup_path(name)
     with open(os.path.join(base_path, key), 'a') as f:
-        print >>f, value       
+        print >>f, value