# vsys probably should not be a plugin
# the thing is, the right way to handle stuff would be that
# if slivers get created by doing a,b,c
-# then they sohuld be delted by doing c,b,a
+# then they should be deleted by doing c,b,a
# the current ordering model for vsys plugins completely fails to capture that
from plugins.vsys import removeSliverFromVsys, startService as vsysStartService
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):
+ logger.log('========== sliver_lxc.configure {}'.format(self.name))
+ 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)
+ # remember configure() always gets called *before* start()
+ # in particular the slice initscript
+ # is expected to be in place already at this point
def start(self, delay=0):
+ logger.log('==================== sliver_lxc.start {}'.format(self.name))
if 'enabled' in self.rspec and self.rspec['enabled'] <= 0:
logger.log('sliver_lxc: not starting %s, is not enabled'%self.name)
return
# 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()
- def rerun_slice_vinit (self):
- """This is called whenever the initscript code changes"""
- # xxx - todo - not sure exactly how to:
- # (.) invoke something in the guest
- # (.) which options of systemctl should be used to trigger a restart
- # should not prevent the first run from going fine hopefully
- logger.log("WARNING: sliver_lxc.rerun_slice_vinit not implemented yet")
-
+ def rerun_slice_vinit(self):
+ """This is called at startup, and whenever the initscript code changes"""
+ logger.log("sliver_lxc.rerun_slice_vinit {}".format(self.name))
+ plain = "virsh -c lxc:/// lxc-enter-namespace --noseclabel -- {} /usr/bin/systemctl --system daemon-reload"\
+ .format(self.name)
+ command = plain.split()
+ logger.log_call(command, timeout=3)
+ plain = "virsh -c lxc:/// lxc-enter-namespace --noseclabel -- {} /usr/bin/systemctl restart vinit.service"\
+ .format(self.name)
+ command = plain.split()
+ logger.log_call(command, timeout=3)
+
+
@staticmethod
def create(name, rec=None):
- ''' Create dirs, copy fs image, lxc_create '''
- logger.verbose ('sliver_lxc: %s create'%(name))
+ '''
+ Create dirs, copy fs image, lxc_create
+ '''
+ logger.verbose('sliver_lxc: %s create' % name)
conn = Sliver_Libvirt.getConnection(Sliver_LXC.TYPE)
+ vref = rec['vref']
+ if vref is None:
+ vref = "lxc-f18-x86_64"
+ logger.log("sliver_libvirt: %s: WARNING - no vref attached, using hard-wired default %s" % (name,vref))
+
+ # compute guest arch from vref
+ # essentially we want x86_64 (default) or i686 here for libvirt
+ try:
+ (x, y, arch) = vref.split('-')
+ arch = "x86_64" if arch.find("64")>=0 else "i686"
+ except:
+ arch = 'x86_64'
+
# Get the type of image from vref myplc tags specified as:
# pldistro = lxc
# fcdistro = squeeze
if arch == 'i386':
arch = 'i686'
- vref = rec['vref']
- if vref is None:
- vref = "lxc-f18-x86_64"
- logger.log("sliver_libvirt: %s: WARNING - no vref attached, using hard-wired default %s" % (name,vref))
+
+
refImgDir = os.path.join(Sliver_LXC.REF_IMG_BASE_DIR, vref)
containerDir = os.path.join(Sliver_LXC.CON_BASE_DIR, name)
# # if /vservers/foo does not exist, it creates /vservers/foo
# # but if it does exist, then it creates /vservers/foo/image !!
# # so we need to check the expected container rootfs does not exist yet
-# # this hopefully could be removed in a future release
+# # this hopefully could be removed in a future release
# if os.path.exists (containerDir):
# logger.log("sliver_lxc: %s: WARNING cleaning up pre-existing %s"%(name,containerDir))
# command = ['btrfs', 'subvolume', 'delete', containerDir]
# 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)
logger.log_exc("exception while updating /etc/sudoers")
# customizations for the user environment - root or slice uid
- # we save the whole business in /etc/planetlab.profile
+ # we save the whole business in /etc/planetlab.profile
# and source this file for both root and the slice uid's .profile
# prompt for slice owner, + LD_PRELOAD for transparently wrap bind
pl_profile=os.path.join(containerDir,"etc/planetlab.profile")
# if dir is not yet existing let's forget it for now
if not os.path.isdir(os.path.dirname(from_root)): continue
found=False
- try:
+ try:
contents=file(from_root).readlines()
for content in contents:
if content==enforced_line: found=True
command = ['/usr/sbin/userdel', '-f', '-r', name]
logger.log_call(command)
+ # Remove rootfs of destroyed domain
+ command = ['/usr/bin/rm', '-rf', containerDir]
+ logger.log_call(command, timeout=BTRFS_TIMEOUT)
+
+ # ???
+ logger.log("-TMP-ls-l %s"%name)
+ command = ['ls', '-lR', containerDir]
+ logger.log_call(command)
+ logger.log("-TMP-vsys-status")
+ command = ['/usr/bin/systemctl', 'status', 'vsys']
+ logger.log_call(command)
+ # ???
+
# Remove rootfs of destroyed domain
command = ['btrfs', 'subvolume', 'delete', containerDir]
logger.log_call(command, timeout=BTRFS_TIMEOUT)
-
+
# For some reason I am seeing this :
#log_call: running command btrfs subvolume delete /vservers/inri_sl1
#log_call: ERROR: cannot delete '/vservers/inri_sl1' - Device or resource busy
#command=['lsof']
#logger.log_call(command)
logger.log("-TMP-ls-l %s"%name)
- command = ['ls', '-l', containerDir]
+ command = ['ls', '-lR', containerDir]
+ logger.log_call(command)
+ logger.log("-TMP-lsof")
+ command = ['lsof']
logger.log_call(command)
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 / blobdiff