X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_lxc.py;h=c3b098ec274a148b9b65084cd3a8008ada690c69;hb=1eedef030a69d44239eec697c978134af81ed5ba;hp=7db1a78c1b95b4a7e4511d3fee8ec1805e1f8eb4;hpb=a41a6c333955a30682573be315561be0030abcaf;p=nodemanager.git

diff --git a/sliver_lxc.py b/sliver_lxc.py
index 7db1a78..c3b098e 100644
--- a/sliver_lxc.py
+++ b/sliver_lxc.py
@@ -15,7 +15,7 @@ from string import Template
 # if slivers get created by doing a,b,c
 # then they sohuld be delted by doing c,b,a
 # the current ordering model for vsys plugins completely fails to capture that
-from plugins.vsys import removeSliverFromVsys
+from plugins.vsys import removeSliverFromVsys, startService as vsysStartService
 
 import libvirt
 
@@ -286,34 +286,58 @@ unset pathmunge
             # Destroy libvirt domain
             dom = conn.lookupByName(name)
         except:
-            logger.verbose('sliver_lxc: Domain %s does not exist!' % name)
+            logger.verbose('sliver_lxc.destroy: Domain %s does not exist!' % name)
+            return
+
+        # Slivers with vsys running will fail the subvolume delete
+        # removeSliverFromVsys return True if it stops vsys, telling us to start it again later
+        vsys_stopped = removeSliverFromVsys (name)
 
         try:
+            logger.log("sliver_lxc.destroy: destroying domain %s"%name)
             dom.destroy()
         except:
-            logger.verbose('sliver_lxc: Domain %s not running... continuing.' % name)
+            logger.verbose('sliver_lxc.destroy: Domain %s not running... continuing.' % name)
 
         try:
+            logger.log("sliver_lxc.destroy: undefining domain %s"%name)
             dom.undefine()
         except:
-            logger.verbose('sliver_lxc: Domain %s is not defined... continuing.' % name)
+            logger.verbose('sliver_lxc.destroy: Domain %s is not defined... continuing.' % name)
 
         # Remove user after destroy domain to force logout
         command = ['/usr/sbin/userdel', '-f', '-r', name]
         logger.log_call(command, timeout=15*60)
 
-        # Slivers with vsys running will fail the subvolume delete.
-        # A more permanent solution may be to ensure that the vsys module
-        # is called before the sliver is destroyed.
-        removeSliverFromVsys (name)
-
+        # clean up rootfs as userdel will only take care of /home/<slicename>
+        command = ['rm','-rf', containerDir]
+        logger.log_call(command, timeout=60)
+        # at this point we sometimes see one subvolume left in /vservers/<slicename>/vrefname
+        command = ['btrfs', 'subvolume', 'delete', "%s/*"%containerDir ]
+        logger.log_call(command, timeout=10)
         # Remove rootfs of destroyed domain
         command = ['btrfs', 'subvolume', 'delete', containerDir]
-        logger.log_call(command, timeout=60)
-
-        if os.path.exists(containerDir):
-           # oh no, it's still here...
-           logger.log("WARNING: failed to destroy container %s" % containerDir)
-
-        logger.verbose('sliver_libvirt: %s destroyed.'%name)
+        logger.log_call(command, timeout=10)
 
+        if not os.path.exists(containerDir):
+            logger.log('sliver_lxc.destroy: %s cleanly destroyed.'%name)
+        else:
+            # oh no, it's still here...
+            # this is more of a way to try and understand what is going on here
+            # than a real solution to anything
+            pass_no=1
+            max_passes=2
+            while pass_no <= max_passes:
+                command = ['rm', '-rf', containerDir]
+                logger.log("sliver_lxc.destroy: cleanup pass %d - command %s"%(pass_no,command))
+                logger.log_call(command, timeout=5)
+                command = ['btrfs', 'subvolume', 'delete', containerDir]
+                logger.log("sliver_lxc.destroy: cleanup pass %d - command %s"%(pass_no,command))
+                logger.log_call(command, timeout=5)
+                import time
+                time.sleep(1)
+                pass_no += 1
+            if os.path.exists(containerDir):
+                logger.log('sliver_lxc.destroy: could not cleanly destroy %s - giving up'%name)
+
+        if vsys_stopped: vsysStartService()