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
FLAGS_NAMESPACE = 128
-
class NoSuchVServer(Exception): pass
-
class VServer:
INITSCRIPTS = [('/etc/rc.vinit', 'start'),
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
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_minimum != 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):
f.close()
todo = newvars.copy()
changed = False
+ offset = 0
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)] + str(newval) + data[m.end(2):]
+ data = data[:offset+m.start(2)] + str(newval) + data[offset+m.end(2):]
+ offset += len(str(newval)) - (m.end(2)-m.start(2))
changed = True
for (newkey, newval) in todo.items():
data += "%s=%s\n" % (newkey, newval)
f.write(data)
f.close()
- # 'copy' original file, rename new to original
- backup = filename + ".old"
- try:
- os.unlink(backup)
- except OSError, ex:
- if ex.errno != errno.ENOENT:
- raise
- os.link(filename, backup)
+ # replace old file with new
os.rename(newfile, filename)
def __do_chroot(self):
return result
def set_disklimit(self, block_limit):
-
# block_limit is in kB
if block_limit == 0:
vserverimpl.unsetdlimit(self.dir, self.ctx)
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:
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 set_bwlimit(self, minrate = bwlimit.bwmin, maxrate = None,
+ exempt_min = None, exempt_max = None,
+ share = None, dev = "eth0"):
- def get_tasklimit(self):
- ret = vserverimpl.getrlimit(self.ctx,6)
- return ret
-
- def set_bwlimit(self, maxrate, minrate = 1, share = None, dev = "eth0"):
-
- if maxrate != 0:
- bwlimit.on(self.ctx, dev, share, minrate, maxrate)
- else:
+ if minrate is None:
bwlimit.off(self.ctx, dev)
+ else:
+ bwlimit.on(self.ctx, dev, share,
+ minrate, maxrate, exempt_min, exempt_max)
def get_bwlimit(self, dev = "eth0"):
+ result = bwlimit.get(self.ctx)
# result of bwlimit.get is (ctx, share, minrate, maxrate)
- return bwlimit.get(self.ctx)[1:]
+ if result:
+ result = result[1:]
+ return result
def open(self, filename, mode = "r", bufsize = -1):
self.__do_chcontext(state_file)
def start(self, wait, runlevel = 3):
-
self.vm_running = True
+ self.limits_changed = False
child_pid = os.fork()
if child_pid == 0:
return size
def stop(self, signal = signal.SIGKILL):
-
vserverimpl.killall(self.ctx, signal)
self.vm_running = False
+ self.limits_changed = False
git://git.onelab.eu / util-vserver.git / blobdiff