Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 0179-feat-Linstor-rewrite-linstorhostcall-logic.patch #51

Open
wants to merge 8 commits into
base: 8.2-linstor
Choose a base branch
from
Open
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From a365619c2835e593259dad3c26761575f64066d6 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:
Subject: [PATCH 001/180] backport of ccd121cc248d79b749a63d4ad099e6d5f4b8b588:
CA-354692: check for device parameter in create/probe calls

Signed-off-by: Mark Syms <[email protected]>
Expand Down Expand Up @@ -87,5 +87,5 @@ index aa5a6b1..c752863 100755
def registerSR(SRClass):
"""Register SR with handler. All SR subclasses should call this in
--
2.44.0
2.46.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 283242d159438c4b301e153a95adde5dfaea3b58 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
Subject: [PATCH 002/180] Update xs-sm.service's description for XCP-ng

This was a patch added to the sm RPM git repo before we had this
forked git repo for sm in the xcp-ng github organisation.
Expand All @@ -21,5 +21,5 @@ index 99cb313..609c6ef 100644
Conflicts=shutdown.target
RefuseManualStop=yes
--
2.44.0
2.46.0

4 changes: 2 additions & 2 deletions SOURCES/0003-Add-TrueNAS-multipath-config.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From d6528d899b762ec5d7ceec1fb9c8b13c2c7e6f73 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
Subject: [PATCH 003/180] Add TrueNAS multipath config

This was a patch added to the sm RPM git repo before we had this
forked git repo for sm in the xcp-ng github organisation.
Expand All @@ -26,5 +26,5 @@ index 9f3dfa7..f63506d 100644
+ }
}
--
2.44.0
2.46.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 13542e244eea28a4c60708de99a50fa8c3d4ec5a 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
Subject: [PATCH 004/180] feat(drivers): add CephFS, GlusterFS and XFS drivers

---
Makefile | 3 +
Expand Down Expand Up @@ -888,5 +888,5 @@ index dce460e..aff51ae 100755
if not type in SR.TYPES:
raise util.SMException("Unsupported SR type: %s" % type)
--
2.44.0
2.46.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 4525a55b84eb46f4c67797da6eaf61a329dac9d7 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
Subject: [PATCH 005/180] feat(drivers): add ZFS driver to avoid losing VDI
metadata (xcp-ng/xcp#401)

---
Expand Down Expand Up @@ -201,5 +201,5 @@ index aff51ae..feb7c18 100755
type = SR.TYPE_FILE
if not type in SR.TYPES:
--
2.44.0
2.46.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
From 5987a43e40444a524768b1434de1a67c6e53000a 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
Subject: [PATCH 006/180] Re-add the ext4 driver for users who need to
transition

The driver is needed to transition to the ext driver.
Users who upgrade from XCP-ng <= 8.0 need a working driver so that they
Expand Down Expand Up @@ -287,5 +288,5 @@ index feb7c18..12e4428 100755
type = SR.TYPE_FILE
if not type in SR.TYPES:
--
2.44.0
2.46.0

4 changes: 2 additions & 2 deletions SOURCES/0007-feat-drivers-add-LinstorSR-driver.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 2c71c3ce33cd02573824a57bd4b3917b45c890b0 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
Subject: [PATCH 007/180] feat(drivers): add LinstorSR driver

Some important points:

Expand Down Expand Up @@ -5680,5 +5680,5 @@ diff --git a/tests/mocks/linstor/__init__.py b/tests/mocks/linstor/__init__.py
new file mode 100644
index 0000000..e69de29
--
2.44.0
2.46.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 89cee57b097a681edc800be05d1dfc7d97aec995 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
Subject: [PATCH 008/180] feat(tests): add unit tests concerning ZFS (close
xcp-ng/xcp#425)

- Check if "create" doesn't succeed without zfs packages
Expand Down Expand Up @@ -205,5 +205,5 @@ index 0000000..6f8040d
+ failed = True
+ self.assertTrue(failed)
--
2.44.0
2.46.0

4 changes: 2 additions & 2 deletions SOURCES/0009-If-no-NFS-ACLs-provided-assume-everyone.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From c338e356dcad6ad17b2f2248ff45fcf983173e0e 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:
Subject: [PATCH 009/180] If no NFS ACLs provided, assume everyone:

Some QNAP devices do not provide ACL when fetching NFS mounts.
In this case the assumed ACL should be: "*".
Expand Down Expand Up @@ -71,5 +71,5 @@ index 71800ab..cef414f 100644
+ self.assertEqual(len(pread2.mock_calls), 1)
+ pread2.assert_called_with(['/usr/sbin/showmount', '--no-headers', '-e', 'aServer'])
--
2.44.0
2.46.0

4 changes: 2 additions & 2 deletions SOURCES/0010-Added-SM-Driver-for-MooseFS.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 359dd15436b153bedf32af7768973febc2b84c2f 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
Subject: [PATCH 010/180] Added SM Driver for MooseFS

Co-authored-by: Piotr Robert Konopelko <[email protected]>
Signed-off-by: Aleksander Wieliczko <[email protected]>
Expand Down Expand Up @@ -386,5 +386,5 @@ index 0000000..5a61cf5
+ mfssr.detach('asr_uuid')
+ self.assertTrue(mfssr.attached)
--
2.44.0
2.46.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From c984a5c3510b12c44a9fd2d0297cdb21111d20f7 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`
Subject: [PATCH 011/180] Avoid usage of `umount` in `ISOSR` when `legacy_mode`
is used

`umount` should not be called when `legacy_mode` is enabled, otherwise a mounted dir
Expand Down Expand Up @@ -103,5 +103,5 @@ index 7655f14..03c8851 100644
class TestISOSR_overNFS(unittest.TestCase):

--
2.44.0
2.46.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From c701f410bdac559ac8384da2f8b40833e5e89866 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
Subject: [PATCH 012/180] MooseFS SR uses now UUID subdirs for each SR

A sm-config boolean param `subdir` is available to configure where to store the VHDs:
- In a subdir with the SR UUID, the new behavior
Expand Down Expand Up @@ -126,5 +126,5 @@ index be5112c..ab72f4e 100755
self.detach(sr_uuid)
if inst.code != errno.ENOENT:
--
2.44.0
2.46.0

4 changes: 2 additions & 2 deletions SOURCES/0013-Fix-is_open-call-for-many-drivers-25.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From cba6bde2b5243bac634b5e5e910db685355ba83e 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)
Subject: [PATCH 013/180] Fix is_open call for many drivers (#25)

Ensure all shared drivers are imported in `_is_open` definition to register
them in the driver list. Otherwise this function always fails with a SRUnknownType exception.
Expand Down Expand Up @@ -104,5 +104,5 @@ index 0d60d96..534e6c9 100755

driver = SR.driver(srType)
--
2.44.0
2.46.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From bf7577ff65e882686af8e7ca1748cfb0b7934a14 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)
Subject: [PATCH 014/180] Remove SR_CACHING capability for many SR types (#24)

SR_CACHING offers the capacity to use IntelliCache, but this
feature is only available using NFS SR.
Expand Down Expand Up @@ -56,5 +56,5 @@ index ab72f4e..212f1ad 100755
"VDI_UPDATE", "VDI_CLONE", "VDI_SNAPSHOT", "VDI_RESIZE", "VDI_MIRROR",
"VDI_GENERATE_CONFIG",
--
2.44.0
2.46.0

4 changes: 2 additions & 2 deletions SOURCES/0015-Remove-SR_PROBE-from-ZFS-capabilities-37.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 1a7496b75ae96edf79f2da481b54b80e8d2925f8 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)
Subject: [PATCH 015/180] Remove `SR_PROBE` from ZFS capabilities (#37)

The probe method is not implemented so we
shouldn't advertise it.
Expand All @@ -24,5 +24,5 @@ index d375210..b803211 100644
'VDI_CREATE',
'VDI_DELETE',
--
2.44.0
2.46.0

4 changes: 2 additions & 2 deletions SOURCES/0016-Fix-vdi-ref-when-static-vdis-are-used.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 37c79431e2c6654c5afdb6cde6e23c4c321c4cda 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
Subject: [PATCH 016/180] Fix vdi-ref when static vdis are used

When static vdis are used there is no snapshots and we don't want to
call method from XAPI.
Expand Down Expand Up @@ -32,5 +32,5 @@ index dd8e20b..6ac3f80 100755
if needDeflate:
try:
--
2.44.0
2.46.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 9bfcb0be3ff34354c9299bf6e0a90e691f14e813 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
Subject: [PATCH 017/180] Tell users not to edit multipath.conf directly

This file is meant to remain unchanged and regularly updated along with
the SM component. Users can create a custom configuration file in
Expand Down Expand Up @@ -30,5 +30,5 @@ index f63506d..c854b57 100644
# multipathd.
# For information on the syntax refer to `man multipath.conf` and the examples
--
2.44.0
2.46.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 383f9128fb1a788074a5a6aca09a249bfeaa44f5 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
Subject: [PATCH 018/180] Add custom.conf multipath configuration file

Meant to be installed as /etc/multipath/conf.d/custom.conf for users
to have an easy entry point for editing, as well as information on what
Expand All @@ -27,5 +27,5 @@ index 0000000..3c8583f
+
+# Refer to "man multipath.conf"
--
2.44.0
2.46.0

4 changes: 2 additions & 2 deletions SOURCES/0019-Install-etc-multipath-conf.d-custom.conf.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 507c2f067878ee88765c5750d3e618c8c63208c7 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
Subject: [PATCH 019/180] Install /etc/multipath/conf.d/custom.conf

Update Makefile so that the file is installed along with sm.

Expand Down Expand Up @@ -48,5 +48,5 @@ index b0ae353..3357cbf 100755
$(SM_STAGING)/$(INIT_DIR)
install -m 755 multipath/multipath-root-setup \
--
2.44.0
2.46.0

4 changes: 2 additions & 2 deletions SOURCES/0020-Backport-NFS4-only-support.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 2d197ca1c046dce44579f77f4e2ac23397edb9c1 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
Subject: [PATCH 020/180] Backport NFS4 only support

See: https://github.com/xapi-project/sm/pull/617

Expand Down Expand Up @@ -426,5 +426,5 @@ index cef414f..9ea807f 100644
expected = """<?xml version="1.0" ?>
<nfs-exports>
--
2.44.0
2.46.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From bcebd6854894ddd9cc6af7d41a54daab7a45f7be 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
Subject: [PATCH 021/180] Backport probe for NFS4 when rpcinfo does not include
it

See: https://github.com/xapi-project/sm/pull/655
Expand Down Expand Up @@ -164,5 +164,5 @@ index 9ea807f..3874d8e 100644
return ([binary, 'remoteserver:remotepath', 'mountpoint', '-o',
'soft,proto=transport,vers=%s,acdirmin=0,acdirmax=0' % vers])
--
2.44.0
2.46.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
From 52d495879ebf8c1caee78f3e10f7febd65d8ccd3 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)
Subject: [PATCH 022/180] feat(LargeBlock): backport of largeblocksr (#51)
(#55)

A SR inheriting from a EXTSR allowing to use a 4KiB blocksize device as
SR.
Expand Down Expand Up @@ -395,5 +396,5 @@ index 534e6c9..3c7bd34 100755
import LVHDSR
import MooseFSSR
--
2.44.0
2.46.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
From ec5c7c6cd4732e7f70122ccdb8ccdaf6711e5f31 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)
Subject: [PATCH 023/180] feat(LVHDSR): add a way to modify config of LVMs
(#56)

With this change the driver supports a "lvm-conf" param on "other-config".
For now The configuration is only used by "remove" calls from LVMCache.
Expand Down Expand Up @@ -105,5 +106,5 @@ index ea0bc17..54930b4 100644
self._removeTag(lvName, tag)
del self.lvs[lvName]
--
2.44.0
2.46.0

Loading