[molecule.specs] always make sure to kill processes running inside chroots if failing

2011-07-21 13:56:03 +02:00
parent 5e3dbe32bc
commit 0816ea2ed6
3 changed files with 57 additions and 18 deletions
@@ -73,11 +73,19 @@ class BuiltinHandlerMixin:
        if not dest_exec.startswith("/"):
            dest_exec = "/%s" % (dest_exec,)

-        rc = molecule.utils.exec_chroot_cmd([dest_exec] + exec_script[1:],
-            dest_chroot, pre_chroot = self.metadata.get('prechroot', []))
-        os.remove(tmp_exec)
+        rc = 0
+        try:
+            rc = molecule.utils.exec_chroot_cmd([dest_exec] + exec_script[1:],
+                dest_chroot, pre_chroot = self.metadata.get('prechroot', []))
+        except:
+            # kill all the pids inside chroot, no matter what just happened
+            molecule.utils.kill_chroot_pids(dest_chroot, sleep = True)
+            raise
+        finally:
+            os.remove(tmp_exec)

        if rc != 0:
+            molecule.utils.kill_chroot_pids(dest_chroot, sleep = True)
            self._output.output("[%s|%s] %s: %s" % (
                    blue("BuiltinHandler"), darkred(self.spec_name),
                    _("inner chroot hook failed"), rc,