On February 10, 2026 12:15 pm, Dominik Csapak wrote: > When qmeventd detects a vm exiting, it starts 'qm cleanup' to cleanup > files, executing hookscripts, etc. > > Since the vm process exits is sometimes not instant, wait up to 30 > seconds here to start the cleanup process instead of immediately > aborting if the pid still exits. This prevented executing the hookscript > on the 'post-stop' phase. > > This can be easily reproduced by e.g. passing through a usb device, > which delays the qemu process exit for a few seconds. > > Signed-off-by: Dominik Csapak <[email protected]> > --- > changes from v1: > * use correct while condition (time() is always >= $starttime) > > original comment: > > The 30 second timeout was arbitrarily chosen, but we could probably > start with something smaller, like 10 seconds? Could be adapted on > applying though. > > In my (short) tests the usb passthrough part only adds a single second, > but i can imagine different devices on other systems could block it for > much longer. > > src/PVE/CLI/qm.pm | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/src/PVE/CLI/qm.pm b/src/PVE/CLI/qm.pm > index bdae9641..16875ed2 100755 > --- a/src/PVE/CLI/qm.pm > +++ b/src/PVE/CLI/qm.pm > @@ -1101,8 +1101,19 @@ __PACKAGE__->register_method({ > 60, > sub { > my $conf = PVE::QemuConfig->load_config($vmid); > + > + # wait for some timeout until vm process exits, since this > might not be instant > + my $timeout = 30; > + my $starttime = time(); > my $pid = PVE::QemuServer::check_running($vmid); > - die "vm still running\n" if $pid; > + warn "vm still running - waiting up to $timeout seconds\n" > if $pid; > + > + while ($pid && (time() - $starttime) < $timeout) { > + sleep(1); > + $pid = PVE::QemuServer::check_running($vmid);
nit: this helper is deprecated - and this call here is only running in the context of "guest is local", we already obtained the lock and loaded the config, so we know that invariant holds, so this new code (and the old line above) can just use PVE::QemuServer::Helpers::vm_running_locally instead.. > + } > + > + die "vm still running - aborting cleanup\n" if $pid; > > # Rollback already does cleanup when preparing and > afterwards temporarily drops the > # lock on the configuration file to rollback the volumes. > Deactivating volumes here > -- > 2.47.3 > > > > > >
