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)
logger.verbose('sliver_vs: %s: create'%name)
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))
# and that's not quite right
except:
arch='i386'
-
+
def personality (arch):
personality="linux32"
if arch.find("64")>=0:
logger.log('sliver_vs: %s: set personality to %s'%(name,personality(arch)))
@staticmethod
- def destroy(name):
+ def destroy(name):
# logger.log_call(['/usr/sbin/vuserdel', name, ])
logger.log_call(['/bin/bash','-x','/usr/sbin/vuserdel', name, ])
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):
rc3_link="/vservers/%s/etc/rc.d/rc3.d/S99vinit"%self.name
rc3_target="../init.d/vinit"
# install in sliver
- try:
- logger.log("vsliver_vs: %s: installing generic vinit rc script"%self.name)
- body=file(vinit_source).read()
- flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC
- fd = os.open(vinit_script, flags, 0755)
- os.write(fd, body)
- os.close(fd)
- except:
- logger.log_exc("vsliver_vs: %s: could not install generic vinit script"%self.name)
+ body=file(vinit_source).read()
+ if tools.replace_file_with_string(vinit_script,body,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: installing generic vinit rc script"%self.name)
- os.symlink(rc3_target,rc3_link)
- except:
- logger.log_exc("vsliver_vs: %s: failed to install runlevel3 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)
+
+ # 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):
+ body=self.initscript
+ sliver_initscript="/vservers/%s/etc/rc.d/init.d/vinit.slice"%self.name
+ if tools.replace_file_with_string(sliver_initscript,body,remove_if_empty=True,chmod=0755):
+ if body:
+ logger.log("vsliver_vs: %s: Installed new initscript in %s"%(self.name,sliver_initscript))
+ else:
+ logger.log("vsliver_vs: %s: Removed obsolete initscript %s"%(self.name,sliver_initscript))
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()
+ # 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:
- # unconditionnally install and enable the generic vinit script
- # this one checks for the existence of the slice initscript
- self.install_and_enable_vinit()
- # install or remove the slice inistscript, as instructed by the initscript tag
- sliver_initscript="/vservers/%s/etc/rc.d/init.d/vinit.slice"%self.name
- if not self.initscript:
- logger.log("sliver_vs: %s: unlinking initscript %s"%(self.name,sliver_initscript))
- os.unlink(sliver_initscript)
- else:
- logger.log("sliver_vs: %s: installing new initscript %s"%(self.name,sliver_initscript))
- try:
- flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC
- fd = os.open(sliver_initscript, flags, 0755)
- os.write(fd, self.initscript)
- os.close(fd)
- except:
- logger.log_exc("sliver_vs: %s - could not install initscript"%self.name)
- tools.close_nonstandard_fds()
- vserver.VServer.start(self)
- os._exit(0)
- else:
+ # 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:
os.waitpid(child_pid, 0)
- self.initscriptchanged = False
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):
(self.name, self.rspec['ip_addresses']))
self.set_ipaddresses_config(self.rspec['ip_addresses'])
- #logger.log("sliver_vs: %s: Setting name to %s" % (self.name, self.slice_id))
- #self.setname(self.slice_id)
+ #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
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():
logger.log('sliver_vs: %s: limits have changed --- restarting' % self.name)