All of lore.kernel.org
 help / color / mirror / Atom feed
* multipath-tools merges
@ 2020-03-02 10:19 Christophe Varoqui
  2020-03-02 21:51 ` Martin Wilck
  2020-03-13 17:52 ` Benjamin Marzinski
  0 siblings, 2 replies; 6+ messages in thread
From: Christophe Varoqui @ 2020-03-02 10:19 UTC (permalink / raw)
  To: Benjamin Marzinski, Martin Wilck; +Cc: device-mapper development


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

Hi ben, Martin,

I finally catched up with your changes from october till now.
Please review I did not mess up the merges, then i'll commit a version bump.

Thanks,
Christophe.

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

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



^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: multipath-tools merges
  2020-03-02 10:19 multipath-tools merges Christophe Varoqui
@ 2020-03-02 21:51 ` Martin Wilck
  2020-03-02 23:35   ` Christophe Varoqui
  2020-03-13 17:52 ` Benjamin Marzinski
  1 sibling, 1 reply; 6+ messages in thread
From: Martin Wilck @ 2020-03-02 21:51 UTC (permalink / raw)
  To: bmarzins, christophe.varoqui; +Cc: dm-devel

Hi Christophe,

On Mon, 2020-03-02 at 11:19 +0100, Christophe Varoqui wrote:
> Hi ben, Martin,
> 
> I finally catched up with your changes from october till now.
> Please review I did not mess up the merges, then i'll commit a
> version bump.

This is great, thanks a lot!
I admit that I was starting to get nervous :-)

It seems that you missed the following patches from me, reviewed by
Ben:

 * My "Drop nr_active, and some more fixes" series from 11/19
   - "multipathd: move set_no_path_retry() back to libmultipath"
      Review: https://www.redhat.com/archives/dm-devel/2019-November/msg00099.html
   - libmultipath: dict.c: rename duplicate set_no_path_retry()
      Review: https://www.redhat.com/archives/dm-devel/2019-November/msg00100.html
   - libmultipath: drop mpp->nr_active field
      Review: https://www.redhat.com/archives/dm-devel/2019-December/msg00037.html
   - libmultipath: fix (max_)polling_interval setting logic
     Review: https://www.redhat.com/archives/dm-devel/2019-November/msg00101.html
   - libmultipath: fix ALUA autodetection when paths are down
     Review: https://www.redhat.com/archives/dm-devel/2019-November/msg00107.html

 * libmultipath: fix compilation with -fno-common
   Review: https://www.redhat.com/archives/dm-devel/2020-January/msg00118.html
 * libmultipath: fix files read from config_dir (from Enzo):
   Review (by me): https://www.redhat.com/archives/dm-devel/2020-February/msg00058.html

Furthermore, as I indicated before, I'd like to propose a minor change on top of Ben's
last series before you tag a new version. No C code changes, just build logic for
unit tests, and a README. I'll post it ASAP.

Regards
Martin

-- 
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

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: multipath-tools merges
  2020-03-02 21:51 ` Martin Wilck
@ 2020-03-02 23:35   ` Christophe Varoqui
  2020-03-06 16:26     ` Martin Wilck
  0 siblings, 1 reply; 6+ messages in thread
From: Christophe Varoqui @ 2020-03-02 23:35 UTC (permalink / raw)
  To: Martin Wilck; +Cc: dm-devel


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

Hi Martin,

Thanks for pointing these missing patches.
They are now merged.

Best,
Christophe.

On Mon, Mar 2, 2020 at 10:51 PM Martin Wilck <Martin.Wilck@suse.com> wrote:

> Hi Christophe,
>
> On Mon, 2020-03-02 at 11:19 +0100, Christophe Varoqui wrote:
> > Hi ben, Martin,
> >
> > I finally catched up with your changes from october till now.
> > Please review I did not mess up the merges, then i'll commit a
> > version bump.
>
> This is great, thanks a lot!
> I admit that I was starting to get nervous :-)
>
> It seems that you missed the following patches from me, reviewed by
> Ben:
>
>  * My "Drop nr_active, and some more fixes" series from 11/19
>    - "multipathd: move set_no_path_retry() back to libmultipath"
>       Review:
> https://www.redhat.com/archives/dm-devel/2019-November/msg00099.html
>    - libmultipath: dict.c: rename duplicate set_no_path_retry()
>       Review:
> https://www.redhat.com/archives/dm-devel/2019-November/msg00100.html
>    - libmultipath: drop mpp->nr_active field
>       Review:
> https://www.redhat.com/archives/dm-devel/2019-December/msg00037.html
>    - libmultipath: fix (max_)polling_interval setting logic
>      Review:
> https://www.redhat.com/archives/dm-devel/2019-November/msg00101.html
>    - libmultipath: fix ALUA autodetection when paths are down
>      Review:
> https://www.redhat.com/archives/dm-devel/2019-November/msg00107.html
>
>  * libmultipath: fix compilation with -fno-common
>    Review:
> https://www.redhat.com/archives/dm-devel/2020-January/msg00118.html
>  * libmultipath: fix files read from config_dir (from Enzo):
>    Review (by me):
> https://www.redhat.com/archives/dm-devel/2020-February/msg00058.html
>
> Furthermore, as I indicated before, I'd like to propose a minor change on
> top of Ben's
> last series before you tag a new version. No C code changes, just build
> logic for
> unit tests, and a README. I'll post it ASAP.
>
> Regards
> Martin
>
> --
> 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
>
>

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

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



^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: multipath-tools merges
  2020-03-02 23:35   ` Christophe Varoqui
@ 2020-03-06 16:26     ` Martin Wilck
  2020-03-07 11:00       ` Christophe Varoqui
  0 siblings, 1 reply; 6+ messages in thread
From: Martin Wilck @ 2020-03-06 16:26 UTC (permalink / raw)
  To: christophe.varoqui; +Cc: dm-devel

[-- Attachment #1: Type: text/plain, Size: 667 bytes --]

Hello Christophe,

On Tue, 2020-03-03 at 00:35 +0100, Christophe Varoqui wrote:
> Hi Martin,
> 
> Thanks for pointing these missing patches.
> They are now merged.

Thanks. Still a nit: you picked v1 of my 
"libmultipath: drop mpp->nr_active field" patch (from Nov. 15th) rather
than v2 (from Nov. 20th):
https://www.redhat.com/archives/dm-devel/2019-November/msg00133.html

The v2 patch added some additional hunks (attached) and also a some
text in the commit message.

Regards,
Martin

-- 
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



[-- Attachment #2: drop-nr_active-v1-v2.diff --]
[-- Type: text/x-patch, Size: 1917 bytes --]

diff --git a/libmultipath/structs_vec.c b/libmultipath/structs_vec.c
index 0c5a3a81..3dbbaa0f 100644
--- a/libmultipath/structs_vec.c
+++ b/libmultipath/structs_vec.c
@@ -334,22 +334,23 @@ static void leave_recovery_mode(struct multipath *mpp)
 	}
 }
 
-void set_no_path_retry(struct multipath *mpp)
+void __set_no_path_retry(struct multipath *mpp, bool check_features)
 {
-	bool is_queueing = 0;
+	bool is_queueing;
 
-	if (mpp->features && strstr(mpp->features, "queue_if_no_path"))
-		is_queueing = 1;
+	check_features = check_features && mpp->features != NULL;
+	if (check_features)
+		is_queueing = strstr(mpp->features, "queue_if_no_path");
 
 	switch (mpp->no_path_retry) {
 	case NO_PATH_RETRY_UNDEF:
 		break;
 	case NO_PATH_RETRY_FAIL:
-		if (is_queueing)
+		if (!check_features || is_queueing)
 			dm_queue_if_no_path(mpp->alias, 0);
 		break;
 	case NO_PATH_RETRY_QUEUE:
-		if (!is_queueing)
+		if (!check_features || !is_queueing)
 			dm_queue_if_no_path(mpp->alias, 1);
 		break;
 	default:
@@ -358,7 +359,8 @@ void set_no_path_retry(struct multipath *mpp)
 			 * If in_recovery is set, leave_recovery_mode() takes
 			 * care of dm_queue_if_no_path. Otherwise, do it here.
 			 */
-			if (!is_queueing && !mpp->in_recovery)
+			if ((!check_features || !is_queueing) &&
+			    !mpp->in_recovery)
 				dm_queue_if_no_path(mpp->alias, 1);
 			leave_recovery_mode(mpp);
 		} else
diff --git a/libmultipath/structs_vec.h b/libmultipath/structs_vec.h
index 678efe4d..2a5e3d60 100644
--- a/libmultipath/structs_vec.h
+++ b/libmultipath/structs_vec.h
@@ -11,7 +11,8 @@ struct vectors {
 	vector mpvec;
 };
 
-void set_no_path_retry(struct multipath *mpp);
+void __set_no_path_retry(struct multipath *mpp, bool check_features);
+#define set_no_path_retry(mpp) __set_no_path_retry(mpp, true)
 
 int adopt_paths (vector pathvec, struct multipath * mpp);
 void orphan_paths(vector pathvec, struct multipath *mpp,

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



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: multipath-tools merges
  2020-03-06 16:26     ` Martin Wilck
@ 2020-03-07 11:00       ` Christophe Varoqui
  0 siblings, 0 replies; 6+ messages in thread
From: Christophe Varoqui @ 2020-03-07 11:00 UTC (permalink / raw)
  To: Martin Wilck; +Cc: dm-devel


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

Thanks,
the delta is committed with your authoring information.

Best,
Christophe

On Fri, Mar 6, 2020 at 5:28 PM Martin Wilck <Martin.Wilck@suse.com> wrote:

> Hello Christophe,
>
> On Tue, 2020-03-03 at 00:35 +0100, Christophe Varoqui wrote:
> > Hi Martin,
> >
> > Thanks for pointing these missing patches.
> > They are now merged.
>
> Thanks. Still a nit: you picked v1 of my
> "libmultipath: drop mpp->nr_active field" patch (from Nov. 15th) rather
> than v2 (from Nov. 20th):
> https://www.redhat.com/archives/dm-devel/2019-November/msg00133.html
>
> The v2 patch added some additional hunks (attached) and also a some
> text in the commit message.
>
> Regards,
> Martin
>
> --
> 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
>
>
>

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

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



^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: multipath-tools merges
  2020-03-02 10:19 multipath-tools merges Christophe Varoqui
  2020-03-02 21:51 ` Martin Wilck
@ 2020-03-13 17:52 ` Benjamin Marzinski
  1 sibling, 0 replies; 6+ messages in thread
From: Benjamin Marzinski @ 2020-03-13 17:52 UTC (permalink / raw)
  To: Christophe Varoqui; +Cc: device-mapper development, Martin Wilck

On Mon, Mar 02, 2020 at 11:19:08AM +0100, Christophe Varoqui wrote:
> Hi ben, Martin,
> 
> I finally catched up with your changes from october till now.
> Please review I did not mess up the merges, then i'll commit a version bump.

Sorry for the delay. Everything looks fine on my end.

-Ben

> 
> Thanks,
> Christophe.

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-03-13 17:52 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-02 10:19 multipath-tools merges Christophe Varoqui
2020-03-02 21:51 ` Martin Wilck
2020-03-02 23:35   ` Christophe Varoqui
2020-03-06 16:26     ` Martin Wilck
2020-03-07 11:00       ` Christophe Varoqui
2020-03-13 17:52 ` Benjamin Marzinski

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.