cosmetic - slightly changed message when a freezer cgroup file can't be figured out

diff --git a/cgroups.py b/cgroups.py
index b1635c0..7ccbf0b 100644 (file)
--- a/cgroups.py
+++ b/cgroups.py
@@ -82,7 +82,7 @@ def get_cgroup_path(name, subsystem="cpuset"):
     if result is None:
         name = name + ".libvirt-lxc"
         result = reduce(lambda a, b: b if name in os.path.basename(b) else a,
     if result is None:
         name = name + ".libvirt-lxc"
         result = reduce(lambda a, b: b if name in os.path.basename(b) else a,

-                      get_cgroup_paths(subsystem), None)
+                        get_cgroup_paths(subsystem), None)

 
     return result
 
 
     return result
 

diff --git a/coresched_lxc.py b/coresched_lxc.py
index aba6cb6..50b5330 100644 (file)
--- a/coresched_lxc.py
+++ b/coresched_lxc.py
@@ -240,9 +240,13 @@ class CoreSched:
     def freezeUnits (self, var_name, freezeList):
         for (slicename, freeze) in freezeList.items():
             try:
     def freezeUnits (self, var_name, freezeList):
         for (slicename, freeze) in freezeList.items():
             try:

-                logger.verbose("CoreSched: setting freezer for " + slicename + " to " + freeze)

                 cgroup_path = cgroups.get_cgroup_path(slicename, 'freezer')
                 cgroup_path = cgroups.get_cgroup_path(slicename, 'freezer')

+                logger.verbose("CoreSched: setting freezer for {} to {} - path={} var={}"
+                               .format(slicename,freeze, cgroup_path, var_name))

                 cgroup = os.path.join(cgroup_path, var_name)
                 cgroup = os.path.join(cgroup_path, var_name)

+                if not cgroup:
+                    logger.log("Warning: Could not spot 'freezer' cgroup file for slice {} - ignored".format(slicename))
+                    break

 
                 if glo_coresched_simulate:
                         print "F", cgroup
 
                 if glo_coresched_simulate:
                         print "F", cgroup