import errno
import os, os.path
import time
+import commands
+
import vserver
import accounts
import logger
import tools
+from threading import BoundedSemaphore
+
+globalsem = BoundedSemaphore()
# special constant that tells vserver to keep its existing settings
KEEP_LIMIT = vserver.VC_LIM_KEEP
SHELL = '/bin/vsh'
TYPE = 'sliver.VServer'
- _init_disk_info_sem = tools.NMLock("/var/run/nm-disk-info.lock")
+ _init_disk_info_sem = globalsem
def __init__(self, rec):
logger.verbose ('initing Sliver_VS with name=%s'%rec['name'])
self.keys = ''
self.rspec = {}
self.initscript = ''
+ self.slice_id = rec['slice_id']
self.disk_usage_initialized = False
self.initscriptchanged = False
self.configure(rec)
+ _root_context_arch=None
+ @staticmethod
+ def root_context_arch():
+ if not Sliver_VS._root_context_arch:
+ Sliver_VS._root_context_arch=commands.getoutput("uname -i")
+ return Sliver_VS._root_context_arch
+
+ @staticmethod
+ def personality (arch):
+ personality="linux32"
+ if arch.find("64")>=0:
+ personality="linux64"
+ return personality
+
@staticmethod
def create(name, vref = None):
logger.verbose('Sliver_VS:create - name=%s'%name)
# this is a first draft, and more a proof of concept thing
# the idea is to parse vref for dash-separated wishes,
# and to project these against the defaults
- # however for cases like when vref is 'planetflow', if we do not understand
- # any of the wishes we take vref as is
- # this could be improved by having the vserver-reference init script be a bit smarter
- # so we could take planetflow as the pldistro part here
- as_is=None
- # defaults
- default=file("/etc/planetlab/defaultvref").read()
+ # so e.g. if the default slice family (as found in /etc/planetlab/slicefamily)
+ # is planetlab-f8-i386, then here is what we get
+ # vref=x86_64 -> vuseradd -t planetlab-f8-x86_64
+ # vref=centos5 -> vuseradd -t planetlab-centos5-i386
+ # vref=centos5-onelab -> vuseradd -t onelab-centos5-i386
+ # vref=planetflow -> vuseradd -t planetflow-f8-i386
+ # vref=x86_64-planetflow -> vuseradd -t planetflow-f8-x86_64
+
+ # default
+ default=file("/etc/planetlab/slicefamily").read().strip()
(pldistro,fcdistro,arch) = default.split("-")
+
+ known_archs = [ 'i386', 'x86_64' ]
+ known_fcdistros = [ 'f8', 'f9', 'centos5' ]
# from the slice attribute: cut dashes and try to figure the meaning
slice_wishes = vref.split("-")
for wish in slice_wishes:
- if wish == "i386" or wish == "x86_64":
+ if wish in known_archs:
arch=wish
- elif wish == "planetlab" or wish == "onelab" or wish == "vini":
- pldistro=wish
- elif wish == "f8" or wish == "centos5" :
+ elif wish in known_fcdistros:
fcdistro=wish
else:
- # if we find something like e.g. planetflow, use it as-is
- as_is=vref
- break
- if as_is:
- refname=as_is
- else:
- refname="-".join( (pldistro,fcdistro,arch) )
- # check the templates exists -- there's probably a better way..
+ pldistro=wish
+
+ # rejoin the parts
+ refname="-".join( (pldistro,fcdistro,arch) )
+
+ # check the template exists -- there's probably a better way..
if not os.path.isdir ("/vservers/.vref/%s"%refname):
- log.verbose("%s (%s) : vref %s not found, using default %s"%(
+ logger.verbose("%s (%s) : vref %s not found, using default %s"%(
name,vref,refname,default))
refname=default
+ # reset so arch is right
+ (pldistro,fcdistro,arch) = default.split("-")
+ # could check again, but as we have /etc/slicefamily
+ # there's probably no /vservers/.vref/default
+
except IOError:
- # have not found defaultvref
- logger.verbose("%s (%s): using fallback vrefname 'default'"%(name,vref))
- # for legacy nodes
+ # have not found slicefamily
+ logger.verbose("%s (%s): legacy node - using fallback vrefname 'default'"%(name,vref))
+ # for legacy nodes
refname="default"
+ arch="i386"
except:
import traceback
- logger.log("%s (%s) : unexpected error follows - using 'default'"%(
- name,vref))
+ logger.log("%s (%s) : unexpected error follows - using 'default'"%(name,vref))
logger.log(traceback.format_exc())
refname="default"
+ arch="i386"
logger.log_call('/usr/sbin/vuseradd', '-t', refname, name)
- open('/vservers/%s/etc/slicename' % name, 'w').write(name)
+ # export slicename to the slice in /etc/slicename
+ file('/vservers/%s/etc/slicename' % name, 'w').write(name)
+ # set personality: only if needed (if arch's differ)
+ if Sliver_VS.root_context_arch() != arch:
+ file('/etc/vservers/%s/personality' % name, 'w').write(Sliver_VS.personality(arch))
+ logger.log('%s: set personality to %s'%(name,Sliver_VS.personality(arch)))
@staticmethod
def destroy(name): logger.log_call('/usr/sbin/vuserdel', name)
time.sleep(delay)
child_pid = os.fork()
if child_pid == 0:
- # VServer.start calls fork() internally, so just close the nonstandard fds and fork once to avoid creating zombies
+ # VServer.start calls fork() internally,
+ # so just close the nonstandard fds and fork once to avoid creating zombies
tools.close_nonstandard_fds()
- vserver.VServer.start(self, True)
+ vserver.VServer.start(self)
os._exit(0)
else: os.waitpid(child_pid, 0)
else: logger.log('%s: not starting, is not enabled' % self.name)
if self.rspec['capabilities']:
logger.log('%s: setting capabilities to %s' % (self.name, self.rspec['capabilities']))
- if False: # this code was commented out before
- # N.B. net_*_rate are in kbps because of XML-RPC maxint
- # limitations, convert to bps which is what bwlimit.py expects.
- net_limits = (self.rspec['net_min_rate'] * 1000,
- self.rspec['net_max_rate'] * 1000,
- self.rspec['net_i2_min_rate'] * 1000,
- self.rspec['net_i2_max_rate'] * 1000,
- self.rspec['net_share'])
- logger.log('%s: setting net limits to %s bps' % (self.name, net_limits[:-1]))
- logger.log('%s: setting net share to %d' % (self.name, net_limits[-1]))
- self.set_bwlimit(*net_limits)
-
cpu_pct = self.rspec['cpu_pct']
cpu_share = self.rspec['cpu_share']
self.set_sched_config(cpu_pct, cpu_share)
# if IP address isn't set (even to 0.0.0.0), sliver won't be able to use network
if self.rspec['ip_addresses'] != '0.0.0.0':
- logger.log('%s: setting IP address(es) to %s' % (self.name, self.rspec['ip_addresses']))
+ logger.log('%s: setting IP address(es) to %s' % \
+ (self.name, self.rspec['ip_addresses']))
self.set_ipaddresses_config(self.rspec['ip_addresses'])
+ if self.is_running():
+ logger.log("%s: Setting name to %s" % (self.name, self.slice_id),2)
+ self.setname(self.slice_id)
+
if False: # Does not work properly yet.
if self.have_limits_changed():
logger.log('%s: limits have changed --- restarting' % self.name)
git://git.onelab.eu / nodemanager.git / blobdiff