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

vm: add domain-shutdown-failed event

Browse Source 
Similar to domain-start-failed, add an event fired when
domain-pre-shutdown was fired but the actual operation failed.
Note it might not catch all the cases, as shutdown() may be called with
wait=False, which means it won't wait fot the actual shutdown. In that
case, timeout won't result in domain-shutdown-failed event.

QubesOS/qubes-issues#5380
This commit is contained in:
Marek Marczykowski-Górecki 2019-10-08 23:35:24 +02:00
parent 0300e895f2
commit 51af2ed27c
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
qubes/vm/qubesvm.py
View File

@ -303,6 +303,19 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
:param event: Event name (``'domain-pre-shutdown'``) :param event: Event name (``'domain-pre-shutdown'``)
:param force: If the shutdown is to be forceful :param force: If the shutdown is to be forceful
.. event:: domain-shutdown-failed (subject, event, reason)
Fired when ``domain-pre-shutdown`` event was sent, but the actual
shutdown operation failed. It can be caused by other
``domain-pre-shutdown`` handler blocking the operation with an
exception, or a shutdown timeout.
Handler for this event can be asynchronous (a coroutine).
:param subject: Event emitter (the qube object)
:param event: Event name (``'domain-shutdown-failed'``)
:param reason: Error message
.. event:: domain-cmd-pre-run (subject, event, start_guid) .. event:: domain-cmd-pre-run (subject, event, start_guid)
Fired at the beginning of :py:meth:`run_service` method. Fired at the beginning of :py:meth:`run_service` method.
@ -1178,23 +1191,28 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
if self.is_halted(): if self.is_halted():
raise qubes.exc.QubesVMNotStartedError(self) raise qubes.exc.QubesVMNotStartedError(self)
yield from self.fire_event_async('domain-pre-shutdown', pre_event=True, try:
force=force) yield from self.fire_event_async('domain-pre-shutdown',
pre_event=True, force=force)
self.libvirt_domain.shutdown() self.libvirt_domain.shutdown()
if wait: if wait:
if timeout is None: if timeout is None:
timeout = self.shutdown_timeout timeout = self.shutdown_timeout
while timeout > 0 and not self.is_halted(): while timeout > 0 and not self.is_halted():
yield from asyncio.sleep(0.25) yield from asyncio.sleep(0.25)
timeout -= 0.25 timeout -= 0.25
with (yield from self.startup_lock): with (yield from self.startup_lock):
if self.is_halted(): if self.is_halted():
# make sure all shutdown tasks are completed # make sure all shutdown tasks are completed
yield from self._ensure_shutdown_handled() yield from self._ensure_shutdown_handled()
else: else:
raise qubes.exc.QubesVMShutdownTimeoutError(self) raise qubes.exc.QubesVMShutdownTimeoutError(self)
except Exception as ex:
yield from self.fire_event_async('domain-shutdown-failed',
reason=str(ex))
raise
return self return self