X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_vs.py;h=8382c6dcd8aecd764003f7059c05ef74dd84b4c6;hb=refs%2Fheads%2Fdevel;hp=5d487f6976f6d69e819d653f8a651e1b8c2c5225;hpb=74a8cfb9d2eac39ae02e5323e1fb5b1d33297981;p=nodemanager.git diff --git a/sliver_vs.py b/sliver_vs.py index 5d487f6..8382c6d 100644 --- a/sliver_vs.py +++ b/sliver_vs.py @@ -1,5 +1,4 @@ -# $Id$ -# $URL$ +# """VServer slivers. @@ -22,16 +21,17 @@ don't have to guess if there is a running process or not. import errno import traceback import os, os.path +import sys import time +from threading import BoundedSemaphore +import subprocess +# the util-vserver-pl module 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 @@ -50,43 +50,47 @@ class Sliver_VS(accounts.Account, vserver.VServer): SHELL = '/bin/vsh' TYPE = 'sliver.VServer' - _init_disk_info_sem = globalsem + _init_disk_info_sem = BoundedSemaphore() def __init__(self, rec): name=rec['name'] logger.verbose ('sliver_vs: %s init'%name) try: logger.log("sliver_vs: %s: first chance..."%name) - vserver.VServer.__init__(self, name,logfile='/var/log/nm') + vserver.VServer.__init__(self, name,logfile='/var/log/nodemanager') except Exception, err: if not isinstance(err, vserver.NoSuchVServer): # Probably a bad vserver or vserver configuration file logger.log_exc("sliver_vs:__init__ (first chance) %s",name=name) logger.log('sliver_vs: %s: recreating bad vserver' % name) self.destroy(name) - self.create(name, rec['vref']) + self.create(name, rec) logger.log("sliver_vs: %s: second chance..."%name) - vserver.VServer.__init__(self, name,logfile='/var/log/nm') + vserver.VServer.__init__(self, name,logfile='/var/log/nodemanager') self.keys = '' self.rspec = {} - self.initscript = '' self.slice_id = rec['slice_id'] self.disk_usage_initialized = False - self.initscriptchanged = False + self.initscript = '' self.enabled = True self.configure(rec) @staticmethod - def create(name, vref = None): + def create(name, rec = None): logger.verbose('sliver_vs: %s: create'%name) + vref = rec['vref'] if vref is None: logger.log("sliver_vs: %s: ERROR - no vref attached, this is unexpected"%(name)) - return - # used to look in /etc/planetlab/family, + # added by caglar + # band-aid for short period as old API doesn't have GetSliceFamily function + #return + vref = "planetlab-f8-i386" + + # used to look in /etc/planetlab/family, # now relies on the 'GetSliceFamily' 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): logger.log ("sliver_vs: %s: ERROR Could not create sliver - vreference image %s not found"%(name,vref)) @@ -99,26 +103,42 @@ class Sliver_VS(accounts.Account, vserver.VServer): # and that's not quite right except: arch='i386' - + def personality (arch): personality="linux32" if arch.find("64")>=0: personality="linux64" return personality - logger.log_call('/usr/sbin/vuseradd', '-t', vref, name) + command=[] + # be verbose + command += ['/bin/bash','-x',] + command += ['/usr/sbin/vuseradd', ] + if 'attributes' in rec and 'isolate_loopback' in rec['attributes'] and rec['attributes']['isolate_loopback'] == '1': + command += [ "-i",] + # the vsliver imge to use + command += [ '-t', vref, ] + # slice name + command += [ name, ] +# logger.log_call(['/usr/sbin/vuseradd', '-t', vref, name, ], timeout=15*60) + logger.log_call(command, timeout=15*60) # 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)) + file('/etc/vservers/%s/personality' % name, 'w').write(personality(arch)+"\n") logger.log('sliver_vs: %s: set personality to %s'%(name,personality(arch))) @staticmethod - def destroy(name): logger.log_call('/usr/sbin/vuserdel', name) + def destroy(name): +# logger.log_call(['/usr/sbin/vuserdel', name, ]) + logger.log_call(['/bin/bash','-x','/usr/sbin/vuserdel', name, ]) def configure(self, rec): + # in case we update nodemanager.. + self.install_and_enable_vinit() + new_rspec = rec['_rspec'] if new_rspec != self.rspec: self.rspec = new_rspec @@ -127,44 +147,105 @@ class Sliver_VS(accounts.Account, vserver.VServer): new_initscript = rec['initscript'] if new_initscript != self.initscript: self.initscript = new_initscript - self.initscriptchanged = True + # not used anymore, we always check against the installed script + #self.initscriptchanged = True + self.refresh_slice_vinit() accounts.Account.configure(self, rec) # install ssh keys + # unconditionnally install and enable the generic vinit script + # mimicking chkconfig for enabling the generic vinit script + # this is hardwired for runlevel 3 + def install_and_enable_vinit (self): + vinit_source="/usr/share/NodeManager/sliver-initscripts/vinit" + vinit_script="/vservers/%s/etc/rc.d/init.d/vinit"%self.name + rc3_link="/vservers/%s/etc/rc.d/rc3.d/S99vinit"%self.name + rc3_target="../init.d/vinit" + # install in sliver + code=file(vinit_source).read() + if tools.replace_file_with_string(vinit_script,code,chmod=0755): + logger.log("vsliver_vs: %s: installed generic vinit rc script"%self.name) + # create symlink for runlevel 3 + if not os.path.islink(rc3_link): + try: + logger.log("vsliver_vs: %s: creating runlevel3 symlink %s"%(self.name,rc3_link)) + os.symlink(rc3_target,rc3_link) + except: + logger.log_exc("vsliver_vs: %s: failed to create runlevel3 symlink %s"%rc3_link) + + def rerun_slice_vinit(self): + command = "/usr/sbin/vserver %s exec /etc/rc.d/init.d/vinit restart" % (self.name) + logger.log("vsliver_vs: %s: Rerunning slice initscript: %s" % (self.name, command)) + subprocess.call(command + "&", stdin=open('/dev/null', 'r'), stdout=open('/dev/null', 'w'), stderr=subprocess.STDOUT, shell=True) + + # this one checks for the existence of the slice initscript + # install or remove the slice inistscript, as instructed by the initscript tag + def refresh_slice_vinit(self): + code=self.initscript + sliver_initscript="/vservers/%s/etc/rc.d/init.d/vinit.slice"%self.name + if tools.replace_file_with_string(sliver_initscript,code,remove_if_empty=True,chmod=0755): + if code: + logger.log("vsliver_vs: %s: Installed new initscript in %s"%(self.name,sliver_initscript)) + if self.is_running(): + # Only need to rerun the initscript if the vserver is + # already running. If the vserver isn't running, then the + # initscript will automatically be started by + # /etc/rc.d/vinit when the vserver is started. + self.rerun_slice_vinit() + else: + logger.log("vsliver_vs: %s: Removed obsolete initscript %s"%(self.name,sliver_initscript)) + + # bind mount root side dir to sliver side + # needs to be done before sliver starts + def expose_ssh_dir (self): + try: + root_ssh="/home/%s/.ssh"%self.name + sliver_ssh="/vservers/%s/home/%s/.ssh"%(self.name,self.name) + # any of both might not exist yet + for path in [root_ssh,sliver_ssh]: + if not os.path.exists (path): + os.mkdir(path) + if not os.path.isdir (path): + raise Exception + mounts=file('/proc/mounts').read() + if mounts.find(sliver_ssh)<0: + # xxx perform mount + subprocess.call("mount --bind -o ro %s %s"%(root_ssh,sliver_ssh),shell=True) + logger.log("expose_ssh_dir: %s mounted into slice %s"%(root_ssh,self.name)) + except: + logger.log_exc("expose_ssh_dir with slice %s failed"%self.name) + def start(self, delay=0): - if self.rspec['enabled'] > 0: + if self.rspec['enabled'] <= 0: + logger.log('sliver_vs: not starting %s, is not enabled'%self.name) + else: logger.log('sliver_vs: %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 + # the generic /etc/init.d/vinit script is permanently refreshed, and enabled + self.install_and_enable_vinit() + # expose .ssh for omf_friendly slivers + if 'omf_control' in self.rspec['tags']: + self.expose_ssh_dir() + # if a change has occured in the slice initscript, reflect this in /etc/init.d/vinit.slice + self.refresh_slice_vinit() child_pid = os.fork() if child_pid == 0: - if self.initscriptchanged: - logger.log('sliver_vs: %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("sliver_vs: start",name=self.name) + # 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) os._exit(0) - else: + else: os.waitpid(child_pid, 0) - self.initscriptchanged = False - else: logger.log('sliver_vs: not starting, is not enabled', name=self.name) def stop(self): logger.log('sliver_vs: %s: stopping' % self.name) vserver.VServer.stop(self) - def is_running(self): + def is_running(self): return vserver.VServer.is_running(self) - def set_resources(self,setup=False): + def set_resources(self): disk_max = self.rspec['disk_max'] logger.log('sliver_vs: %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 @@ -172,6 +253,7 @@ class Sliver_VS(accounts.Account, vserver.VServer): self.vm_running = False Sliver_VS._init_disk_info_sem.acquire() logger.log('sliver_vs: %s: computing disk usage: beginning' % self.name) + # init_disk_info is inherited from VServer try: self.init_disk_info() finally: Sliver_VS._init_disk_info_sem.release() logger.log('sliver_vs: %s: computing disk usage: ended' % self.name) @@ -200,21 +282,29 @@ class Sliver_VS(accounts.Account, vserver.VServer): cpu_pct = self.rspec['cpu_pct'] cpu_share = self.rspec['cpu_share'] - if setup: - for key in self.rspec.keys(): - if key.find('sysctl.') == 0: - sysctl=key.split('.') + count = 1 + for key in self.rspec.keys(): + if key.find('sysctl.') == 0: + sysctl=key.split('.') + try: + # /etc/vservers//sysctl// + dirname = "/etc/vservers/%s/sysctl/%s" % (self.name, count) try: - path="/proc/sys/%s" % ("/".join(sysctl[1:])) - logger.log("sliver_vs: %s: opening %s"%(self.name,path)) - flags = os.O_WRONLY - fd = os.open(path, flags) - logger.log("sliver_vs: %s: writing %s=%s"%(self.name,key,self.rspec[key])) - os.write(fd,self.rspec[key]) - os.close(fd) - except IOError, e: - logger.log("sliver_vs: %s: could not set %s=%s"%(self.name,key,self.rspec[key])) - logger.log("sliver_vs: %s: error = %s"%(self.name,e)) + os.makedirs(dirname, 0755) + except: + pass + setting = open("%s/setting" % dirname, "w") + setting.write("%s\n" % key.lstrip("sysctl.")) + setting.close() + value = open("%s/value" % dirname, "w") + value.write("%s\n" % self.rspec[key]) + value.close() + count += 1 + + logger.log("sliver_vs: %s: writing %s=%s"%(self.name,key,self.rspec[key])) + except IOError, e: + logger.log("sliver_vs: %s: could not set %s=%s"%(self.name,key,self.rspec[key])) + logger.log("sliver_vs: %s: error = %s"%(self.name,e)) if self.rspec['enabled'] > 0: @@ -233,21 +323,30 @@ class Sliver_VS(accounts.Account, vserver.VServer): if self.rspec['ip_addresses'] != '0.0.0.0': logger.log('sliver_vs: %s: setting IP address(es) to %s' % \ (self.name, self.rspec['ip_addresses'])) - self.set_ipaddresses_config(self.rspec['ip_addresses']) + add_loopback = True + if 'isolate_loopback' in self.rspec['tags']: + add_loopback = self.rspec['tags']['isolate_loopback'] != "1" + self.set_ipaddresses_config(self.rspec['ip_addresses'], add_loopback) + + #logger.log("sliver_vs: %s: Setting name to %s" % (self.name, self.slice_id)) + #self.setname(self.slice_id) + #logger.log("sliver_vs: %s: Storing slice id of %s for PlanetFlow" % (self.name, self.slice_id)) + try: + vserver_config_path = '/etc/vservers/%s'%self.name + if not os.path.exists (vserver_config_path): + os.makedirs (vserver_config_path) + file('%s/slice_id'%vserver_config_path, 'w').write("%d\n"%self.slice_id) + logger.log("sliver_vs: Recorded slice id %d for slice %s"%(self.slice_id,self.name)) + except IOError,e: + logger.log("sliver_vs: Could not record slice_id for slice %s. Error: %s"%(self.name,str(e))) + except Exception,e: + logger.log_exc("sliver_vs: Error recording slice id: %s"%str(e),name=self.name) - if self.is_running(): - logger.log("sliver_vs: %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("sliver_vs: %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('sliver_vs: %s: limits have changed --- restarting' % self.name)