import cpulimit, bwlimit
from vserverimpl import VS_SCHED_CPU_GUARANTEED as SCHED_CPU_GUARANTEED
+from vserverimpl import DLIMIT_INF
+class NoSuchVServer(Exception): pass
+
+
+
class VServer:
INITSCRIPTS = [('/etc/rc.vinit', 'start'),
('/etc/rc.d/rc', '%(runlevel)d')]
- def __init__(self, name, vm_id, vm_running = False):
+ def __init__(self, name, vm_id = None, vm_running = False):
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
+ raise NoSuchVServer, "no such vserver: " + name
self.config = {}
for config_file in ["/etc/vservers.conf", self.config_file]:
try:
if ex.errno != errno.ENOENT:
raise
self.remove_caps = ~vserverimpl.CAP_SAFE;
+ if vm_id == None:
+ vm_id = int(self.config['S_CONTEXT'])
self.ctx = vm_id
self.vm_running = vm_running
return block_limit
- def set_sched(self, cpu_share, sched_flags = 0):
+ def set_sched_config(self, cpu_share, sched_flags):
+
+ """ Write current CPU scheduler parameters to the vserver
+ configuration file. This method does not modify the kernel CPU
+ scheduling parameters for this context. """
if cpu_share == int(self.config.get("CPULIMIT", -1)):
return
cpu_guaranteed = sched_flags & SCHED_CPU_GUARANTEED
- #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)
+ self.update_resources(cpu_config)
if self.vm_running:
- vserverimpl.setsched(self.ctx, cpu_share, sched_flags)
+ 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
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):