From fb4936d842643bff86e63704f44194705fabe6c1cbed5563d96730e4360b93c0 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Mon, 12 Feb 2024 18:14:59 +0000 Subject: [PATCH 1/4] Accepting request 1146255 from home:mwilck:Future An upstream PR for 0.9.8 is currently in preparation (https://github.com/opensvc/multipath-tools/pull/81) Some minor review is still missing before it can be merged upstream. We need the included fixes as bug fixes for SLE15-SP6. Will update to 0.9.8 asap when it's released; no relevant changes between 0.9.8 and this code base are expected. - Update to version 0.9.7+148+suse.7d9953e.obscpio * This is a multipath-tools 0.9.8 pre-release * fix fast_io_fail for Infinibox (bsc#1219348) * Fix activation of LVM volume groups during coldplug (bsc#1219143) - Update to version 0.9.7+140+suse.2d78457: * This is a multipath-tools 0.9.8 pre-release * Socket activation via multipathd.socket has been disabled by default because it has undesirable side effects on systems without multipath. Users with multipath hardware should enable multipathd.service * The restorequeueing CLI command now only enables queueing if disablequeueing had been sent before * Avoid multipathd hang during map flush * multipathd now tracks the queueing mode of maps in its internal features string * Improve error messages in 'multipathd -k' * Fix segfault in autoresize code (bsc#1219289) * Fix missing map reloads (bsc#1219796) * Documentation fixes, spelling fixes, minor code fixes OBS-URL: https://build.opensuse.org/request/show/1146255 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=326 --- _servicedata | 2 +- multipath-dracut.conf | 4 +-- ...ipath-tools-0.9.7+148+suse.7d9953e.obscpio | 3 +++ multipath-tools-0.9.7+93+suse.e2f2272.obscpio | 3 --- multipath-tools.changes | 25 +++++++++++++++++++ multipath-tools.obsinfo | 6 ++--- multipath-tools.spec | 5 ++-- 7 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 multipath-tools-0.9.7+148+suse.7d9953e.obscpio delete mode 100644 multipath-tools-0.9.7+93+suse.e2f2272.obscpio diff --git a/_servicedata b/_servicedata index 9e23dfd..43e8456 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/multipath-tools.git - e2f2272965b84e18c88f714a5da944261386c22c \ No newline at end of file + 7d9953e43e6f554057d7f0b6ee108f9bf0ea80bb \ No newline at end of file diff --git a/multipath-dracut.conf b/multipath-dracut.conf index df5d7ea..f73581e 100644 --- a/multipath-dracut.conf +++ b/multipath-dracut.conf @@ -1,2 +1,2 @@ -# Make sure the tmpfiles entry exists in initramfs already -install_items+=" @TMPFILESDIR@/multipath.conf " +# Make sure the tmpfiles entry and rules files exist in initramfs already +install_items+=" @TMPFILESDIR@/multipath.conf @UDEVRULESDIR@/99-z-dm-mpath-late.rules " diff --git a/multipath-tools-0.9.7+148+suse.7d9953e.obscpio b/multipath-tools-0.9.7+148+suse.7d9953e.obscpio new file mode 100644 index 0000000..ca8cff7 --- /dev/null +++ b/multipath-tools-0.9.7+148+suse.7d9953e.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99ea7de0072d0b68e139f1668fc760f0af46ce9dce4d12a2c20f4b05164794aa +size 2857484 diff --git a/multipath-tools-0.9.7+93+suse.e2f2272.obscpio b/multipath-tools-0.9.7+93+suse.e2f2272.obscpio deleted file mode 100644 index f921aa6..0000000 --- a/multipath-tools-0.9.7+93+suse.e2f2272.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a2e1d81d48871d3384bbe65c360f780a0556196d07d0e7e1a0e0194b109e331 -size 2839052 diff --git a/multipath-tools.changes b/multipath-tools.changes index 0eb318c..a928a54 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Mon Feb 12 15:33:58 UTC 2024 - Martin Wilck + +- Update to version 0.9.7+148+suse.7d9953e.obscpio + * This is a multipath-tools 0.9.8 pre-release + * fix fast_io_fail for Infinibox (bsc#1219348) + * Fix activation of LVM volume groups during coldplug (bsc#1219143) + +------------------------------------------------------------------- +Mon Feb 12 15:09:47 UTC 2024 - Martin Wilck + +- Update to version 0.9.7+140+suse.2d78457: + * This is a multipath-tools 0.9.8 pre-release + * Socket activation via multipathd.socket has been disabled by default + because it has undesirable side effects on systems without multipath. + Users with multipath hardware should enable multipathd.service + * The restorequeueing CLI command now only enables queueing if + disablequeueing had been sent before + * Avoid multipathd hang during map flush + * multipathd now tracks the queueing mode of maps in its internal features string + * Improve error messages in 'multipathd -k' + * Fix segfault in autoresize code (bsc#1219289) + * Fix missing map reloads (bsc#1219796) + * Documentation fixes, spelling fixes, minor code fixes + ------------------------------------------------------------------- Fri Jan 5 14:32:11 UTC 2024 - Martin Wilck diff --git a/multipath-tools.obsinfo b/multipath-tools.obsinfo index 99fd7f9..e54998e 100644 --- a/multipath-tools.obsinfo +++ b/multipath-tools.obsinfo @@ -1,4 +1,4 @@ name: multipath-tools -version: 0.9.7+93+suse.e2f2272 -mtime: 1704464916 -commit: e2f2272965b84e18c88f714a5da944261386c22c +version: 0.9.7+148+suse.7d9953e +mtime: 1707750575 +commit: 7d9953e43e6f554057d7f0b6ee108f9bf0ea80bb diff --git a/multipath-tools.spec b/multipath-tools.spec index 1ec3d21..693db0e 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -35,7 +35,7 @@ %define libdmmp_version %(echo %{_libdmmp_version} | tr . _) Name: multipath-tools -Version: 0.9.7+93+suse.e2f2272 +Version: 0.9.7+148+suse.7d9953e Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper License: GPL-2.0-only AND GPL-3.0-or-later @@ -191,7 +191,7 @@ install -m 644 -D %{SOURCE1} %{buildroot}/usr/lib/modprobe.d/90-scsi_dh.conf install -m 644 %{SOURCE2} %{buildroot}%{_udevrulesdir}/00-dont-del-part-nodes.rules install -m 644 -D %{SOURCE3} %{buildroot}/usr/lib/dracut/dracut.conf.d/dm-parts.conf install -m 644 -D %{SOURCE6} %{buildroot}/usr/lib/dracut/dracut.conf.d/multipath.conf -sed -i 's,@TMPFILESDIR@,%{_tmpfilesdir},' %{buildroot}/usr/lib/dracut/dracut.conf.d/multipath.conf +sed -i 's,@TMPFILESDIR@,%{_tmpfilesdir},;s,@UDEVRULESDIR@,%{_udevrulesdir},' %{buildroot}/usr/lib/dracut/dracut.conf.d/multipath.conf %post -n libmpath0 -p %{run_ldconfig} %postun -n libmpath0 -p %{run_ldconfig} @@ -227,6 +227,7 @@ exit 0 %license LICENSES/GPL-3.0 %{_udevrulesdir}/11-dm-mpath.rules %{_udevrulesdir}/56-multipath.rules +%{_udevrulesdir}/99-z-dm-mpath-late.rules %{sbindir}/multipath %{sbindir}/multipathd %{sbindir}/multipathc From ecff59b5d719b1bb5394ea005700cb2009d041423ecfe7dc7c2fd0365382a18e Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Wed, 14 Feb 2024 08:51:37 +0000 Subject: [PATCH 2/4] * Fix activation of LVM volume groups during coldplug (bsc#1219142) OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=327 --- multipath-tools.changes | 2 +- multipath-tools.spec | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/multipath-tools.changes b/multipath-tools.changes index a928a54..2361316 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -4,7 +4,7 @@ Mon Feb 12 15:33:58 UTC 2024 - Martin Wilck - Update to version 0.9.7+148+suse.7d9953e.obscpio * This is a multipath-tools 0.9.8 pre-release * fix fast_io_fail for Infinibox (bsc#1219348) - * Fix activation of LVM volume groups during coldplug (bsc#1219143) + * Fix activation of LVM volume groups during coldplug (bsc#1219142) ------------------------------------------------------------------- Mon Feb 12 15:09:47 UTC 2024 - Martin Wilck diff --git a/multipath-tools.spec b/multipath-tools.spec index 693db0e..52683a9 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -1,7 +1,7 @@ # # spec file for package multipath-tools # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -62,9 +62,9 @@ BuildRequires: readline-devel BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(liburcu) +BuildRequires: pkgconfig(mount) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(udev) -BuildRequires: pkgconfig(mount) %if 0%{?with_check} == 1 BuildRequires: pkgconfig(cmocka) %endif @@ -88,6 +88,7 @@ monitors path devices for failure, removal, or addition, and applies the necessary changes to the multipath maps to ensure continuous availability of the map devices. + # Currently, it makes no sense to split out libmpathpersist and libmpathcmd # separately. libmultipath has no stable API at all, and it depends # on libmpathcmd (to be fixed). libmpathpersist depends on libmultipath @@ -159,7 +160,6 @@ This package provides development files and documentation for libdmmp. %define libdir %{_libdir} %endif - %prep %setup -q -n multipath-tools-%{version} cp %{SOURCE4} . From 65b2f81b3f20c9512f69959e80706bceb995dfc4fcad7f08909ec749184a0fd7 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Wed, 14 Feb 2024 20:56:47 +0000 Subject: [PATCH 3/4] Accepting request 1146653 from home:mwilck:Future - Update to version 0.9.7+148+suse.9780ae0: * 11-dm-mpath.rules: Fix quoting mistake (bsc#1219142) OBS-URL: https://build.opensuse.org/request/show/1146653 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=328 --- _servicedata | 2 +- multipath-tools-0.9.7+148+suse.7d9953e.obscpio | 3 --- multipath-tools-0.9.7+148+suse.9780ae0.obscpio | 3 +++ multipath-tools.changes | 6 ++++++ multipath-tools.obsinfo | 6 +++--- multipath-tools.spec | 8 ++++---- 6 files changed, 17 insertions(+), 11 deletions(-) delete mode 100644 multipath-tools-0.9.7+148+suse.7d9953e.obscpio create mode 100644 multipath-tools-0.9.7+148+suse.9780ae0.obscpio diff --git a/_servicedata b/_servicedata index 43e8456..436d40c 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/multipath-tools.git - 7d9953e43e6f554057d7f0b6ee108f9bf0ea80bb \ No newline at end of file + 9780ae02c01d4f54ee9e288d6cfde5527857e333 \ No newline at end of file diff --git a/multipath-tools-0.9.7+148+suse.7d9953e.obscpio b/multipath-tools-0.9.7+148+suse.7d9953e.obscpio deleted file mode 100644 index ca8cff7..0000000 --- a/multipath-tools-0.9.7+148+suse.7d9953e.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:99ea7de0072d0b68e139f1668fc760f0af46ce9dce4d12a2c20f4b05164794aa -size 2857484 diff --git a/multipath-tools-0.9.7+148+suse.9780ae0.obscpio b/multipath-tools-0.9.7+148+suse.9780ae0.obscpio new file mode 100644 index 0000000..1dc480e --- /dev/null +++ b/multipath-tools-0.9.7+148+suse.9780ae0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4921e32a2dc1c8da91588338e28ca4561560ad332a6b774a574544d8dc3b083c +size 2857484 diff --git a/multipath-tools.changes b/multipath-tools.changes index 2361316..5abe15a 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 14 20:52:13 UTC 2024 - Martin Wilck + +- Update to version 0.9.7+148+suse.9780ae0: + * 11-dm-mpath.rules: Fix quoting mistake (bsc#1219142) + ------------------------------------------------------------------- Mon Feb 12 15:33:58 UTC 2024 - Martin Wilck diff --git a/multipath-tools.obsinfo b/multipath-tools.obsinfo index e54998e..157c4c8 100644 --- a/multipath-tools.obsinfo +++ b/multipath-tools.obsinfo @@ -1,4 +1,4 @@ name: multipath-tools -version: 0.9.7+148+suse.7d9953e -mtime: 1707750575 -commit: 7d9953e43e6f554057d7f0b6ee108f9bf0ea80bb +version: 0.9.7+148+suse.9780ae0 +mtime: 1707942359 +commit: 9780ae02c01d4f54ee9e288d6cfde5527857e333 diff --git a/multipath-tools.spec b/multipath-tools.spec index 52683a9..1c3ec14 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -1,7 +1,7 @@ # # spec file for package multipath-tools # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,7 +35,7 @@ %define libdmmp_version %(echo %{_libdmmp_version} | tr . _) Name: multipath-tools -Version: 0.9.7+148+suse.7d9953e +Version: 0.9.7+148+suse.9780ae0 Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper License: GPL-2.0-only AND GPL-3.0-or-later @@ -62,9 +62,9 @@ BuildRequires: readline-devel BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(liburcu) -BuildRequires: pkgconfig(mount) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(udev) +BuildRequires: pkgconfig(mount) %if 0%{?with_check} == 1 BuildRequires: pkgconfig(cmocka) %endif @@ -88,7 +88,6 @@ monitors path devices for failure, removal, or addition, and applies the necessary changes to the multipath maps to ensure continuous availability of the map devices. - # Currently, it makes no sense to split out libmpathpersist and libmpathcmd # separately. libmultipath has no stable API at all, and it depends # on libmpathcmd (to be fixed). libmpathpersist depends on libmultipath @@ -160,6 +159,7 @@ This package provides development files and documentation for libdmmp. %define libdir %{_libdir} %endif + %prep %setup -q -n multipath-tools-%{version} cp %{SOURCE4} . From 3e9478e4b8d7cb324c5249447e48293f3351e5186d1ac845f2cb5ae6ae812046 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Thu, 15 Feb 2024 11:09:48 +0000 Subject: [PATCH 4/4] Accepting request 1146795 from home:mwilck:multipath - Update to version 0.9.8~1+82+suse.dcd98a3: * Adapt package version such that it shows as a 0.9.8 prerelease * Add missing udev rules file OBS-URL: https://build.opensuse.org/request/show/1146795 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=329 --- _service | 4 +++- _servicedata | 2 +- multipath-tools-0.9.7+148+suse.9780ae0.obscpio | 3 --- multipath-tools-0.9.8~1+82+suse.dcd98a3.obscpio | 3 +++ multipath-tools.changes | 7 +++++++ multipath-tools.obsinfo | 6 +++--- multipath-tools.spec | 2 +- 7 files changed, 18 insertions(+), 9 deletions(-) delete mode 100644 multipath-tools-0.9.7+148+suse.9780ae0.obscpio create mode 100644 multipath-tools-0.9.8~1+82+suse.dcd98a3.obscpio diff --git a/_service b/_service index d912a05..4256468 100644 --- a/_service +++ b/_service @@ -6,7 +6,9 @@ multipath-tools @PARENT_TAG@+@TAG_OFFSET@+suse.%h factory - 0.[0-9].[0-9] + 0.[0-9].[0-9]* + [-]pre\.([0-9]) + ~\1 enable diff --git a/_servicedata b/_servicedata index 436d40c..1c0c7bf 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/multipath-tools.git - 9780ae02c01d4f54ee9e288d6cfde5527857e333 \ No newline at end of file + dcd98a3c394ae7817a5e7ac81bd58c7635201e9e \ No newline at end of file diff --git a/multipath-tools-0.9.7+148+suse.9780ae0.obscpio b/multipath-tools-0.9.7+148+suse.9780ae0.obscpio deleted file mode 100644 index 1dc480e..0000000 --- a/multipath-tools-0.9.7+148+suse.9780ae0.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4921e32a2dc1c8da91588338e28ca4561560ad332a6b774a574544d8dc3b083c -size 2857484 diff --git a/multipath-tools-0.9.8~1+82+suse.dcd98a3.obscpio b/multipath-tools-0.9.8~1+82+suse.dcd98a3.obscpio new file mode 100644 index 0000000..6be61ae --- /dev/null +++ b/multipath-tools-0.9.8~1+82+suse.dcd98a3.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:207ddfc111740840b54d553f254d1e2c5f52439e5d44b0e337eb962e9d592927 +size 2857484 diff --git a/multipath-tools.changes b/multipath-tools.changes index 5abe15a..d79f463 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Feb 15 11:00:59 UTC 2024 - Martin Wilck + +- Update to version 0.9.8~1+82+suse.dcd98a3: + * Adapt package version such that it shows as a 0.9.8 prerelease + * Add missing udev rules file + ------------------------------------------------------------------- Wed Feb 14 20:52:13 UTC 2024 - Martin Wilck diff --git a/multipath-tools.obsinfo b/multipath-tools.obsinfo index 157c4c8..b7e0973 100644 --- a/multipath-tools.obsinfo +++ b/multipath-tools.obsinfo @@ -1,4 +1,4 @@ name: multipath-tools -version: 0.9.7+148+suse.9780ae0 -mtime: 1707942359 -commit: 9780ae02c01d4f54ee9e288d6cfde5527857e333 +version: 0.9.8~1+82+suse.dcd98a3 +mtime: 1707986847 +commit: dcd98a3c394ae7817a5e7ac81bd58c7635201e9e diff --git a/multipath-tools.spec b/multipath-tools.spec index 1c3ec14..624c632 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -35,7 +35,7 @@ %define libdmmp_version %(echo %{_libdmmp_version} | tr . _) Name: multipath-tools -Version: 0.9.7+148+suse.9780ae0 +Version: 0.9.8~1+82+suse.dcd98a3 Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper License: GPL-2.0-only AND GPL-3.0-or-later