X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=python%2Fvserver.py;h=1a55493f3a5c18297b958f9dd5a637904b5b30e7;hb=7e619bcc9b7a8623780102cf4913c783255b8f51;hp=64cc6812c5454932d4121dd517d5fc85fbda48c9;hpb=9ceff76f37b171ed146f86d2fd59456579880e05;p=util-vserver.git diff --git a/python/vserver.py b/python/vserver.py index 64cc681..1a55493 100644 --- a/python/vserver.py +++ b/python/vserver.py @@ -9,26 +9,12 @@ import time import traceback import mountimpl -import linuxcaps import passfdimpl import utmp -import vserverimpl - -from util_vserver_vars import * - -CAP_SAFE = (linuxcaps.CAP_CHOWN | - linuxcaps.CAP_DAC_OVERRIDE | - linuxcaps.CAP_DAC_READ_SEARCH | - linuxcaps.CAP_FOWNER | - linuxcaps.CAP_FSETID | - linuxcaps.CAP_KILL | - linuxcaps.CAP_SETGID | - linuxcaps.CAP_SETUID | - linuxcaps.CAP_SETPCAP | - linuxcaps.CAP_SYS_TTY_CONFIG | - linuxcaps.CAP_LEASE | - linuxcaps.CAP_SYS_CHROOT | - linuxcaps.CAP_SYS_PTRACE) +import vserverimpl, vduimpl +import cpulimit, bwlimit + + # # these are the flags taken from the kernel linux/vserver/legacy.h @@ -42,6 +28,11 @@ FLAGS_HIDEINFO = 32 FLAGS_ULIMIT = 64 FLAGS_NAMESPACE = 128 +# default values for new vserver scheduler +SCHED_TOKENS_MIN = 50 +SCHED_TOKENS_MAX = 100 +SCHED_TOKENS = 100 +SCHED_INTERVAL = 1000 class VServer: @@ -52,18 +43,26 @@ class VServer: def __init__(self, name): self.name = name + self.config_file = "/etc/vservers/%s.conf" % name + self.dir = "%s/%s" % (vserverimpl.VSERVER_BASEDIR, 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("/etc/vservers/%s.conf" % - self.name)) + 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.remove_caps = ~CAP_SAFE + self.remove_caps = ~vserverimpl.CAP_SAFE; self.ctx = int(self.config["S_CONTEXT"]) + def __str__(self): + + return self.name + config_var_re = re.compile(r"^ *([A-Z_]+)=(.*)\n?$", re.MULTILINE) def __read_config_file(self, filename): @@ -77,10 +76,144 @@ class VServer: config[key] = val.strip('"') return config + def __update_config_file(self, filename, newvars): + + # read old file, apply changes + f = open(filename, "r") + data = f.read() + f.close() + todo = newvars.copy() + changed = False + for m in self.config_var_re.finditer(data): + (key, val) = m.groups() + newval = todo.pop(key, None) + if newval != None: + data = data[:m.start(2)] + newval + data[m.end(2):] + changed = True + for (newkey, newval) in todo.items(): + data += "%s=%s\n" % (newkey, newval) + changed = True + + if not changed: + return + + # write new file + newfile = filename + ".new" + f = open(newfile, "w") + f.write(data) + f.close() + + # 'copy' original file, rename new to original + os.link(filename, filename + ".old") + os.rename(newfile, filename) + def __do_chroot(self): - return os.chroot("%s/%s" % (VROOTDIR, self.name)) + return os.chroot(self.dir) + + def set_disklimit(self, block_limit): + + # block_limit is in kB, get_disk_usage() must have been called + if self.disk_usage_set: + block_usage = vserverimpl.DLIMIT_KEEP + inode_usage = vserverimpl.DLIMIT_KEEP + else: + 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)) + self.disk_usage_set = True + + vserverimpl.setdlimit(self.dir, + self.ctx, + block_usage, + block_limit, + inode_usage, + -1, # inode limit + 2) # %age reserved for root + def get_disklimit(self): + + try: + 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 + # set blockused to -1 to indicate no limit + blocktotal = -1 + + return blocktotal + + def set_sched(self, shares = 32, besteffort = True): + # for the old CKRM scheduler + if cpulimit.checkckrm() is True: + cpulimit.cpuinit() + cpulimit.vs2ckrm_on(self.name) + try: + cpulimit.cpulimit(self.name,shares) + except OSError, ex: + if ex.errno == 22: + print "invalid shares argument" + # should re-raise exception?! + + # for the new vserver scheduler + else: + global SCHED_TOKENS_MIN, SCHED_TOKENS_MAX, SCHED_TOKENS, SCHED_INTERVAL + tokensmin = SCHED_TOKENS_MIN + tokensmax = SCHED_TOKENS_MAX + tokens = SCHED_TOKENS + interval = SCHED_INTERVAL + fillrate = shares + + if besteffort is True: + cpuguaranteed = 0 + else: + cpuguaranteed = 1 + + try: + vserverimpl.setsched(self.ctx,fillrate,interval,tokens,tokensmin,tokensmax,cpuguaranteed) + except OSError, ex: + if ex.errno == 22: + print "kernel does not support vserver scheduler" + else: + raise ex + + def get_sched(self): + # have no way of querying scheduler right now on a per vserver basis + return (-1, False) + + def set_memlimit(self, limit): + ret = vserverimpl.setrlimit(self.ctx,5,limit) + return ret + + def get_memlimit(self): + ret = vserverimpl.getrlimit(self.ctx,5) + return ret + + def set_tasklimit(self, limit): + ret = vserverimpl.setrlimit(self.ctx,6,limit) + return ret + + def get_tasklimit(self): + 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) + else: + bwlimit.on(self.ctx, eth, limit, cap, minrate, maxrate) + + def get_bwlimit(self, eth): + # not implemented yet + bwlimit = -1 + cap = "unknown" + minrate = "unknown" + maxrate = "unknown" + return (bwlimit, cap, minrate, maxrate) + def open(self, filename, mode = "r", bufsize = -1): (sendsock, recvsock) = passfdimpl.socketpair() @@ -140,7 +273,8 @@ class VServer: def __do_chcontext(self, state_file = None): - vserverimpl.chcontext(self.ctx, self.remove_caps) + vserverimpl.chcontext(self.ctx) + if not state_file: return print >>state_file, "S_CONTEXT=%d" % self.ctx @@ -261,3 +395,20 @@ class VServer: # parent process return child_pid + + def update_resources(self, resources): + + # write new values to configuration file + self.__update_config_file(self.config_file, resources) + + # + # Figure out if any processes are active in context, apply new + # values if there are. + # + + def init_disk_info(self): + + (self.disk_inodes, self.disk_blocks, size) = vduimpl.vdu(self.dir) + self.disk_usage_set = False + + return size