Accepting request 712188 from Base:System

OBS-URL: https://build.opensuse.org/request/show/712188
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lvm2?expand=0&rev=124

bug-1122666_devices-drop-open-error-message.patch

@@ -0,0 +1,31 @@
+From 559cf0cd1e226baf63a98c39572264fbf5c3f6b4 Mon Sep 17 00:00:00 2001
+From: David Teigland <teigland@redhat.com>
+Date: Tue, 23 Apr 2019 09:39:42 -0500
+Subject: [PATCH] devices: drop open error message
+
+This open error is being printed in more common,
+non-error circumstances than expected.  After a
+number of complaints make it only a debug message.
+---
+ lib/device/dev-io.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c
+index 2a83a9657..6996a44dc 100644
+--- a/lib/device/dev-io.c
++++ b/lib/device/dev-io.c
+@@ -572,10 +572,7 @@ int dev_open_flags(struct device *dev, int flags, int direct, int quiet)
+ 			}
+ 		}
+ #endif
+-		if (quiet)
+-			log_sys_debug("open", name);
+-		else
+-			log_sys_error("open", name);
++		log_sys_debug("open", name);
+ 
+ 		dev->flags |= DEV_OPEN_FAILURE;
+ 		return 0;
+-- 
+2.21.0
+

bug-1137296_pvremove-vgextend-fix-using-device-aliases-with-lvmetad.patch

@@ -0,0 +1,35 @@
+From b13ebfa4c289a5bc6eb4f8ba26126db8e6d78296 Mon Sep 17 00:00:00 2001
+From: David Teigland <teigland@redhat.com>
+Date: Wed, 26 Jun 2019 16:03:42 -0500
+Subject: [PATCH] pvremove/vgextend: fix using device aliases with lvmetad
+
+These commands were looking for the requested device alias
+before dev_cache_scan had created the list of devs on the
+system, so they would fail and report the dev wasn't found.
+---
+ tools/toollib.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/tools/toollib.c b/tools/toollib.c
+index 3221e5f1ca..1b01cccfa2 100644
+--- a/tools/toollib.c
++++ b/tools/toollib.c
+@@ -5543,6 +5543,15 @@ int pvcreate_each_device(struct cmd_context *cmd,
+ 
+ 	lvmcache_label_scan(cmd);
+ 
++	/*
++	 * When using lvmetad, we want to do a dev cache scan here (if not done
++	 * already) so that the dev_cache_get just below will be able to find
++	 * device aliases.  When not using lvmetad, the label_scan just above
++	 * has done dev_cache_scan, and this will not be run.
++	 */
++	if (!dev_cache_has_scanned())
++		dev_cache_scan();
++
+ 	/*
+ 	 * Translate arg names into struct device's.
+ 	 */
+-- 
+2.21.0
+

device-mapper.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Jun 27 02:53:03 UTC 2019 - heming.zhao@suse.com
+
+- Fix using device aliases with lvmetad (bsc#1137296)
+  + bug-1137296_pvremove-vgextend-fix-using-device-aliases-with-lvmetad.patch
+
+-------------------------------------------------------------------
+Tue Apr 30 10:20:05 UTC 2019 - ghe@suse.com
+
+- Fix devices drop open error message (bsc#1122666)
+  + bug-1122666_devices-drop-open-error-message.patch
+
 -------------------------------------------------------------------
 Tue Mar 19 12:02:02 UTC 2019 - Martin Liška <mliska@suse.cz>
 

device-mapper.spec

@@ -51,6 +51,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ### COMMON-PATCH-BEGIN ###
 # Upstream patches
 Patch0001:      bug-1114113_metadata-prevent-writing-beyond-metadata-area.patch
+Patch0002:      bug-1122666_devices-drop-open-error-message.patch
+Patch0003:      bug-1137296_pvremove-vgextend-fix-using-device-aliases-with-lvmetad.patch
 
 # SUSE patches: 1000+ for LVM
 # Never upstream
@@ -72,6 +74,8 @@ Programs and man pages for configuring and using the device mapper.
 %setup -q -n LVM2.%{lvm2_version}
 ### COMMON-PREP-BEGIN ###
 %patch0001 -p1
+%patch0002 -p1
+%patch0003 -p1
 %patch1001 -p1
 %patch1002 -p1
 %patch1003 -p1

lvm2-clvm.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Jun 27 02:53:03 UTC 2019 - heming.zhao@suse.com
+
+- Fix using device aliases with lvmetad (bsc#1137296)
+  + bug-1137296_pvremove-vgextend-fix-using-device-aliases-with-lvmetad.patch
+
+-------------------------------------------------------------------
+Tue Apr 30 10:20:05 UTC 2019 - ghe@suse.com
+
+- Fix devices drop open error message (bsc#1122666)
+  + bug-1122666_devices-drop-open-error-message.patch
+
 -------------------------------------------------------------------
 Tue Mar 19 12:02:02 UTC 2019 - Martin Liška <mliska@suse.cz>
 

lvm2-clvm.spec

@@ -59,6 +59,8 @@ Provides:       cmirrord = %{version}
 ### COMMON-PATCH-BEGIN ###
 # Upstream patches
 Patch0001:      bug-1114113_metadata-prevent-writing-beyond-metadata-area.patch
+Patch0002:      bug-1122666_devices-drop-open-error-message.patch
+Patch0003:      bug-1137296_pvremove-vgextend-fix-using-device-aliases-with-lvmetad.patch
 
 # SUSE patches: 1000+ for LVM
 # Never upstream
@@ -84,6 +86,8 @@ A daemon for using LVM2 Logival Volumes in a clustered environment.
 
 ### COMMON-PREP-BEGIN ###
 %patch0001 -p1
+%patch0002 -p1
+%patch0003 -p1
 %patch1001 -p1
 %patch1002 -p1
 %patch1003 -p1

lvm2.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Jun 27 02:53:03 UTC 2019 - heming.zhao@suse.com
+
+- Fix using device aliases with lvmetad (bsc#1137296)
+  + bug-1137296_pvremove-vgextend-fix-using-device-aliases-with-lvmetad.patch
+
+-------------------------------------------------------------------
+Tue Apr 30 10:20:05 UTC 2019 - ghe@suse.com
+
+- Fix devices drop open error message (bsc#1122666)
+  + bug-1122666_devices-drop-open-error-message.patch
+
 -------------------------------------------------------------------
 Tue Mar 19 12:02:02 UTC 2019 - Martin Liška <mliska@suse.cz>
 

lvm2.spec

@@ -61,6 +61,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ### COMMON-PATCH-BEGIN ###
 # Upstream patches
 Patch0001:      bug-1114113_metadata-prevent-writing-beyond-metadata-area.patch
+Patch0002:      bug-1122666_devices-drop-open-error-message.patch
+Patch0003:      bug-1137296_pvremove-vgextend-fix-using-device-aliases-with-lvmetad.patch
 
 # SUSE patches: 1000+ for LVM
 # Never upstream
@@ -92,6 +94,8 @@ Volume Manager.
 %setup -q -n LVM2.%{version}
 ### COMMON-PREP-BEGIN ###
 %patch0001 -p1
+%patch0002 -p1
+%patch0003 -p1
 %patch1001 -p1
 %patch1002 -p1
 %patch1003 -p1