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
block_usage = self.disk_blocks
inode_usage = self.disk_inodes
if block_limit < block_usage:
- raise Exception, ("%s disk usage (%u blocks) > limit (%u)" %
- (self.name, block_usage, block_limit))
+ over_limit = True
vserverimpl.setdlimit(self.dir,
self.ctx,
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:
%define name util-vserver
%define version 0.30.208
-%define release 2.planetlab%{?date:.%{date}}
+%define release 3.planetlab%{?date:.%{date}}
%define _without_dietlibc 1
%define _without_xalan 1
%changelog
+* Fri Oct 28 2005 Steve Muir <smuir@cs.princeton.edu>
+- raise exception about being over disk limit after setting usage values
+
* Fri Oct 7 2005 Steve Muir <smuir@cs.princeton.edu>
- create common function to be used for entering a vserver and applying
resource limits