Skip to content

Commit

Permalink
Add 0178-linstor-Fix-to-add-sync-to-DD.patch
Browse files Browse the repository at this point in the history
Signed-off-by: Damien Thenot <[email protected]>
  • Loading branch information
Nambrok committed Nov 12, 2024
1 parent 1ce9275 commit c18c16c
Show file tree
Hide file tree
Showing 179 changed files with 528 additions and 501 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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 001/177] backport of ccd121cc248d79b749a63d4ad099e6d5f4b8b588:
Subject: [PATCH 001/178] backport of ccd121cc248d79b749a63d4ad099e6d5f4b8b588:
CA-354692: check for device parameter in create/probe calls

Signed-off-by: Mark Syms <[email protected]>
Expand All @@ -13,7 +13,7 @@ Signed-off-by: Ronan Abhamon <[email protected]>
3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/drivers/EXTSR.py b/drivers/EXTSR.py
index 4caa09df..da43082e 100755
index 4caa09d..da43082 100755
--- a/drivers/EXTSR.py
+++ b/drivers/EXTSR.py
@@ -18,6 +18,7 @@
Expand All @@ -38,7 +38,7 @@ index 4caa09df..da43082e 100755
if self._checkmount():
raise xs_errors.XenError('SRExists')
diff --git a/drivers/LVHDSR.py b/drivers/LVHDSR.py
index cfee0717..dd8e20b9 100755
index cfee071..dd8e20b 100755
--- a/drivers/LVHDSR.py
+++ b/drivers/LVHDSR.py
@@ -19,6 +19,7 @@
Expand Down Expand Up @@ -67,7 +67,7 @@ index cfee0717..dd8e20b9 100755
return lvutil.srlist_toxml(
lvutil.scan_srlist(lvhdutil.VG_PREFIX, self.dconf['device']),
diff --git a/drivers/SR.py b/drivers/SR.py
index aa5a6b1e..c7528638 100755
index aa5a6b1..c752863 100755
--- a/drivers/SR.py
+++ b/drivers/SR.py
@@ -49,6 +49,15 @@ class SROSError(SRException):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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 002/177] Update xs-sm.service's description for XCP-ng
Subject: [PATCH 002/178] 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 @@ -10,7 +10,7 @@ forked git repo for sm in the xcp-ng github organisation.
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/systemd/xs-sm.service b/systemd/xs-sm.service
index 99cb313f..609c6ef5 100644
index 99cb313..609c6ef 100644
--- a/systemd/xs-sm.service
+++ b/systemd/xs-sm.service
@@ -1,5 +1,5 @@
Expand Down
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 bd709621897bda8d9f14820fb3d52eecfe51facb Mon Sep 17 00:00:00 2001
From: Samuel Verschelde <[email protected]>
Date: Thu, 13 Aug 2020 15:26:43 +0200
Subject: [PATCH 003/177] Add TrueNAS multipath config
Subject: [PATCH 003/178] 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 @@ -10,7 +10,7 @@ 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 5902a96a..6dbd5bf8 100644
index 5902a96..6dbd5bf 100644
--- a/multipath/multipath.conf
+++ b/multipath/multipath.conf
@@ -154,4 +154,11 @@ devices {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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 004/177] feat(drivers): add CephFS, GlusterFS and XFS drivers
Subject: [PATCH 004/178] feat(drivers): add CephFS, GlusterFS and XFS drivers

---
Makefile | 3 +
Expand All @@ -15,7 +15,7 @@ Subject: [PATCH 004/177] feat(drivers): add CephFS, GlusterFS and XFS drivers
create mode 100644 drivers/XFSSR.py

diff --git a/Makefile b/Makefile
index d07a8ca3..0a10470a 100755
index d07a8ca..0a10470 100755
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,9 @@ SM_DRIVERS += OCFSoHBA
Expand All @@ -30,7 +30,7 @@ index d07a8ca3..0a10470a 100755
SM_LIBS += SRCommand
diff --git a/drivers/CephFSSR.py b/drivers/CephFSSR.py
new file mode 100644
index 00000000..d7974907
index 0000000..d797490
--- /dev/null
+++ b/drivers/CephFSSR.py
@@ -0,0 +1,296 @@
Expand Down Expand Up @@ -332,7 +332,7 @@ index 00000000..d7974907
+ SR.registerSR(CephFSSR)
diff --git a/drivers/GlusterFSSR.py b/drivers/GlusterFSSR.py
new file mode 100644
index 00000000..a2f7484f
index 0000000..a2f7484
--- /dev/null
+++ b/drivers/GlusterFSSR.py
@@ -0,0 +1,287 @@
Expand Down Expand Up @@ -625,7 +625,7 @@ index 00000000..a2f7484f
+ SR.registerSR(GlusterFSSR)
diff --git a/drivers/XFSSR.py b/drivers/XFSSR.py
new file mode 100644
index 00000000..de35d738
index 0000000..de35d73
--- /dev/null
+++ b/drivers/XFSSR.py
@@ -0,0 +1,242 @@
Expand Down Expand Up @@ -872,7 +872,7 @@ index 00000000..de35d738
+else:
+ SR.registerSR(XFSSR)
diff --git a/drivers/cleanup.py b/drivers/cleanup.py
index dce460ea..aff51aed 100755
index dce460e..aff51ae 100755
--- a/drivers/cleanup.py
+++ b/drivers/cleanup.py
@@ -2765,7 +2765,10 @@ def normalizeType(type):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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 005/177] feat(drivers): add ZFS driver to avoid losing VDI
Subject: [PATCH 005/178] feat(drivers): add ZFS driver to avoid losing VDI
metadata (xcp-ng/xcp#401)

---
Expand All @@ -13,7 +13,7 @@ Subject: [PATCH 005/177] feat(drivers): add ZFS driver to avoid losing VDI
create mode 100644 drivers/ZFSSR.py

diff --git a/Makefile b/Makefile
index 0a10470a..f93b7be5 100755
index 0a10470..f93b7be 100755
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@ SM_DRIVERS += LVHDoFCoE
Expand All @@ -25,7 +25,7 @@ index 0a10470a..f93b7be5 100755
SM_LIBS := SR
SM_LIBS += SRCommand
diff --git a/drivers/XE_SR_ERRORCODES.xml b/drivers/XE_SR_ERRORCODES.xml
index 7ab7bc1c..535c9dc3 100755
index 7ab7bc1..535c9dc 100755
--- a/drivers/XE_SR_ERRORCODES.xml
+++ b/drivers/XE_SR_ERRORCODES.xml
@@ -900,5 +900,15 @@
Expand All @@ -46,7 +46,7 @@ index 7ab7bc1c..535c9dc3 100755
</SM-errorcodes>
diff --git a/drivers/ZFSSR.py b/drivers/ZFSSR.py
new file mode 100644
index 00000000..1b2f398f
index 0000000..1b2f398
--- /dev/null
+++ b/drivers/ZFSSR.py
@@ -0,0 +1,137 @@
Expand Down Expand Up @@ -188,7 +188,7 @@ index 00000000..1b2f398f
+else:
+ SR.registerSR(ZFSSR)
diff --git a/drivers/cleanup.py b/drivers/cleanup.py
index aff51aed..feb7c187 100755
index aff51ae..feb7c18 100755
--- a/drivers/cleanup.py
+++ b/drivers/cleanup.py
@@ -2767,7 +2767,7 @@ def normalizeType(type):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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 006/177] Re-add the ext4 driver for users who need to
Subject: [PATCH 006/178] Re-add the ext4 driver for users who need to
transition

The driver is needed to transition to the ext driver.
Expand All @@ -21,7 +21,7 @@ creation.
create mode 100644 drivers/EXT4SR.py

diff --git a/Makefile b/Makefile
index f93b7be5..9bc0a9d8 100755
index f93b7be..9bc0a9d 100755
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,7 @@ SM_DRIVERS += CephFS
Expand All @@ -34,7 +34,7 @@ index f93b7be5..9bc0a9d8 100755
SM_LIBS += SRCommand
diff --git a/drivers/EXT4SR.py b/drivers/EXT4SR.py
new file mode 100644
index 00000000..bd67d003
index 0000000..bd67d00
--- /dev/null
+++ b/drivers/EXT4SR.py
@@ -0,0 +1,235 @@
Expand Down Expand Up @@ -275,7 +275,7 @@ index 00000000..bd67d003
+ SR.registerSR(EXT4SR)
\ No newline at end of file
diff --git a/drivers/cleanup.py b/drivers/cleanup.py
index feb7c187..12e44285 100755
index feb7c18..12e4428 100755
--- a/drivers/cleanup.py
+++ b/drivers/cleanup.py
@@ -2767,7 +2767,7 @@ def normalizeType(type):
Expand Down
30 changes: 15 additions & 15 deletions SOURCES/0007-feat-drivers-add-LinstorSR-driver.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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 007/177] feat(drivers): add LinstorSR driver
Subject: [PATCH 007/178] feat(drivers): add LinstorSR driver

Some important points:

Expand Down Expand Up @@ -78,7 +78,7 @@ module imports are protected by try.. except... blocks.
create mode 100644 tests/mocks/linstor/__init__.py

diff --git a/Makefile b/Makefile
index 9bc0a9d8..609e1828 100755
index 9bc0a9d..609e182 100755
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ SM_DRIVERS += udev
Expand Down Expand Up @@ -139,7 +139,7 @@ index 9bc0a9d8..609e1828 100755
-
diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py
new file mode 100755
index 00000000..8be18367
index 0000000..8be1836
--- /dev/null
+++ b/drivers/LinstorSR.py
@@ -0,0 +1,2100 @@
Expand Down Expand Up @@ -2244,7 +2244,7 @@ index 00000000..8be18367
+else:
+ SR.registerSR(LinstorSR)
diff --git a/drivers/XE_SR_ERRORCODES.xml b/drivers/XE_SR_ERRORCODES.xml
index 535c9dc3..6bbb8179 100755
index 535c9dc..6bbb817 100755
--- a/drivers/XE_SR_ERRORCODES.xml
+++ b/drivers/XE_SR_ERRORCODES.xml
@@ -911,4 +911,40 @@
Expand Down Expand Up @@ -2289,7 +2289,7 @@ index 535c9dc3..6bbb8179 100755
+ </code>
</SM-errorcodes>
diff --git a/drivers/cleanup.py b/drivers/cleanup.py
index 12e44285..af2f316b 100755
index 12e4428..af2f316 100755
--- a/drivers/cleanup.py
+++ b/drivers/cleanup.py
@@ -47,7 +47,17 @@ import xs_errors
Expand Down Expand Up @@ -2709,7 +2709,7 @@ index 12e44285..af2f316b 100755

diff --git a/drivers/linstor-manager b/drivers/linstor-manager
new file mode 100755
index 00000000..f7ce1809
index 0000000..f7ce180
--- /dev/null
+++ b/drivers/linstor-manager
@@ -0,0 +1,272 @@
Expand Down Expand Up @@ -2987,7 +2987,7 @@ index 00000000..f7ce1809
+ })
diff --git a/drivers/linstorjournaler.py b/drivers/linstorjournaler.py
new file mode 100755
index 00000000..74953305
index 0000000..7495330
--- /dev/null
+++ b/drivers/linstorjournaler.py
@@ -0,0 +1,155 @@
Expand Down Expand Up @@ -3148,7 +3148,7 @@ index 00000000..74953305
+ return '{}/{}'.format(type, identifier)
diff --git a/drivers/linstorvhdutil.py b/drivers/linstorvhdutil.py
new file mode 100644
index 00000000..f31c7525
index 0000000..f31c752
--- /dev/null
+++ b/drivers/linstorvhdutil.py
@@ -0,0 +1,186 @@
Expand Down Expand Up @@ -3340,7 +3340,7 @@ index 00000000..f31c7525
+ )
diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py
new file mode 100755
index 00000000..d4004217
index 0000000..d400421
--- /dev/null
+++ b/drivers/linstorvolumemanager.py
@@ -0,0 +1,1713 @@
Expand Down Expand Up @@ -5058,7 +5058,7 @@ index 00000000..d4004217
+ return True
+ return False
diff --git a/drivers/tapdisk-pause b/drivers/tapdisk-pause
index 59368696..ed6abede 100755
index 5936869..ed6abed 100755
--- a/drivers/tapdisk-pause
+++ b/drivers/tapdisk-pause
@@ -29,6 +29,12 @@ import lvhdutil
Expand Down Expand Up @@ -5153,7 +5153,7 @@ index 59368696..ed6abede 100755
def Pause(self):
util.SMlog("Pause for %s" % self.vdi_uuid)
diff --git a/drivers/util.py b/drivers/util.py
index 4f9fa9d1..8bd36351 100755
index 4f9fa9d..8bd3635 100755
--- a/drivers/util.py
+++ b/drivers/util.py
@@ -653,10 +653,36 @@ def get_this_host():
Expand Down Expand Up @@ -5223,7 +5223,7 @@ index 4f9fa9d1..8bd36351 100755
if retries >= maxretry:
diff --git a/linstor/Makefile b/linstor/Makefile
new file mode 100644
index 00000000..c329ca30
index 0000000..c329ca3
--- /dev/null
+++ b/linstor/Makefile
@@ -0,0 +1,22 @@
Expand Down Expand Up @@ -5251,7 +5251,7 @@ index 00000000..c329ca30
+ rm -f linstor-monitord
diff --git a/linstor/linstor-monitord.c b/linstor/linstor-monitord.c
new file mode 100644
index 00000000..8161813d
index 0000000..8161813
--- /dev/null
+++ b/linstor/linstor-monitord.c
@@ -0,0 +1,402 @@
Expand Down Expand Up @@ -5659,7 +5659,7 @@ index 00000000..8161813d
+}
diff --git a/systemd/linstor-monitor.service b/systemd/linstor-monitor.service
new file mode 100644
index 00000000..5f8f0a76
index 0000000..5f8f0a7
--- /dev/null
+++ b/systemd/linstor-monitor.service
@@ -0,0 +1,13 @@
Expand All @@ -5678,4 +5678,4 @@ index 00000000..5f8f0a76
+WantedBy=multi-user.target
diff --git a/tests/mocks/linstor/__init__.py b/tests/mocks/linstor/__init__.py
new file mode 100644
index 00000000..e69de29b
index 0000000..e69de29
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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 008/177] feat(tests): add unit tests concerning ZFS (close
Subject: [PATCH 008/178] feat(tests): add unit tests concerning ZFS (close
xcp-ng/xcp#425)

- Check if "create" doesn't succeed without zfs packages
Expand All @@ -13,7 +13,7 @@ Subject: [PATCH 008/177] feat(tests): add unit tests concerning ZFS (close
create mode 100644 tests/test_ZFSSR.py

diff --git a/drivers/ZFSSR.py b/drivers/ZFSSR.py
index 1b2f398f..d3752101 100644
index 1b2f398..d375210 100644
--- a/drivers/ZFSSR.py
+++ b/drivers/ZFSSR.py
@@ -58,6 +58,18 @@ DRIVER_INFO = {
Expand Down Expand Up @@ -85,7 +85,7 @@ index 1b2f398f..d3752101 100644
class ZFSFileVDI(FileSR.FileVDI):
diff --git a/tests/test_ZFSSR.py b/tests/test_ZFSSR.py
new file mode 100644
index 00000000..6f8040dc
index 0000000..6f8040d
--- /dev/null
+++ b/tests/test_ZFSSR.py
@@ -0,0 +1,115 @@
Expand Down
6 changes: 3 additions & 3 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 c4402ded6d0dd748435c621c7d7840cb7886bc3f Mon Sep 17 00:00:00 2001
From: BenjiReis <[email protected]>
Date: Thu, 25 Feb 2021 09:54:52 +0100
Subject: [PATCH 009/177] If no NFS ACLs provided, assume everyone:
Subject: [PATCH 009/178] 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 All @@ -16,7 +16,7 @@ Relevant issues:
2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/drivers/nfs.py b/drivers/nfs.py
index 23dca287..80b71a52 100644
index 23dca28..80b71a5 100644
--- a/drivers/nfs.py
+++ b/drivers/nfs.py
@@ -202,7 +202,11 @@ def scan_exports(target):
Expand All @@ -33,7 +33,7 @@ index 23dca287..80b71a52 100644
entry.appendChild(subentry)
textnode = dom.createTextNode(path)
diff --git a/tests/test_nfs.py b/tests/test_nfs.py
index 71800ab0..cef414fe 100644
index 71800ab..cef414f 100644
--- a/tests/test_nfs.py
+++ b/tests/test_nfs.py
@@ -140,3 +140,33 @@ class Test_nfs(unittest.TestCase):
Expand Down
Loading

0 comments on commit c18c16c

Please sign in to comment.