X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sliver_vs.py;h=6361037c9e2811a9b64b406d90928e63d5631fa9;hb=db2e08761364c07e0c703b51df770fca7be8301e;hp=c3a09dfca218da8c69eb495a5d1458a1d88ded25;hpb=49a148faa655594e3d132c2264afad5bf7e3d0e8;p=nodemanager.git diff --git a/sliver_vs.py b/sliver_vs.py index c3a09df..6361037 100644 --- a/sliver_vs.py +++ b/sliver_vs.py @@ -1,3 +1,6 @@ +# $Id$ +# $URL$ + """VServer slivers. There are a couple of tricky things going on here. First, the kernel @@ -17,8 +20,10 @@ don't have to guess if there is a running process or not. """ import errno +import traceback import os, os.path import time + import vserver import accounts @@ -63,66 +68,52 @@ class Sliver_VS(accounts.Account, vserver.VServer): self.keys = '' self.rspec = {} self.initscript = '' + self.slice_id = rec['slice_id'] self.disk_usage_initialized = False self.initscriptchanged = False + self.enabled = True self.configure(rec) @staticmethod def create(name, vref = None): logger.verbose('Sliver_VS:create - name=%s'%name) if vref is None: + logger.log("creating %s : no vref attached, this is unexpected"%name) vref='default' + # used to look in /etc/planetlab/family, now relies on the 'family' extra attribute in GetSlivers() + # which for legacy is still exposed here as the 'vref' key + + # check the template exists -- there's probably a better way.. + if not os.path.isdir ("/vservers/.vref/%s"%vref): + # find a resonable default + if os.path.isfile ("/etc/planetlab/slicefamily"): + default=file("/etc/planetlab/slicefamily").read().strip() + else: + default='default' + logger.log("creating %s : /etc/planetlab/slicefamily not found, this is unexpected"%name) + logger.log("creating %s - vref %s not found, using default %s"%(name,vref,default)) + vref=default + + # guess arch try: - ### locating the right slicefamily - # 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 - # 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("-") - # 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": - arch=wish - elif wish == "f8" or wish == "centos5" : - fcdistro=wish - else: - pldistro=wish - - # rejoin the parts - refname="-".join( (pldistro,fcdistro,arch) ) - - # check the templates exists -- there's probably a better way.. - if not os.path.isdir ("/vservers/.vref/%s"%refname): - logger.verbose("%s (%s) : vref %s not found, using default %s"%( - name,vref,refname,default)) - refname=default - # could check again, but as we have /etc/slicefamily - # there's probably no /vservers/.vref/default - - except IOError: - # have not found slicefamily - logger.verbose("%s (%s): legacy node - using fallback vrefname 'default'"%(name,vref)) - # for legacy nodes - refname="default" + (x,y,arch)=vref.split('-') except: - import traceback - 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) + def personality (arch): + personality="linux32" + if arch.find("64")>=0: + personality="linux64" + return personality + + logger.log_call('/usr/sbin/vuseradd', '-t', vref, name) + # export slicename to the slice in /etc/slicename + file('/vservers/%s/etc/slicename' % name, 'w').write(name) + file('/vservers/%s/etc/slicefamily' % name, 'w').write(vref) + # set personality: only if needed (if arch's differ) + if tools.root_context_arch() != arch: + file('/etc/vservers/%s/personality' % name, 'w').write(personality(arch)) + logger.log('%s: set personality to %s'%(name,personality(arch))) @staticmethod def destroy(name): logger.log_call('/usr/sbin/vuserdel', name) @@ -136,16 +127,7 @@ class Sliver_VS(accounts.Account, vserver.VServer): new_initscript = rec['initscript'] if new_initscript != self.initscript: self.initscript = new_initscript - logger.log('%s: installing initscript' % self.name) - def install_initscript(): - flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC - fd = os.open('/etc/rc.vinit', flags, 0755) - os.write(fd, new_initscript) - os.close(fd) - try: - self.chroot_call(install_initscript) - self.initscriptchanged = True - except: logger.log_exc(self.name) + self.initscriptchanged = True accounts.Account.configure(self, rec) # install ssh keys @@ -153,28 +135,43 @@ class Sliver_VS(accounts.Account, vserver.VServer): if self.rspec['enabled'] > 0: logger.log('%s: starting in %d seconds' % (self.name, delay)) time.sleep(delay) + # VServer.start calls fork() internally, + # so just close the nonstandard fds and fork once to avoid creating zombies 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 + if self.initscriptchanged: + logger.log('%s: installing initscript' % self.name) + def install_initscript(): + flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC + fd = os.open('/etc/rc.vinit', flags, 0755) + os.write(fd, self.initscript) + os.close(fd) + try: + self.chroot_call(install_initscript) + except: logger.log_exc(self.name) tools.close_nonstandard_fds() - vserver.VServer.start(self, True) + vserver.VServer.start(self) os._exit(0) - else: os.waitpid(child_pid, 0) + else: + os.waitpid(child_pid, 0) + self.initscriptchanged = False else: logger.log('%s: not starting, is not enabled' % self.name) - self.initscriptchanged = False def stop(self): logger.log('%s: stopping' % self.name) vserver.VServer.stop(self) - def set_resources(self): + def is_running(self): + return vserver.VServer.is_running(self) + + def set_resources(self,setup=False): disk_max = self.rspec['disk_max'] logger.log('%s: setting max disk usage to %d KiB' % (self.name, disk_max)) try: # if the sliver is over quota, .set_disk_limit will throw an exception if not self.disk_usage_initialized: self.vm_running = False - logger.log('%s: computing disk usage: beginning' % self.name) Sliver_VS._init_disk_info_sem.acquire() + logger.log('%s: computing disk usage: beginning' % self.name) try: self.init_disk_info() finally: Sliver_VS._init_disk_info_sem.release() logger.log('%s: computing disk usage: ended' % self.name) @@ -204,7 +201,22 @@ class Sliver_VS(accounts.Account, vserver.VServer): cpu_pct = self.rspec['cpu_pct'] cpu_share = self.rspec['cpu_share'] - self.setname(rec['slice_id']) + if setup: + for key in self.rspec.keys(): + if key.find('sysctl.') == 0: + sysctl=key.split('.') + try: + path="/proc/sys/%s" % ("/".join(sysctl[1:])) + logger.log("%s: opening %s"%(self.name,path)) + flags = os.O_WRONLY + fd = os.open(path, flags) + logger.log("%s: writing %s=%s"%(self.name,key,self.rspec[key])) + os.write(fd,self.rspec[key]) + os.close(fd) + except IOError, e: + logger.log("%s: could not set %s=%s"%(self.name,key,self.rspec[key])) + logger.log("%s: error = %s"%(self.name,e)) + if self.rspec['enabled'] > 0: if cpu_pct > 0: @@ -220,9 +232,23 @@ class Sliver_VS(accounts.Account, vserver.VServer): 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)) + self.setname(self.slice_id) + ### Sapan's change needs more work + # raise IOException, file does not get created + # might be that /etc/vservers is not available here, are we in the chroot ? + #logger.log("%s: Storing slice id of %s for PlanetFlow" % (self.name, self.slice_id)) + #file('/etc/vservers/%s/slice_id' % self.name, 'w').write(self.slice_id) + + if self.enabled == False: + self.enabled = True + self.start() + if False: # Does not work properly yet. if self.have_limits_changed(): logger.log('%s: limits have changed --- restarting' % self.name) @@ -237,4 +263,5 @@ class Sliver_VS(accounts.Account, vserver.VServer): else: # tell vsh to disable remote login by setting CPULIMIT to 0 logger.log('%s: disabling remote login' % self.name) self.set_sched_config(0, 0) + self.enabled = False self.stop()