From: Steve Muir <smuir@cs.princeton.edu>
Date: Wed, 9 Nov 2005 22:04:25 +0000 (+0000)
Subject: Add support for removing resource (disk, network) limits
X-Git-Tag: after-util-vserver-0_30_208-revert~63
X-Git-Url: http://git.onelab.eu/?p=util-vserver.git;a=commitdiff_plain;h=87e1702cad478ebc77f859d9bfff1f9008ecd194

Add support for removing resource (disk, network) limits
---

diff --git a/python/vserver.py b/python/vserver.py
index 11ce695..7132cd1 100644
--- a/python/vserver.py
+++ b/python/vserver.py
@@ -113,6 +113,10 @@ class VServer:
     def set_disklimit(self, block_limit):
 
         # block_limit is in kB
+        if block_limit == 0:
+            vserverimpl.unsetdlimit(self.dir, self.ctx)
+            return
+
         if self.vm_running:
             block_usage = vserverimpl.DLIMIT_KEEP
             inode_usage = vserverimpl.DLIMIT_KEEP
@@ -135,9 +139,10 @@ class VServer:
             blocksused, blocktotal, inodesused, inodestotal, reserved = \
                         vserverimpl.getdlimit(self.dir, self.ctx)
         except OSError, ex:
-            if ex.errno == errno.ESRCH:
-                # get here if no vserver disk limit has been set for xid
-                blocktotal = -1
+            if ex.errno != errno.ESRCH:
+                raise
+            # get here if no vserver disk limit has been set for xid
+            blocktotal = -1
 
         return blocktotal
 
@@ -170,12 +175,12 @@ class VServer:
         ret = vserverimpl.getrlimit(self.ctx,6)
         return ret
 
-    def set_bwlimit(self, share, minrate, maxrate = None, dev = "eth0"):
+    def set_bwlimit(self, share, minrate = 1, maxrate = None, dev = "eth0"):
 
-        if False:
-            bwlimit.off(self.ctx, dev)
-        else:
+        if share:
             bwlimit.on(self.ctx, dev, share, minrate, maxrate)
+        else:
+            bwlimit.off(self.ctx, dev)
 
     def get_bwlimit(self, eth):
         # not implemented yet
diff --git a/util-vserver.spec b/util-vserver.spec
index 467b0ed..5f7e6f5 100644
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -17,7 +17,7 @@
 
 %define name util-vserver
 %define version 0.30.208
-%define release 5.planetlab%{?date:.%{date}}
+%define release 6.planetlab%{?date:.%{date}}
 
 %define _without_dietlibc 1
 %define _without_xalan 1
@@ -381,6 +381,9 @@ done
 
 
 %changelog
+* Wed Nov  9 2005 Steve Muir <smuir@cs.princeton.edu>
+- add support for removing resource limits e.g., when a slice is deleted
+
 * Mon Nov  7 2005 Steve Muir <smuir@cs.princeton.edu>
 - fix file descriptor leak in vduimpl
 - clean up handling of network parameters