Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/nodemanager

diff --git a/cgroups.py b/cgroups.py
index ebd4b56..67b2040 100644 (file)
--- a/cgroups.py
+++ b/cgroups.py
@@ -50,16 +50,16 @@ class CgroupWatch(pyinotify.ProcessEvent):
 #notifier.daemon = True
 #notifier.start()
 
-def get_cgroup_paths():
-    cpusetBase  = os.path.join(BASE_DIR, 'cpuset', 'libvirt', 'lxc')
+def get_cgroup_paths(subsystem="cpuset"):
+    cpusetBase  = os.path.join(BASE_DIR, subsystem, 'libvirt', 'lxc')
     return filter(os.path.isdir,
                   map(lambda f: os.path.join(cpusetBase, f),
                       os.listdir(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)
+                  get_cgroup_paths(subsystem), None)
 
 def get_base_path():
     return BASE_DIR
@@ -68,14 +68,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

diff --git a/sliver_libvirt.py b/sliver_libvirt.py
index ed43088..753b0c3 100644 (file)
--- a/sliver_libvirt.py
+++ b/sliver_libvirt.py
@@ -135,30 +135,38 @@ class Sliver_Libvirt(Account):
 
         # Btrfs support quota per volumes
 
-        # It will depend on the FS selection
-        if rec.has_key('disk_max'):
-            disk_max = rec['disk_max']
-            if disk_max == 0:
-                # unlimited 
-                pass
+        if rec.has_key("rspec") and rec["rspec"].has_key("tags"):
+            if cgroups.get_cgroup_path(self.name) == None:
+                # If configure is called before start, then the cgroups won't exist
+                # yet. NM will eventually re-run configure on the next iteration.
+                # TODO: Add a post-start configure, and move this stuff there
+                logger.log("Configure: postponing tag check on %s as cgroups are not yet populated" % self.name)
             else:
-                # limit to certain number
-                pass
-
-        # Memory allocation
-        if rec.has_key('memlock_hard'):
-            mem = rec['memlock_hard'] * 1024 # hard limit in bytes
-            cgroups.write(self.name, 'memory.limit_in_bytes', mem)
-        if rec.has_key('memlock_soft'):
-            mem = rec['memlock_soft'] * 1024 # soft limit in bytes
-            cgroups.write(self.name, 'memory.soft_limit_in_bytes', mem)
-
-        # CPU allocation
-        # Only cpu_shares until figure out how to provide limits and guarantees
-        # (RT_SCHED?)
-        if rec.has_key('cpu_share'):
-            cpu_share = rec['cpu_share']
-            cgroups.write(self.name, 'cpu.shares', cpu_share)
+                tags = rec["rspec"]["tags"]
+                # It will depend on the FS selection
+                if tags.has_key('disk_max'):
+                    disk_max = tags['disk_max']
+                    if disk_max == 0:
+                        # unlimited
+                        pass
+                    else:
+                        # limit to certain number
+                        pass
+
+                # Memory allocation
+                if tags.has_key('memlock_hard'):
+                    mem = str(int(tags['memlock_hard']) * 1024) # hard limit in bytes
+                    cgroups.write(self.name, 'memory.limit_in_bytes', mem, subsystem="memory")
+                if tags.has_key('memlock_soft'):
+                    mem = str(int(tags['memlock_soft']) * 1024) # soft limit in bytes
+                    cgroups.write(self.name, 'memory.soft_limit_in_bytes', mem, subsystem="memory")
+
+                # CPU allocation
+                # Only cpu_shares until figure out how to provide limits and guarantees
+                # (RT_SCHED?)
+                if tags.has_key('cpu_share'):
+                    cpu_share = tags['cpu_share']
+                    cgroups.write(self.name, 'cpu.shares', cpu_share)
 
         # Call the upper configure method (ssh keys...)
         Account.configure(self, rec)