X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_vs.py;h=17da6d03c39f401870e47d04eb70415f3ba51caa;hb=refs%2Fheads%2Ftrellis;hp=e7d86d8cfae5468ebdb339a083a073405c261de7;hpb=dd9dba739535ae5ebf48ce83582342ea47dcb3c0;p=nodemanager.git diff --git a/sliver_vs.py b/sliver_vs.py index e7d86d8..17da6d0 100644 --- a/sliver_vs.py +++ b/sliver_vs.py @@ -19,6 +19,7 @@ don't have to guess if there is a running process or not. import errno import os, os.path import time + import vserver import accounts @@ -89,12 +90,15 @@ class Sliver_VS(accounts.Account, vserver.VServer): # 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 == "f8" or wish == "centos5" : + elif wish in known_fcdistros: fcdistro=wish else: pldistro=wish @@ -102,28 +106,42 @@ class Sliver_VS(accounts.Account, vserver.VServer): # rejoin the parts refname="-".join( (pldistro,fcdistro,arch) ) - # check the templates exists -- there's probably a better way.. + # check the template 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"%( + logger.log("%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 slicefamily - logger.verbose("%s (%s): legacy node - using fallback vrefname 'default'"%(name,vref)) - # for legacy nodes + logger.log("%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" + def personality (arch): + personality="linux32" + if arch.find("64")>=0: + personality="linux64" + return personality + 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 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) @@ -137,16 +155,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 @@ -154,24 +163,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 - vserver.VServer.start(self) - + # 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: + 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) + os._exit(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 is_running(self): + return vserver.VServer.is_running(self) + def set_resources(self): 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)