import fcntl
import os
import re
+import signal
import sys
import time
import traceback
INITSCRIPTS = [('/etc/rc.vinit', 'start'),
('/etc/rc.d/rc', '%(runlevel)d')]
- def __init__(self, name, vm_running = False, resources = {}):
+ def __init__(self, name, vm_id, vm_running = False, resources = {}):
self.name = name
self.config_file = "/etc/vservers/%s.conf" % name
if not (os.path.isdir(self.dir) and
os.access(self.dir, os.R_OK | os.W_OK | os.X_OK)):
raise Exception, "no such vserver: " + name
- self.config = self.__read_config_file("/etc/vservers.conf")
- self.config.update(self.__read_config_file(self.config_file))
- self.flags = 0
- flags = self.config["S_FLAGS"].split(" ")
- if "lock" in flags:
- self.flags |= FLAGS_LOCK
- if "nproc" in flags:
- self.flags |= FLAGS_NPROC
+ self.config = {}
+ for config_file in ["/etc/vservers.conf", self.config_file]:
+ try:
+ self.config.update(self.__read_config_file(config_file))
+ except IOError, ex:
+ if ex.errno != errno.ENOENT:
+ raise
self.remove_caps = ~vserverimpl.CAP_SAFE;
- self.ctx = int(self.config["S_CONTEXT"])
+ self.ctx = vm_id
self.vm_running = vm_running
self.resources = resources
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
# 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:
- raise Exception, ("%s disk usage (%u blocks) > limit (%u)" %
- (self.name, block_usage, block_limit))
vserverimpl.setdlimit(self.dir,
self.ctx,
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
- # set blockused to -1 to indicate no limit
- 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:
- vserverimpl.setsched(self.ctx, cpu_share, True)
+ # caller must ensure cpu_share is consistent with self.resources
+ vserverimpl.setsched(self.ctx, self.resources)
def get_sched(self):
# have no way of querying scheduler right now on a per vserver basis
ret = vserverimpl.getrlimit(self.ctx,6)
return ret
- def set_bwlimit(self, eth, limit, cap, minrate, maxrate):
- if cap == "-1":
- bwlimit.off(self.ctx,eth)
+ def set_bwlimit(self, share, minrate = 1, maxrate = None, dev = "eth0"):
+
+ if share:
+ bwlimit.on(self.ctx, dev, share, minrate, maxrate)
else:
- bwlimit.on(self.ctx, eth, limit, cap, minrate, maxrate)
+ 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