From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: Re: [PATCH] tools/hotplug: update systemd dependency to use service instead of socket Date: Tue, 2 Dec 2014 13:42:40 -0500 Message-ID: <20141202184240.GI32385@laptop.dumpdata.com> References: <1417534763-25053-1-git-send-email-olaf@aepfle.de> <1417535095.29004.4.camel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <1417535095.29004.4.camel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Campbell , m.a.young@durham.ac.uk Cc: Ian Jackson , Olaf Hering , Stefano Stabellini , Wei Liu , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org On Tue, Dec 02, 2014 at 03:44:55PM +0000, Ian Campbell wrote: > On Tue, 2014-12-02 at 16:39 +0100, Olaf Hering wrote: > > Since commit 4542ae340d75bd6319e3fcd94e6c9336e210aeef ("tools/hotplug: > > systemd xenstored dependencies") all service files use the .socket unit > > as startup dependency. While this happens to work for boot it fails for > > shutdown because a .socket does not seem to enforce ordering. When > > xendomains.service runs during shutdown then systemd will stop > > xenstored.service at the same time. > > > > Change all "xenstored.socket" to "xenstored.service" to let systemd know > > that xenstored has to be shutdown after everything else. > > > > Reported-by: Mark Pryor > > Signed-off-by: Olaf Hering > > Cc: Ian Jackson > > Cc: Stefano Stabellini > > Acked-by: Ian Campbell > > > Cc: Wei Liu > > --- > > > > This should go into 4.5 to fix xendomains.service. > > CCing Konrad... CC-ing Michael. Michael, since Fedora is using systemd, did you observe this bug as well? (I think I did, but I might have blamed it on my wacky setup). > > > > > tools/hotplug/Linux/systemd/xen-init-dom0.service.in | 4 ++-- > > tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in | 4 ++-- > > tools/hotplug/Linux/systemd/xenconsoled.service.in | 4 ++-- > > tools/hotplug/Linux/systemd/xendomains.service.in | 4 ++-- > > 4 files changed, 8 insertions(+), 8 deletions(-) > > > > diff --git a/tools/hotplug/Linux/systemd/xen-init-dom0.service.in b/tools/hotplug/Linux/systemd/xen-init-dom0.service.in > > index 4d4cb23..3befadc 100644 > > --- a/tools/hotplug/Linux/systemd/xen-init-dom0.service.in > > +++ b/tools/hotplug/Linux/systemd/xen-init-dom0.service.in > > @@ -1,7 +1,7 @@ > > [Unit] > > Description=xen-init-dom0, initialise Dom0 configuration (xenstore nodes, JSON configuration stub) > > -Requires=xenstored.socket proc-xen.mount > > -After=xenstored.socket proc-xen.mount > > +Requires=xenstored.service proc-xen.mount > > +After=xenstored.service proc-xen.mount > > ConditionPathExists=/proc/xen/capabilities > > > > [Service] > > diff --git a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in > > index 6b9c96e..0a5807a 100644 > > --- a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in > > +++ b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in > > @@ -1,7 +1,7 @@ > > [Unit] > > Description=qemu for xen dom0 disk backend > > -Requires=proc-xen.mount xenstored.socket > > -After=proc-xen.mount xenstored.socket xenconsoled.service > > +Requires=proc-xen.mount xenstored.service > > +After=proc-xen.mount xenstored.service xenconsoled.service > > Before=xendomains.service libvirtd.service libvirt-guests.service > > RefuseManualStop=true > > ConditionPathExists=/proc/xen/capabilities > > diff --git a/tools/hotplug/Linux/systemd/xenconsoled.service.in b/tools/hotplug/Linux/systemd/xenconsoled.service.in > > index 2c5d99f..cb44cd6 100644 > > --- a/tools/hotplug/Linux/systemd/xenconsoled.service.in > > +++ b/tools/hotplug/Linux/systemd/xenconsoled.service.in > > @@ -1,7 +1,7 @@ > > [Unit] > > Description=Xenconsoled - handles logging from guest consoles and hypervisor > > -Requires=proc-xen.mount xenstored.socket > > -After=proc-xen.mount xenstored.socket > > +Requires=proc-xen.mount xenstored.service > > +After=proc-xen.mount xenstored.service > > ConditionPathExists=/proc/xen/capabilities > > > > [Service] > > diff --git a/tools/hotplug/Linux/systemd/xendomains.service.in b/tools/hotplug/Linux/systemd/xendomains.service.in > > index 757278f..9962671 100644 > > --- a/tools/hotplug/Linux/systemd/xendomains.service.in > > +++ b/tools/hotplug/Linux/systemd/xendomains.service.in > > @@ -1,7 +1,7 @@ > > [Unit] > > Description=Xendomains - start and stop guests on boot and shutdown > > -Requires=proc-xen.mount xenstored.socket > > -After=proc-xen.mount xenstored.socket xenconsoled.service xen-init-dom0.service > > +Requires=proc-xen.mount xenstored.service > > +After=proc-xen.mount xenstored.service xenconsoled.service xen-init-dom0.service > > ConditionPathExists=/proc/xen/capabilities > > > > [Service] > > > > _______________________________________________ > > Xen-devel mailing list > > Xen-devel@lists.xen.org > > http://lists.xen.org/xen-devel > >