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

vm/dispvm: fix DispVM cleanup

Browse Source 
First unregister the domain from collection, and only then call
remove_from_disk(). Removing it from collection prevent further calls
being made to it. Or if anything else keep a reference to it (for
example as a netvm), then abort the operation.

Additionally this makes it unnecessary to take startup lock when
cleaning it up in tests.
This commit is contained in:
Marek Marczykowski-Górecki 2018-10-21 04:44:47 +02:00
parent e1f65bdf7b
commit 5be003d539
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qubes/tests/__init__.py
View File

@ -789,13 +789,6 @@ class SystemTestCase(QubesTestCase):
vmname = vm.name vmname = vm.name
app = vm.app app = vm.app
# avoid race with DispVM.auto_cleanup=True
try:
self.loop.run_until_complete(
asyncio.wait_for(vm.startup_lock.acquire(), 10))
except asyncio.TimeoutError:
pass
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():

4
qubes/vm/dispvm.py
View File

@ -142,8 +142,8 @@ class DispVM(qubes.vm.qubesvm.QubesVM):
def _auto_cleanup(self): def _auto_cleanup(self):
'''Do auto cleanup if enabled''' '''Do auto cleanup if enabled'''
if self.auto_cleanup and self in self.app.domains: if self.auto_cleanup and self in self.app.domains:
yield from self.remove_from_disk()
del self.app.domains[self] del self.app.domains[self]
yield from self.remove_from_disk()
self.app.save() self.app.save()
@classmethod @classmethod
@ -193,8 +193,8 @@ class DispVM(qubes.vm.qubesvm.QubesVM):
pass pass
# if auto_cleanup is set, this will be done automatically # if auto_cleanup is set, this will be done automatically
if not self.auto_cleanup: if not self.auto_cleanup:
yield from self.remove_from_disk()
del self.app.domains[self] del self.app.domains[self]
yield from self.remove_from_disk()
self.app.save() self.app.save()
@asyncio.coroutine @asyncio.coroutine