import passfdimpl
import utmp
import vserverimpl, vduimpl
+import cpulimit, bwlimit
from util_vserver_vars import *
def __do_chroot(self):
- return os.chroot("%s/%s" % (VROOTDIR, self.name))
+ return os.chroot("%s/%s" % (DEFAULT_VSERVERDIR, self.name))
- def set_dlimit(self, blocktotal):
- path = "%s/%s" % (VROOTDIR, self.name)
+ def set_disklimit(self, blocktotal):
+ path = "%s/%s" % (DEFAULT_VSERVERDIR, self.name)
inodes, blockcount, size = vduimpl.vdu(path)
blockcount = blockcount >> 1
# should raise some error value
print "block limit (%d) ignored for vserver %s" %(blocktotal,self.name)
- def get_dlimit(self):
- path = "%s/%s" % (VROOTDIR, self.name)
+ def get_disklimit(self):
+ path = "%s/%s" % (DEFAULT_VSERVERDIR, self.name)
try:
blocksused, blocktotal, inodesused, inodestotal, reserved = \
vserverimpl.getdlimit(path,self.ctx)
return blocktotal
def set_sched(self, shares, besteffort = True):
- global SCHED_TOKENS_MIN, SCHED_TOKENS_MAX
- tokensmin = SCHED_TOKENS_MIN
- tokensmax = SCHED_TOKENS_MAX
-
- if besteffort is True:
- # magic "interval" value for Andy's scheduler to denote besteffort
- interval = 1000
- fillrate = shares
- else:
- interval = 1001
- fillrate = shares
+ # 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?!
- try:
- vserverimpl.setsched(self.ctx,fillrate,interval,tokensmin,tokensmax)
- except OSError, ex:
- if ex.errno == 22:
- print "kernel does not support vserver scheduler"
+ # for the new vserver scheduler
+ else:
+ global SCHED_TOKENS_MIN, SCHED_TOKENS_MAX
+ tokensmin = SCHED_TOKENS_MIN
+ tokensmax = SCHED_TOKENS_MAX
+
+ if besteffort is True:
+ # magic "interval" value for Andy's scheduler to denote besteffort
+ interval = 1000
+ fillrate = shares
else:
- raise ex
+ interval = 1001
+ fillrate = shares
+
+ try:
+ cpuguaranteed = 0 # need to set this from the conf file
+ vserverimpl.setsched(self.ctx,fillrate,interval,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
+ return (-1, False)
def set_memlimit(self, limit):
ret = vserverimpl.setrlimit(self.ctx,5,limit)
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()
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