import fcntl
import os
import re
+import signal
import sys
import time
import traceback
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
def get_disklimit(self):
try:
- blocksused, blocktotal, inodesused, inodestotal, reserved = \
- vserverimpl.getdlimit(self.dir, self.ctx)
+ (self.disk_blocks, block_limit, self.disk_inodes, inode_limit,
+ 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
+ block_limit = -1
- return blocktotal
+ return block_limit
def set_sched(self, cpu_share):
if cpu_share == int(self.config.get("CPULIMIT", -1)):
return
-
- self.__update_config_file(self.config_file, { "CPULIMIT": cpu_share })
+ # XXX - don't want to have to deal with nm_ flags here
+ cpu_guaranteed = int(self.resources.get("nm_sched_flags",
+ None) == "guaranteed")
+ cpu_config = { "CPULIMIT": cpu_share, "CPUGUARANTEED": cpu_guaranteed }
+ self.__update_config_file(self.config_file, cpu_config)
if self.vm_running:
+ # caller must ensure cpu_share is consistent with self.resources
vserverimpl.setsched(self.ctx, self.resources)
def get_sched(self):
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
def __do_chcontext(self, state_file):
- vserverimpl.chcontext(self.ctx, self.resources)
+ if state_file:
+ print >>state_file, "S_CONTEXT=%u" % self.ctx
+ print >>state_file, "S_PROFILE="
+ state_file.close()
- if not state_file:
- return
- print >>state_file, "S_CONTEXT=%d" % self.ctx
- print >>state_file, "S_PROFILE=%s" % self.config.get("S_PROFILE", "")
- state_file.close()
+ vserverimpl.chcontext(self.ctx, self.resources)
def __prep(self, runlevel, log):
self.__do_chroot()
log = open("/var/log/boot.log", "w", 0)
os.dup2(1, 2)
- # XXX - close all other fds
print >>log, ("%s: starting the virtual server %s" %
(time.asctime(time.gmtime()), self.name))
(self.disk_inodes, self.disk_blocks, size) = vduimpl.vdu(self.dir)
return size
+
+ def stop(self, signal = signal.SIGKILL):
+
+ vserverimpl.killall(self.ctx, signal)
+ self.vm_running = False