diff mbox series

[5/6] multipathd: Fix multipathd stopping on shutdown

Message ID 1608332802-9720-6-git-send-email-bmarzins@redhat.com (mailing list archive)
State Not Applicable, archived
Delegated to: christophe varoqui
Headers show
Series More misc multipath patches | expand

Commit Message

Benjamin Marzinski Dec. 18, 2020, 11:06 p.m. UTC
According to man "systemd.special"

"shutdown.target: ... Services that shall be terminated on system
shutdown shall add Conflicts= and Before= dependencies to this unit for
their service unit, which is implicitly done when
DefaultDependencies=yes is set (the default)."

multipathd.service sets DefaultDependencies=no and includes the
Conflits= dependency, but not the Before= one. This can cause multipathd
to continue running past when it is supposed to during shutdown.

Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
---
 multipathd/multipathd.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Martin Wilck Dec. 18, 2020, 11:31 p.m. UTC | #1
On Fri, 2020-12-18 at 17:06 -0600, Benjamin Marzinski wrote:
> According to man "systemd.special"
> 
> "shutdown.target: ... Services that shall be terminated on system
> shutdown shall add Conflicts= and Before= dependencies to this unit
> for
> their service unit, which is implicitly done when
> DefaultDependencies=yes is set (the default)."
> 
> multipathd.service sets DefaultDependencies=no and includes the
> Conflits= dependency, but not the Before= one. This can cause
> multipathd
> to continue running past when it is supposed to during shutdown.
> 
> Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>

Reviewed-by: Martin Wilck <mwilck@suse.com>
Benjamin Marzinski Jan. 27, 2021, 1:16 a.m. UTC | #2
On Fri, Dec 18, 2020 at 11:31:25PM +0000, Martin Wilck wrote:
> On Fri, 2020-12-18 at 17:06 -0600, Benjamin Marzinski wrote:
> > According to man "systemd.special"
> > 
> > "shutdown.target: ... Services that shall be terminated on system
> > shutdown shall add Conflicts= and Before= dependencies to this unit
> > for
> > their service unit, which is implicitly done when
> > DefaultDependencies=yes is set (the default)."
> > 
> > multipathd.service sets DefaultDependencies=no and includes the
> > Conflits= dependency, but not the Before= one. This can cause
> > multipathd
> > to continue running past when it is supposed to during shutdown.
> > 
> > Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
> 
> Reviewed-by: Martin Wilck <mwilck@suse.com>

Martin, I noticed that this commit didn't make it into your queue
branch. I assume it's just an oversight. Right?

-Ben

> 
> -- 
> Dr. Martin Wilck <mwilck@suse.com>, Tel. +49 (0)911 74053 2107
> SUSE  Software Solutions Germany GmbH
> HRB 36809, AG Nürnberg GF: Felix
> Imendörffer
> 

--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel
Martin Wilck Jan. 27, 2021, 9:41 a.m. UTC | #3
On Tue, 2021-01-26 at 19:16 -0600, Benjamin Marzinski wrote:
> 
> Martin, I noticed that this commit didn't make it into your queue
> branch. I assume it's just an oversight. Right?

Yes, I'm sorry. Fixed now.


Cheers,
Martin
diff mbox series

Patch

diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service
index ba24983e..7d547fa7 100644
--- a/multipathd/multipathd.service
+++ b/multipathd/multipathd.service
@@ -2,7 +2,7 @@ 
 Description=Device-Mapper Multipath Device Controller
 Wants=systemd-udev-trigger.service systemd-udev-settle.service
 Before=iscsi.service iscsid.service lvm2-activation-early.service
-Before=local-fs-pre.target blk-availability.service
+Before=local-fs-pre.target blk-availability.service shutdown.target
 After=multipathd.socket systemd-udev-trigger.service systemd-udev-settle.service
 DefaultDependencies=no
 Conflicts=shutdown.target