"""
import errno
+import traceback
import os, os.path
import time
+
import vserver
import accounts
self.slice_id = rec['slice_id']
self.disk_usage_initialized = False
self.initscriptchanged = False
+ self.enabled = True
self.configure(rec)
@staticmethod
(pldistro,fcdistro,arch) = default.split("-")
known_archs = [ 'i386', 'x86_64' ]
- known_fcdistros = [ 'f8', 'f9', 'centos5' ]
+ known_fcdistros = [ 'centos5', 'f8', 'f9', 'f10', 'f11', 'f12' ]
# from the slice attribute: cut dashes and try to figure the meaning
slice_wishes = vref.split("-")
for wish in slice_wishes:
# 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)
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
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 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)
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))
(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)
+ 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"%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.enabled == False:
+ self.enabled = True
+ self.start()
if False: # Does not work properly yet.
if self.have_limits_changed():
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()
git://git.onelab.eu / nodemanager.git / blobdiff