Merge pull request #65 from xcp-ng-rpms/8.2-XS82ECU1075

Import XS82ECU1075 (8.2)

SOURCES/0001-backport-of-ccd121cc248d79b749a63d4ad099e6d5f4b8b588.patch

@@ -1,4 +1,4 @@
-From a365619c2835e593259dad3c26761575f64066d6 Mon Sep 17 00:00:00 2001
+From 705a6d9deed2ba862577681fc54df144060f3816 Mon Sep 17 00:00:00 2001
 From: Mark Syms <[email protected]>
 Date: Thu, 20 May 2021 17:40:06 +0100
 Subject: [PATCH 01/23] backport of ccd121cc248d79b749a63d4ad099e6d5f4b8b588:

SOURCES/0002-Update-xs-sm.service-s-description-for-XCP-ng.patch

@@ -1,4 +1,4 @@
-From 283242d159438c4b301e153a95adde5dfaea3b58 Mon Sep 17 00:00:00 2001
+From fd898b82d880619f0acd9d1b8f1d55b3967bc339 Mon Sep 17 00:00:00 2001
 From: Samuel Verschelde <[email protected]>
 Date: Thu, 13 Aug 2020 15:22:17 +0200
 Subject: [PATCH 02/23] Update xs-sm.service's description for XCP-ng

SOURCES/0003-Add-TrueNAS-multipath-config.patch

@@ -1,4 +1,4 @@
-From d6528d899b762ec5d7ceec1fb9c8b13c2c7e6f73 Mon Sep 17 00:00:00 2001
+From bd709621897bda8d9f14820fb3d52eecfe51facb Mon Sep 17 00:00:00 2001
 From: Samuel Verschelde <[email protected]>
 Date: Thu, 13 Aug 2020 15:26:43 +0200
 Subject: [PATCH 03/23] Add TrueNAS multipath config
@@ -10,12 +10,12 @@ forked git repo for sm in the xcp-ng github organisation.
  1 file changed, 7 insertions(+)
 
 diff --git a/multipath/multipath.conf b/multipath/multipath.conf
-index 9f3dfa72..f63506d8 100644
+index 5902a96a..6dbd5bf8 100644
 --- a/multipath/multipath.conf
 +++ b/multipath/multipath.conf
-@@ -116,4 +116,11 @@ devices {
-         prio                        alua
-         failback                    immediate
+@@ -154,4 +154,11 @@ devices {
+         rr_min_io_rq                1
+         rr_weight                   uniform
      }
 +	device {
 +		vendor			"TrueNAS"

SOURCES/0004-feat-drivers-add-CephFS-GlusterFS-and-XFS-drivers.patch

@@ -1,4 +1,4 @@
-From 13542e244eea28a4c60708de99a50fa8c3d4ec5a Mon Sep 17 00:00:00 2001
+From 574897552a11af6fc92e145df0bacb42a2ac6b53 Mon Sep 17 00:00:00 2001
 From: Ronan Abhamon <[email protected]>
 Date: Mon, 20 Jul 2020 16:26:42 +0200
 Subject: [PATCH 04/23] feat(drivers): add CephFS, GlusterFS and XFS drivers

SOURCES/0005-feat-drivers-add-ZFS-driver-to-avoid-losing-VDI-meta.patch

@@ -1,4 +1,4 @@
-From 4525a55b84eb46f4c67797da6eaf61a329dac9d7 Mon Sep 17 00:00:00 2001
+From 3a948fe3ff75146c3a9c960768ca4791c109a6b6 Mon Sep 17 00:00:00 2001
 From: Ronan Abhamon <[email protected]>
 Date: Wed, 12 Aug 2020 11:14:33 +0200
 Subject: [PATCH 05/23] feat(drivers): add ZFS driver to avoid losing VDI

SOURCES/0006-Re-add-the-ext4-driver-for-users-who-need-to-transit.patch

@@ -1,4 +1,4 @@
-From 5987a43e40444a524768b1434de1a67c6e53000a Mon Sep 17 00:00:00 2001
+From 8b1962f5d6d8b092525e94241df033e4a78872b1 Mon Sep 17 00:00:00 2001
 From: Samuel Verschelde <[email protected]>
 Date: Thu, 13 Aug 2020 17:10:12 +0200
 Subject: [PATCH 06/23] Re-add the ext4 driver for users who need to transition

SOURCES/0007-feat-drivers-add-LinstorSR-driver.patch

@@ -1,4 +1,4 @@
-From 2c71c3ce33cd02573824a57bd4b3917b45c890b0 Mon Sep 17 00:00:00 2001
+From 9b836e9e503354796a7f975bb44f10a0920f33e3 Mon Sep 17 00:00:00 2001
 From: Ronan Abhamon <[email protected]>
 Date: Mon, 16 Mar 2020 15:39:44 +0100
 Subject: [PATCH 07/23] feat(drivers): add LinstorSR driver

SOURCES/0008-feat-tests-add-unit-tests-concerning-ZFS-close-xcp-n.patch

@@ -1,4 +1,4 @@
-From 89cee57b097a681edc800be05d1dfc7d97aec995 Mon Sep 17 00:00:00 2001
+From c756b29ce80da0cd38f88bbaaddf4e1130962af9 Mon Sep 17 00:00:00 2001
 From: Ronan Abhamon <[email protected]>
 Date: Tue, 27 Oct 2020 15:04:36 +0100
 Subject: [PATCH 08/23] feat(tests): add unit tests concerning ZFS (close

SOURCES/0009-If-no-NFS-ACLs-provided-assume-everyone.patch

@@ -1,4 +1,4 @@
-From c338e356dcad6ad17b2f2248ff45fcf983173e0e Mon Sep 17 00:00:00 2001
+From c4402ded6d0dd748435c621c7d7840cb7886bc3f Mon Sep 17 00:00:00 2001
 From: BenjiReis <[email protected]>
 Date: Thu, 25 Feb 2021 09:54:52 +0100
 Subject: [PATCH 09/23] If no NFS ACLs provided, assume everyone:

SOURCES/0010-Added-SM-Driver-for-MooseFS.patch

@@ -1,4 +1,4 @@
-From 359dd15436b153bedf32af7768973febc2b84c2f Mon Sep 17 00:00:00 2001
+From ba6e2bace64965d7d9f89e6dd9a94bf22ae075a2 Mon Sep 17 00:00:00 2001
 From: Aleksander Wieliczko <[email protected]>
 Date: Fri, 29 Jan 2021 15:21:23 +0100
 Subject: [PATCH 10/23] Added SM Driver for MooseFS

SOURCES/0011-Avoid-usage-of-umount-in-ISOSR-when-legacy_mode-is-u.patch

@@ -1,4 +1,4 @@
-From c984a5c3510b12c44a9fd2d0297cdb21111d20f7 Mon Sep 17 00:00:00 2001
+From dc7619735961b1fc0b7075cdc02ba375b76aa011 Mon Sep 17 00:00:00 2001
 From: Ronan Abhamon <[email protected]>
 Date: Thu, 2 Dec 2021 09:28:37 +0100
 Subject: [PATCH 11/23] Avoid usage of `umount` in `ISOSR` when `legacy_mode`

SOURCES/0012-MooseFS-SR-uses-now-UUID-subdirs-for-each-SR.patch

@@ -1,4 +1,4 @@
-From c701f410bdac559ac8384da2f8b40833e5e89866 Mon Sep 17 00:00:00 2001
+From a1341e33251ec40a12e0971ffeda8b935af0be93 Mon Sep 17 00:00:00 2001
 From: Ronan Abhamon <[email protected]>
 Date: Wed, 18 May 2022 17:28:09 +0200
 Subject: [PATCH 12/23] MooseFS SR uses now UUID subdirs for each SR

SOURCES/0013-Fix-is_open-call-for-many-drivers-25.patch

@@ -1,4 +1,4 @@
-From cba6bde2b5243bac634b5e5e910db685355ba83e Mon Sep 17 00:00:00 2001
+From 58c1e5a82d1b943a94a1524e52fd8bf43e916e3e Mon Sep 17 00:00:00 2001
 From: Ronan Abhamon <[email protected]>
 Date: Thu, 23 Jun 2022 10:36:36 +0200
 Subject: [PATCH 13/23] Fix is_open call for many drivers (#25)

SOURCES/0014-Remove-SR_CACHING-capability-for-many-SR-types-24.patch

@@ -1,4 +1,4 @@
-From bf7577ff65e882686af8e7ca1748cfb0b7934a14 Mon Sep 17 00:00:00 2001
+From 9d45a0e68acbcaec82a36c74f91dfa176b4fc7bf Mon Sep 17 00:00:00 2001
 From: Ronan Abhamon <[email protected]>
 Date: Thu, 23 Jun 2022 10:37:07 +0200
 Subject: [PATCH 14/23] Remove SR_CACHING capability for many SR types (#24)

SOURCES/0015-Remove-SR_PROBE-from-ZFS-capabilities-37.patch

@@ -1,4 +1,4 @@
-From 1a7496b75ae96edf79f2da481b54b80e8d2925f8 Mon Sep 17 00:00:00 2001
+From ee2433b00bea733c8ec0d294ffb476e04e7e5bdb Mon Sep 17 00:00:00 2001
 From: BenjiReis <[email protected]>
 Date: Fri, 4 Aug 2023 12:10:08 +0200
 Subject: [PATCH 15/23] Remove `SR_PROBE` from ZFS capabilities (#37)

SOURCES/0016-Fix-vdi-ref-when-static-vdis-are-used.patch

@@ -1,4 +1,4 @@
-From 37c79431e2c6654c5afdb6cde6e23c4c321c4cda Mon Sep 17 00:00:00 2001
+From a14e7dbb656f0c722e85cacf4ad658695e086502 Mon Sep 17 00:00:00 2001
 From: Guillaume <[email protected]>
 Date: Wed, 16 Aug 2023 13:42:21 +0200
 Subject: [PATCH 16/23] Fix vdi-ref when static vdis are used

SOURCES/0017-Tell-users-not-to-edit-multipath.conf-directly.patch

@@ -1,4 +1,4 @@
-From 9bfcb0be3ff34354c9299bf6e0a90e691f14e813 Mon Sep 17 00:00:00 2001
+From 1cf0c93a4e8c1de3688115954a8d4a8d4c25830d Mon Sep 17 00:00:00 2001
 From: Samuel Verschelde <[email protected]>
 Date: Fri, 27 Jan 2023 12:03:15 +0100
 Subject: [PATCH 17/23] Tell users not to edit multipath.conf directly
@@ -14,7 +14,7 @@ Signed-off-by: Samuel Verschelde <[email protected]>
  1 file changed, 8 insertions(+)
 
 diff --git a/multipath/multipath.conf b/multipath/multipath.conf
-index f63506d8..c854b577 100644
+index 6dbd5bf8..ede40bad 100644
 --- a/multipath/multipath.conf
 +++ b/multipath/multipath.conf
 @@ -1,3 +1,11 @@

SOURCES/0018-Add-custom.conf-multipath-configuration-file.patch

@@ -1,4 +1,4 @@
-From 383f9128fb1a788074a5a6aca09a249bfeaa44f5 Mon Sep 17 00:00:00 2001
+From c8e7d59b6c9b68f9e5ef89d0ad87c157bb35c736 Mon Sep 17 00:00:00 2001
 From: Samuel Verschelde <[email protected]>
 Date: Fri, 27 Jan 2023 12:23:13 +0100
 Subject: [PATCH 18/23] Add custom.conf multipath configuration file

SOURCES/0019-Install-etc-multipath-conf.d-custom.conf.patch

@@ -1,4 +1,4 @@
-From 507c2f067878ee88765c5750d3e618c8c63208c7 Mon Sep 17 00:00:00 2001
+From 81b847dca6a48d73936592820a1a7b88ae1ff5cc Mon Sep 17 00:00:00 2001
 From: Samuel Verschelde <[email protected]>
 Date: Fri, 25 Aug 2023 17:47:34 +0200
 Subject: [PATCH 19/23] Install /etc/multipath/conf.d/custom.conf

SOURCES/0020-Backport-NFS4-only-support.patch

@@ -1,4 +1,4 @@
-From 2d197ca1c046dce44579f77f4e2ac23397edb9c1 Mon Sep 17 00:00:00 2001
+From fe5a7b355ea6820036cfeef3847b2bec28567632 Mon Sep 17 00:00:00 2001
 From: Benjamin Reis <[email protected]>
 Date: Mon, 18 Dec 2023 10:22:26 +0100
 Subject: [PATCH 20/23] Backport NFS4 only support

SOURCES/0021-Backport-probe-for-NFS4-when-rpcinfo-does-not-includ.patch

@@ -1,4 +1,4 @@
-From bcebd6854894ddd9cc6af7d41a54daab7a45f7be Mon Sep 17 00:00:00 2001
+From eea13526d4e202e395d1a4289f837b0171a73b8e Mon Sep 17 00:00:00 2001
 From: Benjamin Reis <[email protected]>
 Date: Mon, 18 Dec 2023 10:35:46 +0100
 Subject: [PATCH 21/23] Backport probe for NFS4 when rpcinfo does not include

SOURCES/0022-feat-LargeBlock-backport-of-largeblocksr-51-55.patch

@@ -1,4 +1,4 @@
-From 52d495879ebf8c1caee78f3e10f7febd65d8ccd3 Mon Sep 17 00:00:00 2001
+From 05e5ce03d6fd4523a942345cf49cc41eebaa78f7 Mon Sep 17 00:00:00 2001
 From: Damien Thenot <[email protected]>
 Date: Tue, 7 May 2024 15:20:22 +0200
 Subject: [PATCH 22/23] feat(LargeBlock): backport of largeblocksr (#51) (#55)
@@ -358,10 +358,10 @@ index a6636c5d..d9237aa7 100755
          type = SR.TYPE_FILE
      if type in ["linstor"]:
 diff --git a/drivers/lvutil.py b/drivers/lvutil.py
-index 7e2cdaff..ac0e2e0b 100755
+index e447fde2..08c2faad 100755
 --- a/drivers/lvutil.py
 +++ b/drivers/lvutil.py
-@@ -543,13 +543,17 @@ def resizePV(dev):
+@@ -566,13 +566,17 @@ def resizePV(dev):
          cmd_lvm([CMD_PVRESIZE, dev])
      except util.CommandException, inst:
          util.SMlog("Failed to grow the PV, non-fatal")

SOURCES/0023-feat-LVHDSR-add-a-way-to-modify-config-of-LVMs-56.patch

@@ -1,4 +1,4 @@
-From ec5c7c6cd4732e7f70122ccdb8ccdaf6711e5f31 Mon Sep 17 00:00:00 2001
+From bc8ee2e18aa6ba1a8923c09ff0d765f931ddc348 Mon Sep 17 00:00:00 2001
 From: Ronan Abhamon <[email protected]>
 Date: Tue, 28 May 2024 15:17:21 +0200
 Subject: [PATCH 23/23] feat(LVHDSR): add a way to modify config of LVMs (#56)

SOURCES/CA-393194-Fix-pvremove-failure

@@ -0,0 +1,75 @@
+CA-393194: Fix pvremove failure
+
+From: Stephen Cheng <[email protected]>
+
+In lvmohba test, the test failed at
+`SR.destroy(sr_ref) -> removeVG -> pvremove ` with the
+lvm error message "No devices to process".
+The root cause is that the PV which was to be removed
+was not really used as PV when it comes to multipathed devices.
+The LVM official document says:
+"Since each LUN has multiple device nodes in /dev 
+that point to the same underlying data,
+they all contain the same LVM metadata
+and thus LVM commands will find the same metadata
+multiple times and report them as duplicates.
+These duplicate messages are only warnings
+and do not mean the LVM operation has failed.
+Rather, they are alerting the user that only one of the devices
+has been used as a physical volume and the others are being ignored." 
+Please refer to https://docs.redhat.com/en/documentation/
+red_hat_enterprise_linux/6/html/logical_volume_manager_administration
+/duplicate_pv_multipath#duplicate_pv_multipath
+
+This fix is to find the real PV in a VG before removing the VG.
+
+Signed-off-by: Stephen Cheng <[email protected]>
+---
+ drivers/lvutil.py |   25 ++++++++++++++++++++++++-
+ 1 file changed, 24 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/lvutil.py b/drivers/lvutil.py
+index 7e2cdaf..e447fde 100755
+--- a/drivers/lvutil.py
++++ b/drivers/lvutil.py
+@@ -517,6 +517,27 @@ def createVG(root, vgname):
+
+     # End block
+
++def getPVsInVG(vgname):
++    # Get PVs in a specific VG
++    pvs_ret = cmd_lvm([CMD_PVS, '--separator', ' ', '--noheadings', '-o', 'pv_name,vg_name'])
++    
++    # Parse each line to extract PV and VG information
++    # No need to handle exceptions here, return empty list if any error
++    pvs_in_vg = []
++    lines = pvs_ret.strip().split('\n')
++    for line in lines:
++        # To avoid invalid return format
++        parts = line.split()
++        if len(parts) != 2:
++            util.SMlog("Warning: Invalid or empty line in pvs output: %s" % line)
++            continue
++        pv, vg = parts
++        if vg == vgname:
++            pvs_in_vg.append(pv)
++    
++    util.SMlog("PVs in VG %s: %s" % (vgname, pvs_in_vg))
++    return pvs_in_vg
++
+ def removeVG(root, vgname):
+     # Check PVs match VG
+     try:
+@@ -530,9 +551,11 @@ def removeVG(root, vgname):
+               opterr='error is %d' % inst.code)
+
+     try:
++        # Get PVs in VG before removing the VG
++        devs_in_vg = getPVsInVG(vgname)
+         cmd_lvm([CMD_VGREMOVE, vgname])
+
+-        for dev in root.split(','):
++        for dev in devs_in_vg:
+             cmd_lvm([CMD_PVREMOVE, dev])
+     except util.CommandException, inst:
+         raise xs_errors.XenError('LVMDelete', \

SOURCES/CP-49961-update-multipath

@@ -0,0 +1,68 @@
+CP-49961: update multipath config for Dell arrays
+
+From: Mark Syms <[email protected]>
+
+Signed-off-by: Mark Syms <[email protected]>
+---
+ multipath/multipath.conf |   48 +++++++++++++++++++++++-----------------------
+ 1 file changed, 24 insertions(+), 24 deletions(-)
+
+diff --git a/multipath/multipath.conf b/multipath/multipath.conf
+index 1b1c62e..cddb8ac 100644
+--- a/multipath/multipath.conf
++++ b/multipath/multipath.conf
+@@ -27,30 +27,30 @@ devices {
+ 		path_grouping_policy	failover
+ 		failback		30
+ 	}
+-	device {
+-		vendor			"DELL"
+-		product			"MD36xx(i|f)"
+-		features		"2 pg_init_retries 50"
+-		hardware_handler	"1 rdac"
+-		path_selector		"round-robin 0"
+-		path_grouping_policy	group_by_prio
+-		failback		immediate
+-		rr_min_io		100
+-		path_checker		rdac
+-		prio			rdac
+-		no_path_retry		30
+-	}
+-	device {
+-		vendor			"DellEMC"
+-		product			"ME4"
+-		path_grouping_policy	"group_by_prio"
+-		path_checker		"tur"
+-		hardware_handler	"1 alua"
+-		prio			"alua"
+-		failback		immediate
+-		rr_weight		"uniform"
+-		path_selector		"service-time 0"
+-	}
++    device {
++        vendor                      "DELL"
++        product                     "MD3(2|4|6|8)xx(i|f)?"
++        features                    "2 pg_init_retries 50"
++        hardware_handler            "1 rdac"
++        path_selector               "round-robin 0"
++        path_grouping_policy        group_by_prio
++        failback                    immediate
++        rr_min_io                   100
++        path_checker                rdac
++        prio                        rdac
++        no_path_retry               30
++    }
++    device {
++        vendor                      "DellEMC"
++        product                     "ME(4|5)"
++        path_grouping_policy        "group_by_prio"
++        path_checker                "tur"
++        hardware_handler            "1 alua"
++        prio                        "alua"
++        failback                    immediate
++        rr_weight                   "uniform"
++        path_selector               "service-time 0"
++    }
+ 	device {
+ 		vendor			"DGC"
+ 		product			".*"

SOURCES/CP-50251-update-multipath

@@ -0,0 +1,33 @@
+CP-50251: update multipath configuration for IBM SVC 2145/2147
+
+From: Mark Syms <[email protected]>
+
+Signed-off-by: Mark Syms <[email protected]>
+---
+ multipath/multipath.conf |   13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/multipath/multipath.conf b/multipath/multipath.conf
+index cddb8ac..f7c23fe 100644
+--- a/multipath/multipath.conf
++++ b/multipath/multipath.conf
+@@ -84,6 +84,19 @@ devices {
+ 		path_checker		rdac
+ 		prio			rdac
+ 	}
++    device {
++        vendor                      "IBM"
++        product                     "2145"
++        path_grouping_policy        "group_by_prio"
++        path_selector               "service-time 0"
++        prio                        "alua"
++        path_checker                "tur"
++        failback                    "immediate"
++        no_path_retry               5
++        rr_weight                   uniform
++        rr_min_io_rq                "1"
++        dev_loss_tmo                120
++    }
+ 	device {
+ 		vendor			"LIO-ORG"
+ 		hardware_handler	"1 alua"

SOURCES/clean-up-regex-on-hp-hpe

@@ -0,0 +1,26 @@
+Clean up regex on HP/HPE appliance in multipath.conf
+
+From: Peter Wells <[email protected]>
+
+Cleaned up the regex on the newly added HP/HPE appliance in multipath.conf
+
+Signed-off-by: Peter Wells <[email protected]>
+---
+ multipath/multipath.conf |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/multipath/multipath.conf b/multipath/multipath.conf
+index 184430b..1b1c62e 100644
+--- a/multipath/multipath.conf
++++ b/multipath/multipath.conf
+@@ -117,8 +117,8 @@ devices {
+         failback                    immediate
+     }
+     device {
+-        vendor                      "HP|HPE"
+-        product                     "MSA [12]0[456]0*"
++        vendor                      "(HP|HPE)"
++        product                     "MSA [12]0[456]0 .*"
+         path_selector               "round-robin 0"
+         hardware_handler            "1 alua"
+         path_grouping_policy        group_by_prio