X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=python%2Fvserver.py;h=9c967eeeec1aac949f7ecb6bc7c8a46360ffcf9d;hb=036c0f5f754fde79c039d62e41ea8b10df473020;hp=c6d07b625bcc5bcae34baf14b10b6f2d6cab551e;hpb=8f38f0193db0dc219639aceac5f00641f31323af;p=util-vserver.git diff --git a/python/vserver.py b/python/vserver.py index c6d07b6..9c967ee 100644 --- a/python/vserver.py +++ b/python/vserver.py @@ -18,8 +18,21 @@ import cpulimit, bwlimit from vserverimpl import VS_SCHED_CPU_GUARANTEED as SCHED_CPU_GUARANTEED from vserverimpl import DLIMIT_INF - - +from vserverimpl import VC_LIM_KEEP + +from vserverimpl import RLIMIT_CPU +from vserverimpl import RLIMIT_RSS +from vserverimpl import RLIMIT_NPROC +from vserverimpl import RLIMIT_NOFILE +from vserverimpl import RLIMIT_MEMLOCK +from vserverimpl import RLIMIT_AS +from vserverimpl import RLIMIT_LOCKS +from vserverimpl import RLIMIT_SIGPENDING +from vserverimpl import RLIMIT_MSGQUEUE +from vserverimpl import VLIMIT_NSOCK +from vserverimpl import VLIMIT_OPENFD +from vserverimpl import VLIMIT_ANON +from vserverimpl import VLIMIT_SHMEM # # these are the flags taken from the kernel linux/vserver/legacy.h @@ -34,11 +47,9 @@ FLAGS_ULIMIT = 64 FLAGS_NAMESPACE = 128 - class NoSuchVServer(Exception): pass - class VServer: INITSCRIPTS = [('/etc/rc.vinit', 'start'), @@ -47,6 +58,7 @@ class VServer: def __init__(self, name, vm_id = None, vm_running = False): self.name = name + self.limits_changed = False self.config_file = "/etc/vservers/%s.conf" % name self.dir = "%s/%s" % (vserverimpl.VSERVER_BASEDIR, name) if not (os.path.isdir(self.dir) and @@ -65,6 +77,96 @@ class VServer: self.ctx = vm_id self.vm_running = vm_running + # For every resource key listed in the limit table, add in a + # new method with which one can get/set the resource's hard, + # soft, minimum limits. + limits = {"CPU": RLIMIT_CPU, + "RSS": RLIMIT_RSS, + "NPROC": RLIMIT_NPROC, + "NOFILE": RLIMIT_NOFILE, + "MEMLOCK": RLIMIT_MEMLOCK, + "AS": RLIMIT_AS, + "LOCKS": RLIMIT_LOCKS, + "SIGPENDING": RLIMIT_SIGPENDING, + "MSGQUEUE": RLIMIT_MSGQUEUE, + "NSOCK": VLIMIT_NSOCK, + "OPENFD": VLIMIT_OPENFD, + "ANON": VLIMIT_ANON, + "SHMEM": VLIMIT_SHMEM} + for meth in limits.keys(): + resource_type = limits[meth] + func = lambda \ + hard=VC_LIM_KEEP,\ + soft=VC_LIM_KEEP,\ + minimum=VC_LIM_KEEP:\ + self.__set_vserver_limit(resource_type,\ + hard, \ + soft,\ + minimum) + self.__dict__["set_%s_limit"%meth] = func + + func = lambda \ + hard=VC_LIM_KEEP,\ + soft=VC_LIM_KEEP,\ + minimum=VC_LIM_KEEP:\ + self.__set_vserver_config(meth, resource_type, \ + hard, \ + soft,\ + minimum) + self.__dict__["set_%s_config"%meth] = func + + func = lambda : self.__get_vserver_limit(resource_type) + self.__dict__["get_%s_limit"%meth] = func + + func = lambda : self.__get_vserver_config(meth,resource_type) + self.__dict__["get_%s_config"%meth] = func + + def have_limits_changed(self): + return self.limits_changed + + def __set_vserver_limit(self,resource_type,hard,soft,minimum): + """Generic set resource limit function for vserver""" + if self.is_running(): + changed = False + old_hard, old_soft, old_minimum = self.__get_vserver_limit(resource_type) + if old_hard != VC_LIM_KEEP and old_hard <> hard: changed = True + if old_soft != VC_LIM_KEEP and old_soft <> soft: changed = True + if old_minimu != VC_LIM_KEEP and old_minimum <> minimum: changed = True + self.limits_changed = self.limits_changed or changed + ret = vserverimpl.setrlimit(self.ctx,resource_type,hard,soft,minimum) + + def __set_vserver_config(self,meth,resource_type,hard,soft,minimum): + """Generic set resource limit function for vserver""" + resources = {} + if hard <> VC_LIM_KEEP: + resources["VS_%s_HARD"%meth] = hard + if soft <> VC_LIM_KEEP: + resources["VS_%s_SOFT"%meth] = soft + if minimum <> VC_LIM_KEEP: + resources["VS_%s_MINIMUM"%meth] = minimum + if len(resources)>0: + self.update_resources(resources) + self.__set_vserver_limit(resource_type,hard,soft,minimum) + + def __get_vserver_limit(self,resource_type): + """Generic get resource configuration function for vserver""" + if self.is_running(): + ret = vserverimpl.getrlimit(self.ctx,resource_type) + else: + ret = __get_vserver_config(meth,resource_type) + return ret + + def __get_vserver_config(self,meth,resource_type): + """Generic get resource configuration function for vserver""" + hard = int(self.config.get("VS_%s_HARD"%meth,VC_LIM_KEEP)) + soft = int(self.config.get("VS_%s_SOFT"%meth,VC_LIM_KEEP)) + minimum = int(self.config.get("VS_%s_MINIMUM"%meth,VC_LIM_KEEP)) + return (hard,soft,minimum) + + def set_WHITELISTED_config(self,whitelisted): + resources = {'VS_WHITELISTED': whitelisted} + self.update_resources(resources) + config_var_re = re.compile(r"^ *([A-Z_]+)=(.*)\n?$", re.MULTILINE) def __read_config_file(self, filename): @@ -133,7 +235,6 @@ class VServer: return result def set_disklimit(self, block_limit): - # block_limit is in kB if block_limit == 0: vserverimpl.unsetdlimit(self.dir, self.ctx) @@ -155,6 +256,12 @@ class VServer: vserverimpl.DLIMIT_INF, # inode limit 2) # %age reserved for root + resources = {'VS_DISK_MAX': block_limit} + self.update_resources(resources) + + def is_running(self): + return vserverimpl.isrunning(self.ctx) + def get_disklimit(self): try: @@ -183,40 +290,22 @@ class VServer: self.set_sched(cpu_share, sched_flags) def set_sched(self, cpu_share, sched_flags = 0): - """ Update kernel CPU scheduling parameters for this context. """ - vserverimpl.setsched(self.ctx, cpu_share, sched_flags) 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, minrate = bwlimit.bwmin, maxrate = None, exempt_min = None, exempt_max = None, share = None, dev = "eth0"): - if minrate: + if minrate is None: + bwlimit.off(self.ctx, dev) + else: bwlimit.on(self.ctx, dev, share, minrate, maxrate, exempt_min, exempt_max) - else: - bwlimit.off(self.ctx, dev) def get_bwlimit(self, dev = "eth0"):