Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: remove VM under startup_lock

Browse Source 
Prevent starting a VM while it's being removed. Something could try to
start a VM just after it's being killer but before removing it (Whonix
example from previous commit is real-life case). The window specifically
is between kill() call and removing it from collection
(`del app.domains[vm.qid]`). Grab a startup_lock for the whole operation
to prevent it.
This commit is contained in:
Marek Marczykowski-Górecki 2019-09-29 06:03:00 +02:00
parent 732231efb0
commit e0e0c7eaf9
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
qubes/tests/__init__.py
View File

@ -822,15 +822,16 @@ class SystemTestCase(QubesTestCase):
vmname = vm.name vmname = vm.name
app = vm.app app = vm.app
try:
del app.domains[vm.qid]
except KeyError:
pass
try: try:
self.loop.run_until_complete(vm.remove_from_disk()) self.loop.run_until_complete(vm.remove_from_disk())
except: # pylint: disable=bare-except except: # pylint: disable=bare-except
pass pass
try:
del app.domains[vm.qid]
except KeyError:
pass
vm.close() vm.close()
del vm del vm
@ -914,12 +915,18 @@ class SystemTestCase(QubesTestCase):
except: except:
pass pass
locked_vms = set()
# first take startup lock
for vm in vms:
self.loop.run_until_complete(vm.startup_lock.acquire())
locked_vms.add(vm)
# first kill all the domains, to avoid side effects of changing netvm # first kill all the domains, to avoid side effects of changing netvm
for vm in vms: for vm in vms:
try: try:
# XXX .is_running() may throw libvirtError if undefined # XXX .is_running() may throw libvirtError if undefined
if vm.is_running(): if vm.is_running():
self.loop.run_until_complete(vm.kill()) self.loop.run_until_complete(vm._kill_locked())
except: # pylint: disable=bare-except except: # pylint: disable=bare-except
pass pass
# break dependencies # break dependencies
@ -950,6 +957,11 @@ class SystemTestCase(QubesTestCase):
continue continue
self._remove_vm_qubes(vm) self._remove_vm_qubes(vm)
# release startup_lock, if anything was waiting at vm.start(),
# it will detect the VM is gone
for vm in locked_vms:
vm.startup_lock.release()
def remove_test_vms(self, xmlpath=XMLPATH, prefix=VMPREFIX): def remove_test_vms(self, xmlpath=XMLPATH, prefix=VMPREFIX):
'''Aggressively remove any domain that has name in testing namespace. '''Aggressively remove any domain that has name in testing namespace.