Parcourir la source

tools: don't fail qvm-template-postprocess on shutdown race condition

It may happen that shutdown timeout expires at exact time that template
has stopped.
Marek Marczykowski-Górecki il y a 5 ans
Parent
commit
b359f9ca5e
1 fichiers modifiés avec 4 ajouts et 1 suppressions
  1. 4 1
      qubesadmin/tools/qvm_template_postprocess.py

+ 4 - 1
qubesadmin/tools/qvm_template_postprocess.py

@@ -185,7 +185,10 @@ def call_postinstall_service(vm):
                 yield from asyncio.sleep(1)
                 timeout -= 1
             if not vm.is_halted():
-                vm.kill()
+                try:
+                    vm.kill()
+                except qubesadmin.exc.QubesVMNotStartedError:
+                    pass
     finally:
         vm.netvm = qubesadmin.DEFAULT