9:26 a.m.
See patches for details (duh!).
Martin Kletzander (2):
Remove Before=libvirt-guests.service from other services
docs: Remind users to remove --timeout option without socket
activation
docs/manpages/libvirtd.rst | 3 +++
src/ch/virtchd.service.in | 1 -
src/lxc/virtlxcd.service.in | 1 -
src/qemu/virtqemud.service.in | 1 -
src/remote/libvirtd.service.in | 1 -
5 files changed, 3 insertions(+), 4 deletions(-)
--
2.38.1
9:26 a.m.
New subject: [PATCH for 8.9.0 1/2] Remove Before=libvirt-guests.service from other services
libvirt-guests has After= dependency for all the sockets and that is enough.
With the extra Before= in the service file systemd postpones the start of the
socket activated service (when libvirt-guests is trying to connect to the
socket) until after libvirt-guests is stopped effectively making `systemctl stop
libvirt-guests` deadlock. The reason for that is that all stop jobs are
scheduled before any start job. Removing the redundant Before= specification
fixes this behaviour.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1964855
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
src/ch/virtchd.service.in | 1 -
src/lxc/virtlxcd.service.in | 1 -
src/qemu/virtqemud.service.in | 1 -
src/remote/libvirtd.service.in | 1 -
4 files changed, 4 deletions(-)
diff --git a/src/ch/virtchd.service.in b/src/ch/virtchd.service.in
index f53a12ea056c..8c22b02c9e70 100644
--- a/src/ch/virtchd.service.in
+++ b/src/ch/virtchd.service.in
@@ -5,7 +5,6 @@ Requires=virtchd.socket
Requires=virtchd-ro.socket
Requires=virtchd-admin.socket
Wants=systemd-machined.service
-Before=libvirt-guests.service
After=network.target
After=dbus.service
After=apparmor.service
diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in
index 334c34db4413..9946db946219 100644
--- a/src/lxc/virtlxcd.service.in
+++ b/src/lxc/virtlxcd.service.in
@@ -5,7 +5,6 @@ Requires=virtlxcd.socket
Requires=virtlxcd-ro.socket
Requires=virtlxcd-admin.socket
Wants=systemd-machined.service
-Before=libvirt-guests.service
After=network.target
After=dbus.service
After=apparmor.service
diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in
index 5ad968ace92a..9ae3f01fa099 100644
--- a/src/qemu/virtqemud.service.in
+++ b/src/qemu/virtqemud.service.in
@@ -7,7 +7,6 @@ Requires=virtqemud.socket
Requires=virtqemud-ro.socket
Requires=virtqemud-admin.socket
Wants=systemd-machined.service
-Before=libvirt-guests.service
After=network.target
After=dbus.service
After=apparmor.service
diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
index 5d4d412fccb8..954df5d1e5cc 100644
--- a/src/remote/libvirtd.service.in
+++ b/src/remote/libvirtd.service.in
@@ -9,7 +9,6 @@ Wants=libvirtd.socket
Wants=libvirtd-ro.socket
Wants=libvirtd-admin.socket
Wants=systemd-machined.service
-Before=libvirt-guests.service
After=network.target
After=firewalld.service
After=iptables.service
--
2.38.1
9:26 a.m.
New subject: [PATCH for 8.9.0 2/2] docs: Remind users to remove --timeout option without socket activation
There is part of our man page that describes how to switch to the
traditional (non-socket) activation but it might still happens sometimes that
there is an extra --timeout option specified for the daemon.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
docs/manpages/libvirtd.rst | 3 +++
1 file changed, 3 insertions(+)
diff --git a/docs/manpages/libvirtd.rst b/docs/manpages/libvirtd.rst
index 1347b9b21042..9a9324ffc2d6 100644
--- a/docs/manpages/libvirtd.rst
+++ b/docs/manpages/libvirtd.rst
@@ -79,6 +79,9 @@ unit files must be masked:
$ systemctl mask libvirtd.socket libvirtd-ro.socket \
libvirtd-admin.socket libvirtd-tls.socket libvirtd-tcp.socket
+On top of that make sure that the --timeout argument is not used for the daemon
+since it would not be started upon any later connection.
+
If using libvirt-guests service then the ordering for that service needs to be
adapted so that it is ordered after the service unit instead of the socket unit.
Since dependencies and ordering cannot be changed with drop-in overrides, the
--
2.38.1
8:44 a.m.
On 10/26/22 16:26, Martin Kletzander wrote:
See patches for details (duh!).
Martin Kletzander (2):
Remove Before=libvirt-guests.service from other services
docs: Remind users to remove --timeout option without socket
activation
docs/manpages/libvirtd.rst | 3 +++
src/ch/virtchd.service.in | 1 -
src/lxc/virtlxcd.service.in | 1 -
src/qemu/virtqemud.service.in | 1 -
src/remote/libvirtd.service.in | 1 -
5 files changed, 3 insertions(+), 4 deletions(-)
Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com>
Michal
793
days inactive
794
days old
3 comments
2 participants
participants (2)
-
Martin Kletzander -
Michal Prívozník