[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/master] 2 commits: systemd: start, but do not restart libvirt-guests.service

[Andrea Bolognani]

Andrea Bolognani pushed to branch debian/master at Libvirt Packaging Team / libvirt


Commits:
295944dc by Christian Ehrhardt at 2021-02-08T15:21:41+01:00
systemd: start, but do not restart libvirt-guests.service

Due to various changes libvirt-guests.service is no more started at all.
This all started when trying to not restart it on upgrades which we
now do properly for LIBVIRT_SYSTEM_SERVICES, so move libvirt-guests.service
to this group.

Not doing so would stop and start VMs on package upgrades.

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>

- - - - -
ddbad4b4 by Christian Ehrhardt at 2021-02-08T15:30:21+01:00
systemd: do not restart sockets

Sockets need to be started on install to be ready (drop --no-start), but not
stopped/restarted (add --no-stop-on-upgrade, drop --no-restart-after-upgrade)
later on to prevent issues on upgrade (on running services) or reinstall
(breaking the .sockets state)

Details:
- drop --no-start:
   .socket removed without being stopped will enter a faulty state that can only
   be recovered with a restart of the socket. We restart the service (libvirtd)
   backing the sockets anyway, the sockets can and should stay up as-is.
- drop --no-restart-after-upgrade:
   `--no-restart-after-upgrade` does not prevent restarts. It only controls
   when the restart happens, but we want no restart at-all so drop it.
- add --no-stop-on-upgrade:
   This needs to be added to not touch the .sockets state at all on
   upgrades.

LIBVIRT_NOSTART_UNITS nowadays only includes SOCKETS and their handling is
rather special, so this changes the name to LIBVIRT_SOCKETS to be more obvious
when touching d/rules

Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>

- - - - -


1 changed file:

- debian/rules


Changes:

=====================================
debian/rules
=====================================
@@ -139,13 +139,14 @@ DEB_CONFIGURE_EXTRA_ARGS := \
     -Dwireshark_dissector=enabled \
     $(NULL)
 
+# Those have to stay up through upgrades to avoid interruptions
 LIBVIRT_SYSTEM_SERVICES = \
     virtlogd.service \
     virtlockd.service \
+    libvirt-guests.service \
     $(NULL)
 
-LIBVIRT_NOSTART_UNITS = \
-    libvirt-guests.service \
+LIBVIRT_SOCKETS = \
     libvirtd.socket \
     libvirtd-ro.socket \
     libvirtd-admin.socket \
@@ -269,7 +270,7 @@ override_dh_installinit:
 override_dh_installsystemd:
 	dh_installsystemd -p libvirt-daemon-system --no-also --restart-after-upgrade libvirtd.service
 	dh_installsystemd -p libvirt-daemon-system --no-also --no-stop-on-upgrade $(LIBVIRT_SYSTEM_SERVICES)
-	dh_installsystemd -p libvirt-daemon-system --no-also --no-restart-after-upgrade --no-start $(LIBVIRT_NOSTART_UNITS)
+	dh_installsystemd -p libvirt-daemon-system --no-also --no-stop-on-upgrade $(LIBVIRT_SOCKETS)
 
 override_dh_installdocs:
 	dh_installdocs -plibvirt-doc --doc-main-package libvirt-doc



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/3cbe8f96627cd470445918f3c2bcd082b835173f...ddbad4b495d5ac36d3bd0ce831a3a1932fa9a899

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/3cbe8f96627cd470445918f3c2bcd082b835173f...ddbad4b495d5ac36d3bd0ce831a3a1932fa9a899
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20210210/4d55b47a/attachment.html>