class Initscript:
- def __init__ (self, name):
- self.name=name
+ def __init__(self, name):
+ self.name = name
self.initscript = ''
- def configure (self, rec):
+ def configure(self, rec):
# logger.log("Initscript.configure")
new_initscript = rec['initscript']
if new_initscript != self.initscript:
#self.initscriptchanged = True
self.refresh_slice_vinit()
- def install_and_enable_vinit (self):
+ def install_and_enable_vinit(self):
"prepare sliver rootfs init and systemd so the vinit service kicks in"
# the fact that systemd attempts to run old-style services
# says we should do either one or the other and not both
# which is not what we've seen starting with f18
# so we try for a systemd system, and if it fails it means
# one of the dir does not exist and so we are dealing with an init-based rootfs
- try: self.install_and_enable_vinit_for_systemd ()
- except: self.install_and_enable_vinit_for_init ()
+ try:
+ self.install_and_enable_vinit_for_systemd ()
+ except:
+ self.install_and_enable_vinit_for_init ()
# 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_for_init (self):
- "suitable for init-based VMs"
- vinit_source="/usr/share/NodeManager/sliver-initscripts/vinit"
- vinit_script="/vservers/%s/etc/rc.d/init.d/vinit"%self.name
- enable_link="/vservers/%s/etc/rc.d/rc3.d/S99vinit"%self.name
- enable_target="../init.d/vinit"
+ def install_and_enable_vinit_for_init(self):
+ """
+ suitable for init-based VMs
+ """
+ vinit_source = "/usr/share/NodeManager/sliver-initscripts/vinit"
+ vinit_script = "/vservers/%s/etc/rc.d/init.d/vinit"%self.name
+ enable_link = "/vservers/%s/etc/rc.d/rc3.d/S99vinit"%self.name
+ enable_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("Initscript: %s: installed generic vinit rc script"%self.name)
+ code = file(vinit_source).read()
+ if tools.replace_file_with_string(vinit_script, code, chmod=0755):
+ logger.log("Initscript: %s: installed generic vinit rc script" % self.name)
# create symlink for runlevel 3
if not os.path.islink(enable_link):
try:
- logger.log("Initscript: %s: creating runlevel3 symlink %s"%(self.name,enable_link))
- os.symlink(enable_target,enable_link)
+ logger.log("Initscript: %s: creating runlevel3 symlink %s" % (self.name,enable_link))
+ os.symlink(enable_target, enable_link)
except:
- logger.log_exc("Initscript failed to create runlevel3 symlink %s"%enable_link,name=self.name)
+ logger.log_exc("Initscript failed to create runlevel3 symlink %s" % enable_link, name=self.name)
# very similar but with systemd unit files - we target 'multi-user' in this context
def install_and_enable_vinit_for_systemd(self):
- "suitable for systemd-based VMs"
- vinit_source="/usr/share/NodeManager/sliver-systemd/vinit.service"
- vinit_unit_file="/vservers/%s/usr/lib/systemd/system/vinit.service"%self.name
- enable_link="/vservers/%s/etc/systemd/system/multi-user.target.wants/vinit.service"%self.name
- enable_target="/usr/lib/systemd/system/vinit.service"
+ """
+ suitable for systemd-based VMs
+ """
+ vinit_source = "/usr/share/NodeManager/sliver-systemd/vinit.service"
+ vinit_unit_file = "/vservers/%s/usr/lib/systemd/system/vinit.service"%self.name
+ enable_link = "/vservers/%s/etc/systemd/system/multi-user.target.wants/vinit.service"%self.name
+ enable_target = "/usr/lib/systemd/system/vinit.service"
# install in sliver
- code=file(vinit_source).read()
- if tools.replace_file_with_string(vinit_unit_file,code,chmod=0755):
- logger.log("Initscript: %s: installed vinit.service unit file"%self.name)
+ code = file(vinit_source).read()
+ if tools.replace_file_with_string(vinit_unit_file, code, chmod=0755):
+ logger.log("Initscript: %s: installed vinit.service unit file" % self.name)
# create symlink for enabling this unit
if not os.path.islink(enable_link):
try:
- logger.log("Initscript: %s: creating enabling symlink %s"%(self.name,enable_link))
- os.symlink(enable_target,enable_link)
+ logger.log("Initscript: %s: creating enabling symlink %s" % (self.name, enable_link))
+ os.symlink(enable_target, enable_link)
except:
- logger.log_exc("Initscript failed to create enabling symlink %s"%enable_link,name=name)
+ logger.log_exc("Initscript failed to create enabling symlink %s" % enable_link,name=name)
#ln -s '/usr/lib/systemd/system/vinit.service' '/etc/systemd/system/multi-user.target.wants/vinit.service'
LOG_DATABASE = '/var/lib/nodemanager/database.txt'
# basically define 3 levels
-LOG_NONE=0
-LOG_NODE=1
-LOG_VERBOSE=2
+LOG_NONE = 0
+LOG_NODE = 1
+LOG_VERBOSE = 2
# default is to log a reasonable amount of stuff for when running on operational nodes
-LOG_LEVEL=LOG_NODE
+LOG_LEVEL = LOG_NODE
def set_level(level):
global LOG_LEVEL
try:
- assert level in [LOG_NONE,LOG_NODE,LOG_VERBOSE]
- LOG_LEVEL=level
+ assert level in [LOG_NONE, LOG_NODE, LOG_VERBOSE]
+ LOG_LEVEL = level
except:
- logger.log("Failed to set LOG_LEVEL to %s"%level)
+ logger.log("Failed to set LOG_LEVEL to %s" % level)
def verbose(msg):
- log('(v) '+msg,LOG_VERBOSE)
+ log('(v) ' + msg, LOG_VERBOSE)
-def log(msg,level=LOG_NODE):
+def log(msg, level=LOG_NODE):
"""Write <msg> to the log file if level >= current log level (default LOG_NODE)."""
- if (level > LOG_LEVEL):
+ if level > LOG_LEVEL:
return
try:
fd = os.open(LOG_FILE, os.O_WRONLY | os.O_CREAT | os.O_APPEND, 0600)
- if not msg.endswith('\n'): msg += '\n'
+ if not msg.endswith('\n'):
+ msg += '\n'
os.write(fd, '%s: %s' % (time.asctime(time.gmtime()), msg))
os.close(fd)
except OSError:
sys.stderr.write(msg)
sys.stderr.flush()
-date_width=24
-def log_exc(msg="",name=None):
+date_width = 24
+def log_exc(msg="", name=None):
"""Log traceback resulting from an exception."""
- printout=""
- if name: printout += "%s: "%name
- printout += "EXCEPTION caught <%s> \n" %msg
+ printout = ""
+ if name:
+ printout += "%s: "%name
+ printout += "EXCEPTION caught <%s> \n" % msg
for frame in traceback.format_exc().split("\n"):
- printout+=(date_width+2)*" "+"%s\n"%frame
+ printout += (date_width+2)*" " + "%s\n" % frame
log(printout)
-def log_trace(msg="",name=None):
+def log_trace(msg="", name=None):
"""Log current stack"""
- printout=""
- if name: printout += "%s: "%name
+ printout = ""
+ if name:
+ printout += "%s: " % name
printout += "LOGTRACE\n"
for frame in traceback.format_stack():
- printout += "..."+frame
+ printout += "..." + frame
log(printout)
# for some reason the various modules are still triggered even when the
# data from PLC cannot be reached
# we show this message instead of the exception stack instead in this case
-def log_missing_data (msg,key):
+def log_missing_data(msg,key):
log("%s: could not find the %s key in data (PLC connection down?) - IGNORED"%(msg,key))
-def log_data_in_file (data, file, message="",level=LOG_NODE):
- if (level > LOG_LEVEL):
+def log_data_in_file(data, file, message="",level=LOG_NODE):
+ if level > LOG_LEVEL:
return
import pprint, time
try:
except:
log_exc('logger.log_data_in_file failed - file=%s - message=%r'%(file,message))
-def log_slivers (data):
- log_data_in_file (data, LOG_SLIVERS, "raw GetSlivers")
-def log_database (db):
- log_data_in_file (db, LOG_DATABASE, "raw database")
+def log_slivers(data):
+ log_data_in_file(data, LOG_SLIVERS, "raw GetSlivers")
+def log_database(db):
+ log_data_in_file(db, LOG_DATABASE, "raw database")
#################### child processes
# avoid waiting until the process returns;
# that makes debugging of hanging children hard
class Buffer:
- def __init__ (self,message='log_call: '):
- self.buffer=''
- self.message=message
+ def __init__(self, message='log_call: '):
+ self.buffer = ''
+ self.message = message
- def add (self,c):
+ def add(self,c):
self.buffer += c
- if c=='\n': self.flush()
+ if c=='\n':
+ self.flush()
- def flush (self):
+ def flush(self):
if self.buffer:
- log (self.message + self.buffer)
- self.buffer=''
+ log(self.message + self.buffer)
+ self.buffer = ''
# time out in seconds - avoid hanging subprocesses - default is 5 minutes
-default_timeout_minutes=5
+default_timeout_minutes = 5
# returns a bool that is True when everything goes fine and the retcod is 0
-def log_call(command,timeout=default_timeout_minutes*60,poll=1):
+def log_call(command, timeout=default_timeout_minutes*60, poll=1):
message=" ".join(command)
log("log_call: running command %s" % message)
verbose("log_call: timeout=%r s" % timeout)
buffer = Buffer()
while True:
# see if anything can be read within the poll interval
- (r,w,x)=select.select([child.stdout],[],[],poll)
- if r: buffer.add(child.stdout.read(1))
+ (r, w, x) = select.select([child.stdout], [], [], poll)
+ if r:
+ buffer.add(child.stdout.read(1))
# is process over ?
- returncode=child.poll()
+ returncode = child.poll()
# yes
if returncode != None:
buffer.flush()
# child is done and return 0
if returncode == 0:
log("log_call:end command (%s) completed" % message)
- result=True
+ result = True
break
# child has failed
else:
child.terminate()
log("log_call:end terminating command (%s) - exceeded timeout %d s"%(message,timeout))
break
- except: log_exc("failed to run command %s" % message)
+ except:
+ log_exc("failed to run command %s" % message)
return result
logger.log("vsys: plugin starting up...")
def GetSlivers(data, config=None, plc=None):
- """For each sliver with the vsys attribute, set the script ACL, create the vsys directory in the slice, and restart vsys."""
+ """
+ For each sliver with the vsys attribute:
+ set the script ACL, create the vsys directory in the slice, and restart vsys
+ """
if 'slivers' not in data:
logger.log_missing_data("vsys.GetSlivers",'slivers')
# check for systemctl, use it if present
# keyword being 'start', 'stop' or 'restart'
-def handleService (keyword):
+def handleService(keyword):
if tools.has_systemctl():
logger.log("vsys: %s'ing vsys service through systemctl"%keyword)
- return logger.log_call(["systemctl", keyword, "vsys"])
+ return logger.log_call(["systemctl", keyword, "vsys"], timeout=5)
else:
logger.log("vsys: %s'ing vsys service through /etc/init.d/vsys"%keyword)
- return logger.log_call(["/etc/init.d/vsys", keyword])
-def startService(): return handleService ('start')
-def stopService(): return handleService ('stop')
-def restartService(): return handleService ('restart')
+ return logger.log_call(["/etc/init.d/vsys", keyword], timeout=5)
+
+def startService():
+ return handleService ('start')
+def stopService():
+ return handleService ('stop')
+def restartService():
+ return handleService ('restart')
def createVsysDir(sliver):
- '''Create /vsys directory in slice. Update vsys conf file.'''
+ """Create /vsys directory in slice. Update vsys conf file."""
try:
os.mkdir("/vservers/%s/vsys" % sliver)
return True
logger.log_call(command)
def start(self, delay=0):
- ''' Just start the sliver '''
+ '''Just start the sliver'''
logger.verbose('sliver_libvirt: %s start'%(self.name))
# Check if it's running to avoid throwing an exception if the
- # domain was already running, create actually means start
+ # domain was already running
if not self.is_running():
try:
+ # create actually means start
self.dom.create()
except Exception, e:
# XXX smbaker: attempt to resolve slivers that are stuck in
from account import Account
from sliver_libvirt import Sliver_Libvirt
-BTRFS_TIMEOUT=15*60
+BTRFS_TIMEOUT = 15*60
class Sliver_LXC(Sliver_Libvirt, Initscript):
"""This class wraps LXC commands"""
REF_IMG_BASE_DIR = '/vservers/.lvref'
CON_BASE_DIR = '/vservers'
- def __init__ (self, rec):
+ def __init__(self, rec):
name=rec['name']
- Sliver_Libvirt.__init__ (self,rec)
- Initscript.__init__ (self,name)
+ Sliver_Libvirt.__init__(self,rec)
+ Initscript.__init__(self,name)
- def configure (self, rec):
- Sliver_Libvirt.configure (self,rec)
+ def configure(self, rec):
+ Sliver_Libvirt.configure(self, rec)
# in case we update nodemanager..
self.install_and_enable_vinit()
# do the configure part from Initscript
- Initscript.configure(self,rec)
+ Initscript.configure(self, rec)
def start(self, delay=0):
if 'enabled' in self.rspec and self.rspec['enabled'] <= 0:
# expose .ssh for omf_friendly slivers
if 'tags' in self.rspec and 'omf_control' in self.rspec['tags']:
Account.mount_ssh_dir(self.name)
- Sliver_Libvirt.start (self, delay)
+ Sliver_Libvirt.start(self, delay)
# if a change has occured in the slice initscript, reflect this in /etc/init.d/vinit.slice
self.refresh_slice_vinit()
# compute guest arch from vref
# essentially we want x86_64 (default) or i686 here for libvirt
try:
- (x,y,arch)=vref.split('-')
+ (x, y, arch) = vref.split('-')
arch = "x86_64" if arch.find("64")>=0 else "i686"
except:
- arch='x86_64'
+ arch = 'x86_64'
# Get the type of image from vref myplc tags specified as:
# pldistro = lxc
# logger.log('sliver_lxc: %s: ERROR Could not create sliver - could not clean up empty %s'%(name,containerDir))
# return
- # Snapshot the reference image fs (assume the reference image is in its own
- # subvolume)
+ # Snapshot the reference image fs
+ # this assumes the reference image is in its own subvolume
command = ['btrfs', 'subvolume', 'snapshot', refImgDir, containerDir]
if not logger.log_call(command, timeout=BTRFS_TIMEOUT):
logger.log('sliver_lxc: ERROR Could not create BTRFS snapshot at', containerDir)
if os.path.exists(containerDir):
logger.log('sliver_lxc.destroy: ERROR could not cleanly destroy %s - giving up'%name)
- if vsys_stopped: vsysStartService()
+ if vsys_stopped:
+ vsysStartService()
git://git.onelab.eu / nodemanager.git / commitdiff