X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=blobdiff_plain;f=cgroups.py;h=0611d1d615f365a979540cf689f9d1a78d7baa7a;hp=cbdfbe23c9ac52a3d6b4299c457332ff0435369a;hb=HEAD;hpb=2278a219e208ae964d587f3a0bf0d2f299bf1fcb

diff --git a/cgroups.py b/cgroups.py
index cbdfbe2..0611d1d 100644
--- a/cgroups.py
+++ b/cgroups.py
@@ -3,80 +3,47 @@
 #
 # Xavi Leon <xleon@ac.upc.edu>
 
-import os
+import os, os.path
 import pyinotify
 import logger
+from functools import reduce
 
 # Base dir for libvirt
 BASE_DIR = '/sys/fs/cgroup'
-SUB_SYSTEMS = ['blkio', 'freezer', 'devices', 'memory', 'cpu,cpuacct', 'cpuset']
-VIRT_TECHS = ['lxc']
-
-# Global cgroup mapping. 
-CGROUPS = dict()
-
-class CgroupWatch(pyinotify.ProcessEvent):
-
-    def process_IN_CREATE(self, event):
-	path = os.path.join(event.path, event.name)
-	CGROUPS[event.name] = path
-	logger.verbose("Cgroup Notify: Created cgroup %s on %s" % \
-			(event.name, event.path))
-        
-    def process_IN_DELETE(self, event):
-        try:
-	    del CGROUPS[event.name]
-        except:
-            logger.verbose("Cgroup Notify: Cgroup %s does not exist, continuing..."%event.name)
-	logger.verbose("Cgroup Notify: Deleted cgroup %s on %s" % \
-			(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: 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(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: 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."""
-    result = 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 os.path.basename(b) == name else a,
-                      get_cgroup_paths(subsystem), None)
+        result = reduce(lambda a, b: b if name in os.path.basename(b) else a,
+                        get_cgroup_paths(subsystem), None)
 
     return result
 
@@ -85,16 +52,31 @@ def get_base_path():
 
 def get_cgroups():
     """ Returns the list of cgroups active at this moment on the node """
-    return map(os.path.basename, get_cgroup_paths())
+    return list(map(os.path.basename, get_cgroup_paths()))
 
 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, subsystem)
     with open(os.path.join(base_path, key), 'w') as f:
-        print >>f, value
+        print(value, file=f)
+    logger.verbose("cgroups.write: overwrote {}".format(base_path))
 
 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, subsystem)
     with open(os.path.join(base_path, key), 'a') as f:
-        print >>f, value
+        print(value, file=f)
+    logger.verbose("cgroups.append: appended {}".format(base_path))
+
+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))