Merge ~paelzer/ubuntu/+source/multipath-tools:lp-1891202-sgio_get_vpd-handling into ubuntu/+source/multipath-tools:ubuntu/bionic-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Added SRU template ...
PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4282/

[Bryce Harrington (bryce)]

* Changelog:
  - [-] old content and logical tag match as expected
  - [√] changelog entry correct version and targeted codename
  - [√] changelog entries correct
  - [√] update-maintainer has been run

* Actual changes:
  - [-] no upstream changes to consider
  - [-] no further upstream version to consider
  - [√] debian changes look safe

* Old Delta:
  - [-] dropped changes are ok to be dropped
  - [-] nothing else to drop
  - [√] changes forwarded upstream/debian (if appropriate)

* New Delta:
  - [-] no new patches added
  - [√] patches match what was proposed upstream
  - [√] patches correctly included in debian/patches/series
  - [√] patches have correct DEP3 metadata

* Build/Test:
  - [√] build is ok
  - [√] verified PPA package installs/uninstalls
  - [x] autopkgtest against the PPA package passes
  - [x] sanity checks test fine

The patches look ok to me (I only did a brief skim), and the package builds ok in bileto, but on installation in a bionic lxc amd64 container I got a failure activating the service:

Setting up multipath-tools (0.7.4-2ubuntu3.1~ppa1) ...
Created symlink /etc/systemd/system/multipath-tools.service → /lib/systemd/system/multipathd.service.
Created symlink /etc/systemd/system/sysinit.target.wants/multipathd.service → /lib/systemd/system/multipathd.service.
multipathd.socket is a disabled or a static unit, not starting it.
Job for multipathd.service failed because the control process exited with error code.
See "systemctl status multipathd.service" and "journalctl -xe" for details.
invoke-rc.d: initscript multipath-tools, action "start" failed.
● multipathd.service - Device-Mapper Multipath Device Controller
   Loaded: loaded (/lib/systemd/system/multipathd.service; enabled; vendor preset: enabled)
   Active: failed (Result: exit-code) since Sat 2020-10-24 00:42:45 UTC; 17ms ago
  Process: 1929 ExecStart=/sbin/multipathd -d -s (code=exited, status=1/FAILURE)
  Process: 1928 ExecStartPre=/sbin/modprobe -a scsi_dh_alua scsi_dh_emc scsi_dh_rdac dm-multipath (code=exited, status=1/FAILURE)
 Main PID: 1929 (code=exited, status=1/FAILURE)
   Status: "configure"

Oct 24 00:42:45 multipath-tools-review-mp392693-sgio-bionic multipathd[1929]: read /etc/multipath.conf
Oct 24 00:42:45 multipath-tools-review-mp392693-sgio-bionic multipathd[1929]: path checkers start up
Oct 24 00:42:45 multipath-tools-review-mp392693-sgio-bionic multipathd[1929]: failed to increase buffer size
Oct 24 00:42:45 multipath-tools-review-mp392693-sgio-bionic multipathd[1929]: /dev/mapper/control: mknod failed: Operation not permitted
Oct 24 00:42:45 multipath-tools-review-mp392693-sgio-bionic multipathd[1929]: Failure to communicate with kernel device-mapper driver.
Oct 24 00:42:45 multipath-tools-review-mp392693-sgio-bionic multipathd[1929]: Check that device-mapper is available in the kernel.
Oct 24 00:42:45 multipath-tools-review-mp392693-sgio-bionic multipathd[1929]: Incompatible libdevmapper 1.02.145 (2017-11-03) and kernel driver (unknown version).
Oct 24 00:42:45 multipath-tools-review-mp392693-sgio-bionic systemd[1]: multipathd.service: Main process exited, code=exited, status=1/FAILURE
Oct 24 00:42:45 multipath-tools-review-mp392693-sgio...

review: Needs Information

[Christian Ehrhardt  (paelzer)]

That container fail is a correct one and not related to the update.
It just happens to fail to talk to the kernel device mapper.
Pre-Fix behaves just the same.

In a VM or BareMetal system it (the PPA build) works fine.

The underlying issue is fixed in later releases
There it isn't trying to start in containers.

root@f:~# systemctl status multipathd
● multipathd.service - Device-Mapper Multipath Device Controller
     Loaded: loaded (/lib/systemd/system/multipathd.service; enabled; vendor preset: enabled)
     Active: inactive (dead)
TriggeredBy: ● multipathd.socket
  Condition: start condition failed at Fri 2020-10-23 09:42:34 UTC; 2 days ago
             └─ ConditionVirtualization=!container was not met

This was not SRUed as one could try to tweak both ways.
A Bionic user could have exposed d/m/control and an update "fixing this" would break him.
On the upgrade to Focal this would be ok to change and those who want to enable there can override the unit to do so.
Therefore this is all fine as it is.

Thanks for the thought thou, always better to re-check such things.

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/multipath-tools
 * [new tag] upload/0.7.4-2ubuntu3.1 -> upload/0.7.4-2ubuntu3.1

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading multipath-tools_0.7.4-2ubuntu3.1.dsc: done.
  Uploading multipath-tools_0.7.4-2ubuntu3.1.debian.tar.xz: done.
  Uploading multipath-tools_0.7.4-2ubuntu3.1_source.buildinfo: done.
  Uploading multipath-tools_0.7.4-2ubuntu3.1_source.changes: done.
Successfully uploaded packages.

[Christian Ehrhardt  (paelzer)]

I have re-uploaded this again ... but in terms of an MP this one is merged and can be removed from our MP overview.

diff --git a/debian/changelog b/debian/changelog
index d63df56..c53c62b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+multipath-tools (0.7.4-2ubuntu3.1) bionic; urgency=medium
+
+  * d/p/lp-1891202-*: fix handling of sgio_get_vpd for e.g. long iscsi target
+    names as generated by NetApp E-Series RDAC (LP: #1891202)
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 28 Sep 2020 16:14:24 +0200
+
 multipath-tools (0.7.4-2ubuntu3) bionic; urgency=medium
 
   * d/p/kpartx-print-loop-deleted-to-stdout-not-stderr.patch: Print loop
diff --git a/debian/patches/lp-1891202-libmultipath-Fix-sgio_get_vpd.patch b/debian/patches/lp-1891202-libmultipath-Fix-sgio_get_vpd.patch
new file mode 100644
index 0000000..6790e67
--- /dev/null
+++ b/debian/patches/lp-1891202-libmultipath-Fix-sgio_get_vpd.patch
@@ -0,0 +1,55 @@
+From 1f401b69e478b35d4b54b1980be67943c6d61d9f Mon Sep 17 00:00:00 2001
+From: Bart Van Assche <[e-mail]>
+Date: Thu, 8 Mar 2018 00:15:48 +0100
+Subject: [PATCH] libmultipath: Fix sgio_get_vpd()
+
+Pass the VPD page number to sgio_get_vpd() such that the page needed
+by the caller is queried instead of page 0x83. Fix the statement that
+computes the length of the page returned by do_inq(). Fix the return
+code check in the caller of sgio_get_vpd().
+
+Signed-off-by: Bart Van Assche <[e-mail]>
+Signed-off-by: Martin Wilck <[e-mail]>
+
+Origin: upstream, https://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=commit;h=1f401b69e
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1891202
+Last-Update: 2020-09-28
+
+---
+ libmultipath/discovery.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
+index 71c75872c..23e99f05b 100644
+--- a/libmultipath/discovery.c
++++ b/libmultipath/discovery.c
+@@ -837,6 +837,8 @@ detect_alua(struct path * pp, struct config *conf)
+ 
+ #define DEFAULT_SGIO_LEN 254
+ 
++/* Query VPD page @pg. Returns number of INQUIRY bytes
++   upon success and -1 upon failure. */
+ static int
+ sgio_get_vpd (unsigned char * buff, int maxlen, int fd, int pg)
+ {
+@@ -848,7 +850,7 @@ sgio_get_vpd (unsigned char * buff, int maxlen, int fd, int pg)
+ 	}
+ retry:
+ 	if (0 == do_inq(fd, 0, 1, pg, buff, len)) {
+-		len = buff[3] + (buff[2] << 8);
++		len = buff[3] + (buff[2] << 8) + 4;
+ 		if (len >= maxlen)
+ 			return len;
+ 		if (len > DEFAULT_SGIO_LEN)
+@@ -1100,7 +1102,7 @@ get_vpd_sgio (int fd, int pg, char * str, int maxlen)
+ 	unsigned char buff[4096];
+ 
+ 	memset(buff, 0x0, 4096);
+-	if (sgio_get_vpd(buff, 4096, fd, pg) <= 0) {
++	if (sgio_get_vpd(buff, 4096, fd, pg) < 0) {
+ 		condlog(3, "failed to issue vpd inquiry for pg%02x",
+ 			pg);
+ 		return -errno;
+-- 
+2.28.0
+
diff --git a/debian/patches/lp-1891202-libmultipath-fix-return-code-of-sgio_get_vpd.patch b/debian/patches/lp-1891202-libmultipath-fix-return-code-of-sgio_get_vpd.patch
new file mode 100644
index 0000000..6ee3b2f
--- /dev/null
+++ b/debian/patches/lp-1891202-libmultipath-fix-return-code-of-sgio_get_vpd.patch
@@ -0,0 +1,32 @@
+From c6140952d1b682261c07cdb7138c944ee83d8809 Mon Sep 17 00:00:00 2001
+From: Martin Wilck <[e-mail]>
+Date: Sat, 13 Jan 2018 22:19:23 +0100
+Subject: [PATCH] libmultipath: fix return code of sgio_get_vpd()
+
+This function must return the length of data received in success
+case.
+
+Origin: upstream, https://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=commit;h=c6140952d
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1891202
+Last-Update: 2020-09-28
+
+---
+ libmultipath/discovery.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
+index ab7794d8d..c53d3aab8 100644
+--- a/libmultipath/discovery.c
++++ b/libmultipath/discovery.c
+@@ -852,7 +852,7 @@ retry:
+ 			return len;
+ 		if (len > DEFAULT_SGIO_LEN)
+ 			goto retry;
+-		return 0;
++		return len;
+ 	}
+ 	return -1;
+ }
+-- 
+2.28.0
+
diff --git a/debian/patches/lp-1891202-libmultipath-get_vpd_sgio-support-VPD-0xc9.patch b/debian/patches/lp-1891202-libmultipath-get_vpd_sgio-support-VPD-0xc9.patch
new file mode 100644
index 0000000..f26664d
--- /dev/null
+++ b/debian/patches/lp-1891202-libmultipath-get_vpd_sgio-support-VPD-0xc9.patch
@@ -0,0 +1,35 @@
+From 9d0e6bffbb3e490e92cf91444cfeb4177d540707 Mon Sep 17 00:00:00 2001
+From: Martin Wilck <[e-mail]>
+Date: Sat, 13 Jan 2018 22:19:25 +0100
+Subject: [PATCH] libmultipath: get_vpd_sgio: support VPD 0xc9
+
+This VPD is needed to check for NetApp E-Series RDAC support.
+
+Origin: upstream, https://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=commit;h=9d0e6bffb
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1891202
+Last-Update: 2020-09-28
+
+---
+ libmultipath/discovery.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
+index 43631c46f..8ae170ee3 100644
+--- a/libmultipath/discovery.c
++++ b/libmultipath/discovery.c
+@@ -1118,7 +1118,11 @@ get_vpd_sgio (int fd, int pg, char * str, int maxlen)
+ 		len = parse_vpd_pg80(buff, str, maxlen);
+ 	else if (pg == 0x83)
+ 		len = parse_vpd_pg83(buff, buff_len, str, maxlen);
+-	else
++	else if (pg == 0xc9 && maxlen >= 8) {
++		len = buff_len < 8 ? -ENODATA :
++			(buff_len <= maxlen ? buff_len : maxlen);
++		memcpy (str, buff, len);
++	} else
+ 		len = -ENOSYS;
+ 
+ 	return len;
+-- 
+2.28.0
+
diff --git a/debian/patches/lp-1891202-libmultipath-sgio_get_vpd-add-page-argument.patch b/debian/patches/lp-1891202-libmultipath-sgio_get_vpd-add-page-argument.patch
new file mode 100644
index 0000000..4b19b2d
--- /dev/null
+++ b/debian/patches/lp-1891202-libmultipath-sgio_get_vpd-add-page-argument.patch
@@ -0,0 +1,50 @@
+From d74a79f3590f3f28d34287b64c565fd5bf9705d0 Mon Sep 17 00:00:00 2001
+From: Martin Wilck <[e-mail]>
+Date: Sat, 13 Jan 2018 22:19:24 +0100
+Subject: [PATCH] libmultipath: sgio_get_vpd: add page argument
+
+get_vpd_sgio() assumes to be able to send different VPD inquires.
+This requires passing the pg argument to sgio_get_vpd().
+
+Origin: upstream, https://git.opensvc.com/gitweb.cgi?p=multipath-tools/.git;a=commit;h=d74a79f35
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1891202
+Last-Update: 2020-09-28
+
+---
+ libmultipath/discovery.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c
+index c53d3aab8..43631c46f 100644
+--- a/libmultipath/discovery.c
++++ b/libmultipath/discovery.c
+@@ -837,7 +837,7 @@ detect_alua(struct path * pp, struct config *conf)
+ #define DEFAULT_SGIO_LEN 254
+ 
+ static int
+-sgio_get_vpd (unsigned char * buff, int maxlen, int fd)
++sgio_get_vpd (unsigned char * buff, int maxlen, int fd, int pg)
+ {
+ 	int len = DEFAULT_SGIO_LEN;
+ 
+@@ -846,7 +846,7 @@ sgio_get_vpd (unsigned char * buff, int maxlen, int fd)
+ 		return -1;
+ 	}
+ retry:
+-	if (0 == do_inq(fd, 0, 1, 0x83, buff, len)) {
++	if (0 == do_inq(fd, 0, 1, pg, buff, len)) {
+ 		len = buff[3] + (buff[2] << 8);
+ 		if (len >= maxlen)
+ 			return len;
+@@ -1099,7 +1099,7 @@ get_vpd_sgio (int fd, int pg, char * str, int maxlen)
+ 	unsigned char buff[4096];
+ 
+ 	memset(buff, 0x0, 4096);
+-	if (sgio_get_vpd(buff, 4096, fd) <= 0) {
++	if (sgio_get_vpd(buff, 4096, fd, pg) <= 0) {
+ 		condlog(3, "failed to issue vpd inquiry for pg%02x",
+ 			pg);
+ 		return -errno;
+-- 
+2.28.0
+
diff --git a/debian/patches/series b/debian/patches/series
index 61f388a..e1c6497 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,7 @@ enable-find-multipaths.patch
 RH-trigger-change-uevent-on-new-device-creation.patch
 kpartx-Improve-finding-loopback-device-by-file.patch
 kpartx-print-loop-deleted-to-stdout-not-stderr.patch
+lp-1891202-libmultipath-fix-return-code-of-sgio_get_vpd.patch
+lp-1891202-libmultipath-sgio_get_vpd-add-page-argument.patch
+lp-1891202-libmultipath-get_vpd_sgio-support-VPD-0xc9.patch
+lp-1891202-libmultipath-Fix-sgio_get_vpd.patch