import errno
import traceback
import os, os.path
+import sys
import time
import vserver
import logger
import tools
from threading import BoundedSemaphore
+import subprocess
globalsem = BoundedSemaphore()
def destroy(name): logger.log_call('/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
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
+ 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: 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):
+ 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))
+ 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))
+
def start(self, delay=0):
- if self.rspec['enabled'] > 0:
- logger.log('%s: starting in %d seconds' % (self.name, delay))
+ 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:
- 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)
+ # 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('%s: not starting, is not enabled' % self.name)
def stop(self):
logger.log('%s: stopping' % self.name)
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('%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
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/<guest>/sysctl/<id>/
+ dirname = "/etc/vservers/%s/sysctl/%s" % (self.name, count)
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))
+ 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:
(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
git://git.onelab.eu / nodemanager.git / blobdiff