Fixes bug #7092 as well as a regression [0] in combination with HA
shutdown policy 'migrate' caused by commit 1f2c5146 ("migrate: remove
left-over dbus-vmstate instance when migrating without conntrack
state"). Currently, the HA migrations do not migrate the conntrack
state and before this patch, the dbus.service is stopped too early
during shutdown, before the LRM migrations. This led to failure when
trying to check for a left-over dbus-vmstate instance, because
the Net::DBus->system() call would fail.It is not enough to record the After=dbus.service dependency, because systemd would already stop the vmid.scope even while processes in it are still running. Add a Before=pve-ha-lrm.service and for consistency Before=pve-guests.service to record the ordering on shutdown. This ensures that the scope units are still around until the LRM or guests service had the chance to stop, and usually, handle the remaining running guests itself. Also guard more errors in qemu_del_dbus_vmstate(). Many thanks to Maximiliano and Fabian for discussing the issue and solutions! [0]: https://forum.proxmox.com/threads/169739/post-825256 Dependency bump qemu-server -> libpve-common-perl needed! common: Fiona Ebner (1): systemd: enter scope: allow specifying 'Before' and 'After' properties src/PVE/Systemd.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) qemu-server: Fiona Ebner (2): systemd: vmid.scope: add orderings to fix dbus-vmstate cleanup (regression) dbus-vmstate: guard more errors in qemu_del_dbus_vmstate() src/PVE/QemuServer.pm | 4 ++++ src/PVE/QemuServer/DBusVMState.pm | 15 +++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) Summary over all repositories: 3 files changed, 18 insertions(+), 3 deletions(-) -- Generated by git-murpp 0.5.0 _______________________________________________ pve-devel mailing list [email protected] https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
