[dm-devel] [PATCH 0/3] multipath-tools: final touces before next PR

[dm-devel] [PATCH 0/3] multipath-tools: final touces before next PR

[mwilck]

From: Martin Wilck <mwilck@suse.com>

Hello Christophe, hello Ben,

here are a few final small fixes for the next multipath-tools PR:
https://github.com/opensvc/multipath-tools/pull/13

(Christophe, please give Ben a few days for review before merging).

Notes:

 - The patch for libmultipath.version differs from the one I posted
   previously (https://listman.redhat.com/archives/dm-devel/2021-September/msg00011.html).
   In the previous one I hadn't sticked to the guide line I had
   set up myself (bumping the version of every symbol in the ABI
   for incompatible changes). The previous patch (bumping only the
   version of the symbols that had actually changed) has some advantages,
   in particular being able to track which symbols actually differ between
   versions. We may want to discuss changing the policy towards
   this procedure in the future, but we can't do it silently like I did
   in the first version of this patch.
 - I wrote previously that "libmultipath: drop unnecessary parameter 
   from remove_map()" broke the directio test, but that was a braino.
   It broke the dmevents tests. The fix is in this series.

Regards,
Martin

Martin Wilck (3):
  libmultipath.version: adapt to changes in remove_map
  multipath-tools tests: fix dmevents test
  Update .gitignore

 .gitignore                        |  4 ++++
 libmultipath/libmultipath.version | 17 +++++++----------
 tests/dmevents.c                  |  4 +---
 3 files changed, 12 insertions(+), 13 deletions(-)

-- 
2.33.0


--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel

[dm-devel] [PATCH v2 1/3] libmultipath.version: adapt to changes in remove_map

[mwilck]

From: Martin Wilck <mwilck@suse.com>

The patch "libmultipath: drop unnecessary parameter from remove_map()"
changed the parameter list of remove_map().

Signed-off-by: Martin Wilck <mwilck@suse.com>
---
 libmultipath/libmultipath.version | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/libmultipath/libmultipath.version b/libmultipath/libmultipath.version
index 7b48265..eb5b5b5 100644
--- a/libmultipath/libmultipath.version
+++ b/libmultipath/libmultipath.version
@@ -31,7 +31,7 @@
  *   The new version inherits the previous ones.
  */
 
-LIBMULTIPATH_8.0.0 {
+LIBMULTIPATH_9.0.0 {
 global:
 	/* symbols referenced by multipath and multipathd */
 	add_foreign;
@@ -270,12 +270,8 @@ global:
 
 	/* added in 7.0.0 */
 	cleanup_charp;
-local:
-	*;
-};
 
-LIBMULTIPATH_8.1.0 {
-global:
+	/* added in 8.1.0 */
 	reset_strbuf;
 	append_strbuf_str;
 	get_strbuf_len;
@@ -284,9 +280,10 @@ global:
 	fill_strbuf;
 	print_strbuf;
 	truncate_strbuf;
-} LIBMULTIPATH_8.0.0;
 
-LIBMULTIPATH_8.2.0 {
-global:
+	/* added in 8.2.0 */
 	check_daemon;
-} LIBMULTIPATH_8.1.0;
+
+local:
+	*;
+};
-- 
2.33.0


--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel

[dm-devel] [PATCH 2/3] multipath-tools tests: fix dmevents test

[mwilck]

From: Martin Wilck <mwilck@suse.com>

The dmevents test needs to be adapted to the ABI change for
remove_map_by_alias().

Signed-off-by: Martin Wilck <mwilck@suse.com>
---
 tests/dmevents.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/dmevents.c b/tests/dmevents.c
index 204cf1d..68c4ad4 100644
--- a/tests/dmevents.c
+++ b/tests/dmevents.c
@@ -323,12 +323,10 @@ int __wrap_poll(struct pollfd *fds, nfds_t nfds, int timeout)
 	return mock_type(int);
 }
 
-void __wrap_remove_map_by_alias(const char *alias, struct vectors * vecs,
-				int purge_vec)
+void __wrap_remove_map_by_alias(const char *alias, struct vectors * vecs)
 {
 	check_expected(alias);
 	assert_ptr_equal(vecs, waiter->vecs);
-	assert_int_equal(purge_vec, 1);
 }
 
 /* pretend update the pretend dm devices. If fail is set, it
-- 
2.33.0


--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel

[dm-devel] [PATCH 3/3] Update .gitignore

[mwilck]

From: Martin Wilck <mwilck@suse.com>

Add tests/*.vgr (output files from vagrant tests runs), and a few
other missing patterns.

Signed-off-by: Martin Wilck <mwilck@suse.com>
---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 9926756..087dffc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,9 @@
 *.a
 *.gz
 *.d
+\#*
+cscope.files
+cscope.out
 kpartx/kpartx
 multipath/multipath
 multipathd/multipathd
@@ -21,5 +24,6 @@ libdmmp/test/libdmmp_test
 libdmmp/test/libdmmp_speed_test
 tests/*-test
 tests/*.out
+tests/*.vgr
 libmultipath/nvme-ioctl.c
 libmultipath/nvme-ioctl.h
-- 
2.33.0


--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel

Re: [dm-devel] [PATCH 0/3] multipath-tools: final touces before next PR

[Benjamin Marzinski]

On Tue, Sep 07, 2021 at 08:56:33AM +0200, mwilck@suse.com wrote:
> From: Martin Wilck <mwilck@suse.com>

Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>

for the set.

> 
> Hello Christophe, hello Ben,
> 
> here are a few final small fixes for the next multipath-tools PR:
> https://github.com/opensvc/multipath-tools/pull/13
> 
> (Christophe, please give Ben a few days for review before merging).
> 
> Notes:
> 
>  - The patch for libmultipath.version differs from the one I posted
>    previously (https://listman.redhat.com/archives/dm-devel/2021-September/msg00011.html).
>    In the previous one I hadn't sticked to the guide line I had
>    set up myself (bumping the version of every symbol in the ABI
>    for incompatible changes). The previous patch (bumping only the
>    version of the symbols that had actually changed) has some advantages,
>    in particular being able to track which symbols actually differ between
>    versions. We may want to discuss changing the policy towards
>    this procedure in the future, but we can't do it silently like I did
>    in the first version of this patch.
>  - I wrote previously that "libmultipath: drop unnecessary parameter 
>    from remove_map()" broke the directio test, but that was a braino.
>    It broke the dmevents tests. The fix is in this series.
> 
> Regards,
> Martin
> 
> Martin Wilck (3):
>   libmultipath.version: adapt to changes in remove_map
>   multipath-tools tests: fix dmevents test
>   Update .gitignore
> 
>  .gitignore                        |  4 ++++
>  libmultipath/libmultipath.version | 17 +++++++----------
>  tests/dmevents.c                  |  4 +---
>  3 files changed, 12 insertions(+), 13 deletions(-)
> 
> -- 
> 2.33.0

--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel