TYPE = 'sliver.VServer'
def __init__(self, rec):
- vserver.VServer.__init__(self, rec['name'])
+ try:
+ vserver.VServer.__init__(self, rec['name'])
+ except vserver.NoSuchVServer:
+ self.create(rec['name'], rec['type'])
+ vserver.VServer.__init__(self, rec['name'])
+
self.keys = ''
self.rspec = {}
self.initscript = ''
self.configure(rec)
@staticmethod
- def create(name): logger.log_call('/usr/sbin/vuseradd', name)
+ def create(name, vref = None):
+ if vref is not None:
+ logger.log_call('/usr/sbin/vuseradd', '-t', vref, name)
+ else:
+ logger.log_call('/usr/sbin/vuseradd', name)
@staticmethod
def destroy(name): logger.log_call('/usr/sbin/vuserdel', name)
self.init_disk_info()
self.disk_usage_initialized = True
vserver.VServer.set_disklimit(self, disk_max)
- except OSError: logger.log_exc()
+ except OSError:
+ logger.log('%s: failed to set max disk usage' % self.name)
+ logger.log_exc()
net_limits = (self.rspec['net_min'], self.rspec['net_max'], self.rspec['net2_min'], self.rspec['net2_max'], self.rspec['net_share'])
logger.log('%s: setting net limits to %s bps' % (self.name, net_limits[:-1]))
cpu_min = self.rspec['cpu_min']
cpu_share = self.rspec['cpu_share']
- if self.rspec['enabled']:
- if cpu_min > 0:
+ if self.rspec['enabled'] > 0:
+ if cpu_min >= 50: # at least 5%: keep people from shooting themselves in the foot
logger.log('%s: setting cpu share to %d%% guaranteed' % (self.name, cpu_min/10.0))
self.set_sched_config(cpu_min, vserver.SCHED_CPU_GUARANTEED)
else: