[PATCH 0/2] two multipathd fixes

[PATCH 0/2] two multipathd fixes

[Martin Wilck]

Hi Christophe,

Two small fixes, based on my prior submissions which have been
acked by Ben.

Martin

Martin Wilck (2):
  multipathd: fix irritating "minor number mismatch" message
  multipathd: reset delay_wait_checks counter on failure

 multipathd/main.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

-- 
2.19.1

[PATCH 1/2] multipathd: fix irritating "minor number mismatch" message

[Martin Wilck]

This is really an alias mismatch, not a minor number mismatch.

Signed-off-by: Martin Wilck <mwilck@suse.com>
---
 multipathd/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/multipathd/main.c b/multipathd/main.c
index 6289718d..0dddddb3 100644
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -778,8 +778,8 @@ uev_remove_map (struct uevent * uev, struct vectors * vecs)
 		goto out;
 	}
 	if (strcmp(mpp->alias, alias)) {
-		condlog(2, "%s: minor number mismatch (map %d, event %d)",
-			mpp->alias, mpp->dmi->minor, minor);
+		condlog(2, "%s: map alias mismatch: have \"%s\", got \"%s\")",
+			uev->kernel, mpp->alias, alias);
 		goto out;
 	}
 
-- 
2.19.1

[PATCH 2/2] multipathd: reset delay_wait_checks counter on failure

[Martin Wilck]

If path reinstantiation is delayed by delay_wait_checks, wait_checks
is counting down, the path fails during the delay phase, and then
comes up again, the wait_check counter starts counting down at the
same value where it previously stopped, which may be very low (even 1).

To avoid that, reset the counter to pp->delay_wait_checks if a failure
is encountered during the delay phase.

Signed-off-by: Martin Wilck <mwilck@suse.com>
---
 multipathd/main.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/multipathd/main.c b/multipathd/main.c
index 0dddddb3..622aa1ac 100644
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -2035,8 +2035,12 @@ check_path (struct vectors * vecs, struct path * pp, int ticks)
 					pp->wait_checks = pp->mpp->delay_wait_checks;
 					pp->watch_checks = 0;
 				}
-			}else
+			} else {
 				fail_path(pp, 0);
+				if (pp->wait_checks > 0)
+					pp->wait_checks =
+						pp->mpp->delay_wait_checks;
+			}
 
 			/*
 			 * cancel scheduled failback
-- 
2.19.1

Re: [PATCH 0/2] two multipathd fixes

[Christophe Varoqui]

[-- Attachment #1.1: Type: text/plain, Size: 454 bytes --]

Merged.
Thanks.

On Tue, Nov 13, 2018 at 10:31 PM Martin Wilck <mwilck@suse.com> wrote:

> Hi Christophe,
>
> Two small fixes, based on my prior submissions which have been
> acked by Ben.
>
> Martin
>
> Martin Wilck (2):
>   multipathd: fix irritating "minor number mismatch" message
>   multipathd: reset delay_wait_checks counter on failure
>
>  multipathd/main.c | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
>
> --
> 2.19.1
>
>

[-- Attachment #1.2: Type: text/html, Size: 771 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: multipath-tools: Bump version to 0.7.9

[Xose Vazquez Perez]

Christophe Varoqui wrote:

> https://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=commitdiff;h=5c67a8b5944dd13542e6b44fa2ae9803e0cc4282

Untagged: https://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=tags

Re: multipath-tools: Bump version to 0.7.9

[Christophe Varoqui]

[-- Attachment #1.1: Type: text/plain, Size: 351 bytes --]

This commit is now tagged.
Thanks.

On Wed, Nov 14, 2018 at 7:45 PM Xose Vazquez Perez <xose.vazquez@gmail.com>
wrote:

> Christophe Varoqui wrote:
>
> >
> https://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=commitdiff;h=5c67a8b5944dd13542e6b44fa2ae9803e0cc4282
>
> Untagged: https://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=tags
>

[-- Attachment #1.2: Type: text/html, Size: 894 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]