Port latest changes to release branch

[util-vserver.git] / python / vserver.py

diff --git a/python/vserver.py b/python/vserver.py
index 264aee2..9f1bb09 100644 (file)
--- a/python/vserver.py
+++ b/python/vserver.py
@@ -114,7 +114,6 @@ class VServer:
     def set_disklimit(self, block_limit):
 
         # block_limit is in kB
-        over_limit = False
         if self.vm_running:
             block_usage = vserverimpl.DLIMIT_KEEP
             inode_usage = vserverimpl.DLIMIT_KEEP
@@ -122,8 +121,6 @@ class VServer:
             # init_disk_info() must have been called to get usage values
             block_usage = self.disk_blocks
             inode_usage = self.disk_inodes
-            if block_limit < block_usage:
-                over_limit = True
 
         vserverimpl.setdlimit(self.dir,
                               self.ctx,
@@ -133,10 +130,6 @@ class VServer:
                               vserverimpl.DLIMIT_INF,  # inode limit
                               2)   # %age reserved for root
 
-        if over_limit:
-            raise Exception, ("%s disk usage (%u blocks) > limit (%u)" %
-                              (self.name, block_usage, block_limit))
-
     def get_disklimit(self):
 
         try:
@@ -145,7 +138,6 @@ class VServer:
         except OSError, ex:
             if ex.errno == errno.ESRCH:
                 # get here if no vserver disk limit has been set for xid
-                # set blockused to -1 to indicate no limit
                 blocktotal = -1
 
         return blocktotal
@@ -157,7 +149,7 @@ class VServer:
 
         self.__update_config_file(self.config_file, { "CPULIMIT": cpu_share })
         if self.vm_running:
-            vserverimpl.setsched(self.ctx, cpu_share, True)
+            vserverimpl.setsched(self.ctx, self.resources)
 
     def get_sched(self):
         # have no way of querying scheduler right now on a per vserver basis