X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_vs.py;h=ed09821b9a25b3b9887dd15568dccbea04311613;hb=0d7ec054304ab476624fedcc4ac8309dd6591d8b;hp=48d7a4780bbd303bdf8812dc8b161c25b1841179;hpb=ada977aa9107cc9244e9f516b75425b860196a82;p=nodemanager.git diff --git a/sliver_vs.py b/sliver_vs.py index 48d7a47..ed09821 100644 --- a/sliver_vs.py +++ b/sliver_vs.py @@ -19,6 +19,8 @@ don't have to guess if there is a running process or not. import errno import os, os.path import time +import commands + import vserver import accounts @@ -68,6 +70,20 @@ class Sliver_VS(accounts.Account, vserver.VServer): 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) @@ -105,28 +121,38 @@ 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.. - if not os.path.isdir ("/vservers/.vref/%s"%refname): - logger.verbose("%s (%s) : vref %s not found, using default %s"%( + # check the template exists -- there's probably a better way.. + if os.path.isdir ("/vservers/.vref/%s"% vref): refname = vref + + if not os.path.isdir ("/vservers/.vref/%s"% refname): + 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" 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) @@ -140,46 +166,52 @@ 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) - - accounts.Account.configure(self, rec) # install ssh keys + self.initscriptchanged = True + + # install ssh keys + accounts.Account.configure(self, rec) def start(self, delay=0): 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) 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) @@ -209,6 +241,23 @@ 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('.') + 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: logger.log('%s: setting cpu reservation to %d%%' % (self.name, cpu_pct))