import errno
import os
-import threading
import time
import vserver
SHELL = '/bin/vsh'
TYPE = 'sliver.VServer'
- _init_disk_info_sem = threading.Semaphore(1)
+ _init_disk_info_sem = tools.NMLock("/var/run/nm-disk-info.lock")
def __init__(self, rec):
try:
hard = self.rspec['%s_hard'%type]
self.set_rlimit_config(limit, hard, soft, minimum)
- self.set_WHITELISTED_config(self.rspec['whitelist'])
self.set_capabilities_config(self.rspec['capabilities'])
if self.rspec['capabilities']:
logger.log('%s: setting capabilities to %s' % (self.name, self.rspec['capabilities']))
cpu_min = self.rspec['cpu_min']
cpu_share = self.rspec['cpu_share']
- if self.rspec['enabled'] > 0 and self.rspec['whitelist'] == 1:
+ 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)
logger.log('%s: setting cpu share to %d' % (self.name, cpu_share))
self.set_sched_config(cpu_share, 0)
+ if self.rspec['ip_addresses'] != '0.0.0.0':
+ logger.log('%s: setting IP address(es) to %s' % (self.name, self.rspec['ip_addresses']))
+ self.set_ipaddresses_config(self.rspec['ip_addresses'])
+
if False: # Does not work properly yet.
if self.have_limits_changed():
logger.log('%s: limits have changed --- restarting' % self.name)