| Message ID | 20240404173814.3143-3-mwilck@suse.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | christophe varoqui |
| Headers | show |
| Series | multipath udev rules changes for dm rules V3 | expand |
On Thu, Apr 04, 2024 at 07:38:05PM +0200, Martin Wilck wrote: > DM_NOSCAN is our "output" flag for 13-dm-disk.rules, and it should > be treated the same way as DM_UDEV_DISABLE_OTHER_RULES_FLAG, which > isn't imported from the udev database. The state that we need to > remember is MPATH_DEVICE_READY, which we've already imported above, > and we will set the "output" flags accordingly in the "force_activation" > code path further down. > > Signed-off-by: Martin Wilck <mwilck@suse.com> Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com> > --- > multipath/11-dm-mpath.rules.in | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/multipath/11-dm-mpath.rules.in b/multipath/11-dm-mpath.rules.in > index b8d19d0..eb12b0c 100644 > --- a/multipath/11-dm-mpath.rules.in > +++ b/multipath/11-dm-mpath.rules.in > @@ -18,9 +18,11 @@ ACTION=="add", ENV{DM_ACTIVATION}=="1", ENV{DM_SUSPENDED}!="1", ENV{DISK_RO}!="1 > > # If this uevent didn't come from dm, don't try to update the > # device state > +# Note that .MPATH_DEVICE_READY_OLD=="" here. Thus we won't activate the > +# device below at force_activation, which is correct. > ENV{DM_COOKIE}!="?*", ENV{DM_ACTION}!="PATH_*", \ > - IMPORT{db}="DM_NOSCAN", IMPORT{db}="DM_COLDPLUG_SUSPENDED", \ > - GOTO="scan_import" > + IMPORT{db}="DM_COLDPLUG_SUSPENDED", \ > + GOTO="force_activation" > > ENV{.MPATH_DEVICE_READY_OLD}="$env{MPATH_DEVICE_READY}" > > -- > 2.44.0
diff --git a/multipath/11-dm-mpath.rules.in b/multipath/11-dm-mpath.rules.in index b8d19d0..eb12b0c 100644 --- a/multipath/11-dm-mpath.rules.in +++ b/multipath/11-dm-mpath.rules.in @@ -18,9 +18,11 @@ ACTION=="add", ENV{DM_ACTIVATION}=="1", ENV{DM_SUSPENDED}!="1", ENV{DISK_RO}!="1 # If this uevent didn't come from dm, don't try to update the # device state +# Note that .MPATH_DEVICE_READY_OLD=="" here. Thus we won't activate the +# device below at force_activation, which is correct. ENV{DM_COOKIE}!="?*", ENV{DM_ACTION}!="PATH_*", \ - IMPORT{db}="DM_NOSCAN", IMPORT{db}="DM_COLDPLUG_SUSPENDED", \ - GOTO="scan_import" + IMPORT{db}="DM_COLDPLUG_SUSPENDED", \ + GOTO="force_activation" ENV{.MPATH_DEVICE_READY_OLD}="$env{MPATH_DEVICE_READY}"
DM_NOSCAN is our "output" flag for 13-dm-disk.rules, and it should be treated the same way as DM_UDEV_DISABLE_OTHER_RULES_FLAG, which isn't imported from the udev database. The state that we need to remember is MPATH_DEVICE_READY, which we've already imported above, and we will set the "output" flags accordingly in the "force_activation" code path further down. Signed-off-by: Martin Wilck <mwilck@suse.com> --- multipath/11-dm-mpath.rules.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)