diff --git a/SOURCES/0001-backport-of-ccd121cc248d79b749a63d4ad099e6d5f4b8b588.patch b/SOURCES/0001-backport-of-ccd121cc248d79b749a63d4ad099e6d5f4b8b588.patch index a2b7013..0995e98 100644 --- a/SOURCES/0001-backport-of-ccd121cc248d79b749a63d4ad099e6d5f4b8b588.patch +++ b/SOURCES/0001-backport-of-ccd121cc248d79b749a63d4ad099e6d5f4b8b588.patch @@ -1,7 +1,7 @@ From 705a6d9deed2ba862577681fc54df144060f3816 Mon Sep 17 00:00:00 2001 From: Mark Syms 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 @@ -13,7 +13,7 @@ Signed-off-by: Ronan Abhamon 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 @@ @@ -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 @@ @@ -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): diff --git a/SOURCES/0002-Update-xs-sm.service-s-description-for-XCP-ng.patch b/SOURCES/0002-Update-xs-sm.service-s-description-for-XCP-ng.patch index 9196a6b..04ff780 100644 --- a/SOURCES/0002-Update-xs-sm.service-s-description-for-XCP-ng.patch +++ b/SOURCES/0002-Update-xs-sm.service-s-description-for-XCP-ng.patch @@ -1,7 +1,7 @@ From fd898b82d880619f0acd9d1b8f1d55b3967bc339 Mon Sep 17 00:00:00 2001 From: Samuel Verschelde 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. @@ -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 @@ diff --git a/SOURCES/0003-Add-TrueNAS-multipath-config.patch b/SOURCES/0003-Add-TrueNAS-multipath-config.patch index 964e197..aefb665 100644 --- a/SOURCES/0003-Add-TrueNAS-multipath-config.patch +++ b/SOURCES/0003-Add-TrueNAS-multipath-config.patch @@ -1,7 +1,7 @@ From bd709621897bda8d9f14820fb3d52eecfe51facb Mon Sep 17 00:00:00 2001 From: Samuel Verschelde 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. @@ -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 { diff --git a/SOURCES/0004-feat-drivers-add-CephFS-GlusterFS-and-XFS-drivers.patch b/SOURCES/0004-feat-drivers-add-CephFS-GlusterFS-and-XFS-drivers.patch index b9155b8..26e6e52 100644 --- a/SOURCES/0004-feat-drivers-add-CephFS-GlusterFS-and-XFS-drivers.patch +++ b/SOURCES/0004-feat-drivers-add-CephFS-GlusterFS-and-XFS-drivers.patch @@ -1,7 +1,7 @@ From 574897552a11af6fc92e145df0bacb42a2ac6b53 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon 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 + @@ -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 @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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): diff --git a/SOURCES/0005-feat-drivers-add-ZFS-driver-to-avoid-losing-VDI-meta.patch b/SOURCES/0005-feat-drivers-add-ZFS-driver-to-avoid-losing-VDI-meta.patch index a72163d..e2b0480 100644 --- a/SOURCES/0005-feat-drivers-add-ZFS-driver-to-avoid-losing-VDI-meta.patch +++ b/SOURCES/0005-feat-drivers-add-ZFS-driver-to-avoid-losing-VDI-meta.patch @@ -1,7 +1,7 @@ From 3a948fe3ff75146c3a9c960768ca4791c109a6b6 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon 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) --- @@ -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 @@ -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 @@ @@ -46,7 +46,7 @@ index 7ab7bc1c..535c9dc3 100755 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 @@ @@ -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): diff --git a/SOURCES/0006-Re-add-the-ext4-driver-for-users-who-need-to-transit.patch b/SOURCES/0006-Re-add-the-ext4-driver-for-users-who-need-to-transit.patch index 8e6b31c..85d21cd 100644 --- a/SOURCES/0006-Re-add-the-ext4-driver-for-users-who-need-to-transit.patch +++ b/SOURCES/0006-Re-add-the-ext4-driver-for-users-who-need-to-transit.patch @@ -1,7 +1,7 @@ From 8b1962f5d6d8b092525e94241df033e4a78872b1 Mon Sep 17 00:00:00 2001 From: Samuel Verschelde 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. @@ -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 @@ -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 @@ @@ -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): diff --git a/SOURCES/0007-feat-drivers-add-LinstorSR-driver.patch b/SOURCES/0007-feat-drivers-add-LinstorSR-driver.patch index 0922edc..4014e2a 100644 --- a/SOURCES/0007-feat-drivers-add-LinstorSR-driver.patch +++ b/SOURCES/0007-feat-drivers-add-LinstorSR-driver.patch @@ -1,7 +1,7 @@ From 9b836e9e503354796a7f975bb44f10a0920f33e3 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon 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: @@ -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 @@ -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 @@ @@ -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 @@ @@ -2289,7 +2289,7 @@ index 535c9dc3..6bbb8179 100755 + 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 @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 @@ -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(): @@ -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 @@ @@ -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 @@ @@ -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 @@ @@ -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 diff --git a/SOURCES/0008-feat-tests-add-unit-tests-concerning-ZFS-close-xcp-n.patch b/SOURCES/0008-feat-tests-add-unit-tests-concerning-ZFS-close-xcp-n.patch index 3423d8c..aa5f449 100644 --- a/SOURCES/0008-feat-tests-add-unit-tests-concerning-ZFS-close-xcp-n.patch +++ b/SOURCES/0008-feat-tests-add-unit-tests-concerning-ZFS-close-xcp-n.patch @@ -1,7 +1,7 @@ From c756b29ce80da0cd38f88bbaaddf4e1130962af9 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon 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 @@ -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 = { @@ -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 @@ diff --git a/SOURCES/0009-If-no-NFS-ACLs-provided-assume-everyone.patch b/SOURCES/0009-If-no-NFS-ACLs-provided-assume-everyone.patch index 40daa32..1bed5ba 100644 --- a/SOURCES/0009-If-no-NFS-ACLs-provided-assume-everyone.patch +++ b/SOURCES/0009-If-no-NFS-ACLs-provided-assume-everyone.patch @@ -1,7 +1,7 @@ From c4402ded6d0dd748435c621c7d7840cb7886bc3f Mon Sep 17 00:00:00 2001 From: BenjiReis 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: "*". @@ -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): @@ -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): diff --git a/SOURCES/0010-Added-SM-Driver-for-MooseFS.patch b/SOURCES/0010-Added-SM-Driver-for-MooseFS.patch index 3eeb282..5c6fc8f 100644 --- a/SOURCES/0010-Added-SM-Driver-for-MooseFS.patch +++ b/SOURCES/0010-Added-SM-Driver-for-MooseFS.patch @@ -1,7 +1,7 @@ From ba6e2bace64965d7d9f89e6dd9a94bf22ae075a2 Mon Sep 17 00:00:00 2001 From: Aleksander Wieliczko Date: Fri, 29 Jan 2021 15:21:23 +0100 -Subject: [PATCH 010/177] Added SM Driver for MooseFS +Subject: [PATCH 010/178] Added SM Driver for MooseFS Co-authored-by: Piotr Robert Konopelko Signed-off-by: Aleksander Wieliczko @@ -16,7 +16,7 @@ Signed-off-by: Ronan Abhamon create mode 100644 tests/test_MooseFSSR.py diff --git a/Makefile b/Makefile -index 609e1828..b0ae3536 100755 +index 609e182..b0ae353 100755 --- a/Makefile +++ b/Makefile @@ -23,6 +23,7 @@ SM_DRIVERS += GlusterFS @@ -29,7 +29,7 @@ index 609e1828..b0ae3536 100755 SM_LIBS += SRCommand diff --git a/drivers/MooseFSSR.py b/drivers/MooseFSSR.py new file mode 100755 -index 00000000..be5112c8 +index 0000000..be5112c --- /dev/null +++ b/drivers/MooseFSSR.py @@ -0,0 +1,271 @@ @@ -305,7 +305,7 @@ index 00000000..be5112c8 +else: + SR.registerSR(MooseFSSR) diff --git a/drivers/cleanup.py b/drivers/cleanup.py -index af2f316b..a6636c5d 100755 +index af2f316..a6636c5 100755 --- a/drivers/cleanup.py +++ b/drivers/cleanup.py @@ -3123,7 +3123,7 @@ def normalizeType(type): @@ -319,7 +319,7 @@ index af2f316b..a6636c5d 100755 if type in ["linstor"]: diff --git a/tests/test_MooseFSSR.py b/tests/test_MooseFSSR.py new file mode 100644 -index 00000000..5a61cf5e +index 0000000..5a61cf5 --- /dev/null +++ b/tests/test_MooseFSSR.py @@ -0,0 +1,62 @@ diff --git a/SOURCES/0011-Avoid-usage-of-umount-in-ISOSR-when-legacy_mode-is-u.patch b/SOURCES/0011-Avoid-usage-of-umount-in-ISOSR-when-legacy_mode-is-u.patch index 742662f..7156950 100644 --- a/SOURCES/0011-Avoid-usage-of-umount-in-ISOSR-when-legacy_mode-is-u.patch +++ b/SOURCES/0011-Avoid-usage-of-umount-in-ISOSR-when-legacy_mode-is-u.patch @@ -1,7 +1,7 @@ From dc7619735961b1fc0b7075cdc02ba375b76aa011 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 2 Dec 2021 09:28:37 +0100 -Subject: [PATCH 011/177] Avoid usage of `umount` in `ISOSR` when `legacy_mode` +Subject: [PATCH 011/178] 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 @@ -15,7 +15,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 62 insertions(+), 4 deletions(-) diff --git a/drivers/ISOSR.py b/drivers/ISOSR.py -index 1094a716..0206ef95 100755 +index 1094a71..0206ef9 100755 --- a/drivers/ISOSR.py +++ b/drivers/ISOSR.py @@ -458,10 +458,9 @@ class ISOSR(SR.SR): @@ -33,7 +33,7 @@ index 1094a716..0206ef95 100755 util.pread(["umount", self.mountpoint]); except util.CommandException, inst: diff --git a/tests/test_ISOSR.py b/tests/test_ISOSR.py -index 7655f14a..03c88511 100644 +index 7655f14..03c8851 100644 --- a/tests/test_ISOSR.py +++ b/tests/test_ISOSR.py @@ -20,6 +20,65 @@ class FakeISOSR(ISOSR.ISOSR): diff --git a/SOURCES/0012-MooseFS-SR-uses-now-UUID-subdirs-for-each-SR.patch b/SOURCES/0012-MooseFS-SR-uses-now-UUID-subdirs-for-each-SR.patch index b585471..d938320 100644 --- a/SOURCES/0012-MooseFS-SR-uses-now-UUID-subdirs-for-each-SR.patch +++ b/SOURCES/0012-MooseFS-SR-uses-now-UUID-subdirs-for-each-SR.patch @@ -1,7 +1,7 @@ From a1341e33251ec40a12e0971ffeda8b935af0be93 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 18 May 2022 17:28:09 +0200 -Subject: [PATCH 012/177] MooseFS SR uses now UUID subdirs for each SR +Subject: [PATCH 012/178] 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 @@ -17,7 +17,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 52 insertions(+), 4 deletions(-) diff --git a/drivers/MooseFSSR.py b/drivers/MooseFSSR.py -index be5112c8..ab72f4e9 100755 +index be5112c..ab72f4e 100755 --- a/drivers/MooseFSSR.py +++ b/drivers/MooseFSSR.py @@ -18,6 +18,7 @@ diff --git a/SOURCES/0013-Fix-is_open-call-for-many-drivers-25.patch b/SOURCES/0013-Fix-is_open-call-for-many-drivers-25.patch index 08603e9..89d7cd0 100644 --- a/SOURCES/0013-Fix-is_open-call-for-many-drivers-25.patch +++ b/SOURCES/0013-Fix-is_open-call-for-many-drivers-25.patch @@ -1,7 +1,7 @@ From 58c1e5a82d1b943a94a1524e52fd8bf43e916e3e Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 23 Jun 2022 10:36:36 +0200 -Subject: [PATCH 013/177] Fix is_open call for many drivers (#25) +Subject: [PATCH 013/178] 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. @@ -20,7 +20,7 @@ Signed-off-by: Ronan Abhamon 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/drivers/GlusterFSSR.py b/drivers/GlusterFSSR.py -index a2f7484f..323718d9 100644 +index a2f7484..323718d 100644 --- a/drivers/GlusterFSSR.py +++ b/drivers/GlusterFSSR.py @@ -96,7 +96,8 @@ class GlusterFSSR(FileSR.FileSR): @@ -34,7 +34,7 @@ index a2f7484f..323718d9 100644 self.sm_config = self.session.xenapi.SR.get_sm_config(self.sr_ref) else: diff --git a/drivers/NFSSR.py b/drivers/NFSSR.py -index e876b6bd..207e45c4 100755 +index e876b6b..207e45c 100755 --- a/drivers/NFSSR.py +++ b/drivers/NFSSR.py @@ -83,9 +83,12 @@ class NFSSR(FileSR.SharedFileSR): @@ -64,7 +64,7 @@ index e876b6bd..207e45c4 100755 try: self.scan_exports(self.dconf['server']) diff --git a/drivers/on_slave.py b/drivers/on_slave.py -index 0d60d969..534e6c90 100755 +index 0d60d96..534e6c9 100755 --- a/drivers/on_slave.py +++ b/drivers/on_slave.py @@ -72,7 +72,17 @@ def multi(session, args): diff --git a/SOURCES/0014-Remove-SR_CACHING-capability-for-many-SR-types-24.patch b/SOURCES/0014-Remove-SR_CACHING-capability-for-many-SR-types-24.patch index 26dba93..a41ea78 100644 --- a/SOURCES/0014-Remove-SR_CACHING-capability-for-many-SR-types-24.patch +++ b/SOURCES/0014-Remove-SR_CACHING-capability-for-many-SR-types-24.patch @@ -1,7 +1,7 @@ From 9d45a0e68acbcaec82a36c74f91dfa176b4fc7bf Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 23 Jun 2022 10:37:07 +0200 -Subject: [PATCH 014/177] Remove SR_CACHING capability for many SR types (#24) +Subject: [PATCH 014/178] 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. @@ -17,7 +17,7 @@ Signed-off-by: Ronan Abhamon 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/CephFSSR.py b/drivers/CephFSSR.py -index d7974907..09c928be 100644 +index d797490..09c928b 100644 --- a/drivers/CephFSSR.py +++ b/drivers/CephFSSR.py @@ -38,7 +38,7 @@ import vhdutil @@ -30,7 +30,7 @@ index d7974907..09c928be 100644 "VDI_UPDATE", "VDI_CLONE", "VDI_SNAPSHOT", "VDI_RESIZE", "VDI_MIRROR", "VDI_GENERATE_CONFIG", diff --git a/drivers/GlusterFSSR.py b/drivers/GlusterFSSR.py -index 323718d9..61a7d409 100644 +index 323718d..61a7d40 100644 --- a/drivers/GlusterFSSR.py +++ b/drivers/GlusterFSSR.py @@ -35,7 +35,7 @@ import vhdutil @@ -43,7 +43,7 @@ index 323718d9..61a7d409 100644 "VDI_UPDATE", "VDI_CLONE", "VDI_SNAPSHOT", "VDI_RESIZE", "VDI_MIRROR", "VDI_GENERATE_CONFIG", diff --git a/drivers/MooseFSSR.py b/drivers/MooseFSSR.py -index ab72f4e9..212f1ad2 100755 +index ab72f4e..212f1ad 100755 --- a/drivers/MooseFSSR.py +++ b/drivers/MooseFSSR.py @@ -39,7 +39,7 @@ import vhdutil diff --git a/SOURCES/0015-Remove-SR_PROBE-from-ZFS-capabilities-37.patch b/SOURCES/0015-Remove-SR_PROBE-from-ZFS-capabilities-37.patch index 6495bd2..d60a7cc 100644 --- a/SOURCES/0015-Remove-SR_PROBE-from-ZFS-capabilities-37.patch +++ b/SOURCES/0015-Remove-SR_PROBE-from-ZFS-capabilities-37.patch @@ -1,7 +1,7 @@ From ee2433b00bea733c8ec0d294ffb476e04e7e5bdb Mon Sep 17 00:00:00 2001 From: BenjiReis Date: Fri, 4 Aug 2023 12:10:08 +0200 -Subject: [PATCH 015/177] Remove `SR_PROBE` from ZFS capabilities (#37) +Subject: [PATCH 015/178] Remove `SR_PROBE` from ZFS capabilities (#37) The probe method is not implemented so we shouldn't advertise it. @@ -12,7 +12,7 @@ Signed-off-by: BenjiReis 1 file changed, 1 deletion(-) diff --git a/drivers/ZFSSR.py b/drivers/ZFSSR.py -index d3752101..b8032117 100644 +index d375210..b803211 100644 --- a/drivers/ZFSSR.py +++ b/drivers/ZFSSR.py @@ -23,7 +23,6 @@ import util diff --git a/SOURCES/0016-Fix-vdi-ref-when-static-vdis-are-used.patch b/SOURCES/0016-Fix-vdi-ref-when-static-vdis-are-used.patch index a7d03f4..d4f9064 100644 --- a/SOURCES/0016-Fix-vdi-ref-when-static-vdis-are-used.patch +++ b/SOURCES/0016-Fix-vdi-ref-when-static-vdis-are-used.patch @@ -1,7 +1,7 @@ From a14e7dbb656f0c722e85cacf4ad658695e086502 Mon Sep 17 00:00:00 2001 From: Guillaume Date: Wed, 16 Aug 2023 13:42:21 +0200 -Subject: [PATCH 016/177] Fix vdi-ref when static vdis are used +Subject: [PATCH 016/178] 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. @@ -12,7 +12,7 @@ Signed-off-by: Guillaume 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/LVHDSR.py b/drivers/LVHDSR.py -index dd8e20b9..6ac3f804 100755 +index dd8e20b..6ac3f80 100755 --- a/drivers/LVHDSR.py +++ b/drivers/LVHDSR.py @@ -1532,10 +1532,11 @@ class LVHDVDI(VDI.VDI): diff --git a/SOURCES/0017-Tell-users-not-to-edit-multipath.conf-directly.patch b/SOURCES/0017-Tell-users-not-to-edit-multipath.conf-directly.patch index 9c34993..c3ac8fc 100644 --- a/SOURCES/0017-Tell-users-not-to-edit-multipath.conf-directly.patch +++ b/SOURCES/0017-Tell-users-not-to-edit-multipath.conf-directly.patch @@ -1,7 +1,7 @@ From 1cf0c93a4e8c1de3688115954a8d4a8d4c25830d Mon Sep 17 00:00:00 2001 From: Samuel Verschelde Date: Fri, 27 Jan 2023 12:03:15 +0100 -Subject: [PATCH 017/177] Tell users not to edit multipath.conf directly +Subject: [PATCH 017/178] 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 @@ -14,7 +14,7 @@ Signed-off-by: Samuel Verschelde 1 file changed, 8 insertions(+) diff --git a/multipath/multipath.conf b/multipath/multipath.conf -index 6dbd5bf8..ede40bad 100644 +index 6dbd5bf..ede40ba 100644 --- a/multipath/multipath.conf +++ b/multipath/multipath.conf @@ -1,3 +1,11 @@ diff --git a/SOURCES/0018-Add-custom.conf-multipath-configuration-file.patch b/SOURCES/0018-Add-custom.conf-multipath-configuration-file.patch index 3f7b1db..99300a4 100644 --- a/SOURCES/0018-Add-custom.conf-multipath-configuration-file.patch +++ b/SOURCES/0018-Add-custom.conf-multipath-configuration-file.patch @@ -1,7 +1,7 @@ From c8e7d59b6c9b68f9e5ef89d0ad87c157bb35c736 Mon Sep 17 00:00:00 2001 From: Samuel Verschelde Date: Fri, 27 Jan 2023 12:23:13 +0100 -Subject: [PATCH 018/177] Add custom.conf multipath configuration file +Subject: [PATCH 018/178] 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 @@ -16,7 +16,7 @@ Signed-off-by: Samuel Verschelde diff --git a/multipath/custom.conf b/multipath/custom.conf new file mode 100644 -index 00000000..3c8583f1 +index 0000000..3c8583f --- /dev/null +++ b/multipath/custom.conf @@ -0,0 +1,6 @@ diff --git a/SOURCES/0019-Install-etc-multipath-conf.d-custom.conf.patch b/SOURCES/0019-Install-etc-multipath-conf.d-custom.conf.patch index 7828c76..777e91d 100644 --- a/SOURCES/0019-Install-etc-multipath-conf.d-custom.conf.patch +++ b/SOURCES/0019-Install-etc-multipath-conf.d-custom.conf.patch @@ -1,7 +1,7 @@ From 81b847dca6a48d73936592820a1a7b88ae1ff5cc Mon Sep 17 00:00:00 2001 From: Samuel Verschelde Date: Fri, 25 Aug 2023 17:47:34 +0200 -Subject: [PATCH 019/177] Install /etc/multipath/conf.d/custom.conf +Subject: [PATCH 019/178] Install /etc/multipath/conf.d/custom.conf Update Makefile so that the file is installed along with sm. @@ -11,7 +11,7 @@ Signed-off-by: Samuel Verschelde 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile -index b0ae3536..3357cbfb 100755 +index b0ae353..3357cbf 100755 --- a/Makefile +++ b/Makefile @@ -78,6 +78,7 @@ SM_LIBS += sr_health_check diff --git a/SOURCES/0020-Backport-NFS4-only-support.patch b/SOURCES/0020-Backport-NFS4-only-support.patch index 617581e..bcd8bad 100644 --- a/SOURCES/0020-Backport-NFS4-only-support.patch +++ b/SOURCES/0020-Backport-NFS4-only-support.patch @@ -1,7 +1,7 @@ From fe5a7b355ea6820036cfeef3847b2bec28567632 Mon Sep 17 00:00:00 2001 From: Benjamin Reis Date: Mon, 18 Dec 2023 10:22:26 +0100 -Subject: [PATCH 020/177] Backport NFS4 only support +Subject: [PATCH 020/178] Backport NFS4 only support See: https://github.com/xapi-project/sm/pull/617 @@ -14,7 +14,7 @@ Signed-off-by: Benjamin Reis 4 files changed, 139 insertions(+), 64 deletions(-) diff --git a/drivers/NFSSR.py b/drivers/NFSSR.py -index 207e45c4..e8389db7 100755 +index 207e45c..e8389db 100755 --- a/drivers/NFSSR.py +++ b/drivers/NFSSR.py @@ -115,11 +115,12 @@ class NFSSR(FileSR.SharedFileSR): @@ -51,7 +51,7 @@ index 207e45c4..e8389db7 100755 class NFSFileVDI(FileSR.FileVDI): diff --git a/drivers/nfs.py b/drivers/nfs.py -index 80b71a52..ddb869e7 100644 +index 80b71a5..ddb869e 100644 --- a/drivers/nfs.py +++ b/drivers/nfs.py @@ -44,6 +44,7 @@ import time @@ -275,7 +275,7 @@ index 80b71a52..ddb869e7 100644 def get_nfs_timeout(other_config): diff --git a/tests/test_NFSSR.py b/tests/test_NFSSR.py -index 31c06de3..0f1603c6 100644 +index 31c06de..0f1603c 100644 --- a/tests/test_NFSSR.py +++ b/tests/test_NFSSR.py @@ -182,7 +182,7 @@ class TestNFSSR(unittest.TestCase): @@ -288,7 +288,7 @@ index 31c06de3..0f1603c6 100644 soft_mount.assert_called_once_with('/var/run/sr-mount/UUID', 'aServer', diff --git a/tests/test_nfs.py b/tests/test_nfs.py -index cef414fe..9ea807f6 100644 +index cef414f..9ea807f 100644 --- a/tests/test_nfs.py +++ b/tests/test_nfs.py @@ -9,31 +9,32 @@ class Test_nfs(unittest.TestCase): diff --git a/SOURCES/0021-Backport-probe-for-NFS4-when-rpcinfo-does-not-includ.patch b/SOURCES/0021-Backport-probe-for-NFS4-when-rpcinfo-does-not-includ.patch index cb61536..ce927f7 100644 --- a/SOURCES/0021-Backport-probe-for-NFS4-when-rpcinfo-does-not-includ.patch +++ b/SOURCES/0021-Backport-probe-for-NFS4-when-rpcinfo-does-not-includ.patch @@ -1,7 +1,7 @@ From eea13526d4e202e395d1a4289f837b0171a73b8e Mon Sep 17 00:00:00 2001 From: Benjamin Reis Date: Mon, 18 Dec 2023 10:35:46 +0100 -Subject: [PATCH 021/177] Backport probe for NFS4 when rpcinfo does not include +Subject: [PATCH 021/178] Backport probe for NFS4 when rpcinfo does not include it See: https://github.com/xapi-project/sm/pull/655 @@ -13,7 +13,7 @@ Signed-off-by: Benjamin Reis 2 files changed, 60 insertions(+), 15 deletions(-) diff --git a/drivers/nfs.py b/drivers/nfs.py -index ddb869e7..32b9fc58 100644 +index ddb869e..32b9fc5 100644 --- a/drivers/nfs.py +++ b/drivers/nfs.py @@ -83,10 +83,14 @@ def check_server_service(server, transport): @@ -82,7 +82,7 @@ index ddb869e7..32b9fc58 100644 def get_nfs_timeout(other_config): nfs_timeout = 200 diff --git a/tests/test_nfs.py b/tests/test_nfs.py -index 9ea807f6..3874d8e7 100644 +index 9ea807f..3874d8e 100644 --- a/tests/test_nfs.py +++ b/tests/test_nfs.py @@ -9,12 +9,14 @@ class Test_nfs(unittest.TestCase): diff --git a/SOURCES/0022-feat-LargeBlock-backport-of-largeblocksr-51-55.patch b/SOURCES/0022-feat-LargeBlock-backport-of-largeblocksr-51-55.patch index 325761b..dd4bb48 100644 --- a/SOURCES/0022-feat-LargeBlock-backport-of-largeblocksr-51-55.patch +++ b/SOURCES/0022-feat-LargeBlock-backport-of-largeblocksr-51-55.patch @@ -1,7 +1,7 @@ From 05e5ce03d6fd4523a942345cf49cc41eebaa78f7 Mon Sep 17 00:00:00 2001 From: Damien Thenot Date: Tue, 7 May 2024 15:20:22 +0200 -Subject: [PATCH 022/177] feat(LargeBlock): backport of largeblocksr (#51) +Subject: [PATCH 022/178] feat(LargeBlock): backport of largeblocksr (#51) (#55) A SR inheriting from a EXTSR allowing to use a 4KiB blocksize device as @@ -48,7 +48,7 @@ Signed-off-by: Damien Thenot create mode 100644 drivers/LargeBlockSR.py diff --git a/Makefile b/Makefile -index 3357cbfb..284b9a39 100755 +index 3357cbf..284b9a3 100755 --- a/Makefile +++ b/Makefile @@ -24,6 +24,7 @@ SM_DRIVERS += XFS @@ -61,7 +61,7 @@ index 3357cbfb..284b9a39 100755 SM_LIBS += SRCommand diff --git a/drivers/LargeBlockSR.py b/drivers/LargeBlockSR.py new file mode 100644 -index 00000000..0fd1f345 +index 0000000..0fd1f34 --- /dev/null +++ b/drivers/LargeBlockSR.py @@ -0,0 +1,249 @@ @@ -315,7 +315,7 @@ index 00000000..0fd1f345 +else: + SR.registerSR(LargeBlockSR) diff --git a/drivers/XE_SR_ERRORCODES.xml b/drivers/XE_SR_ERRORCODES.xml -index 6bbb8179..391c9d63 100755 +index 6bbb817..391c9d6 100755 --- a/drivers/XE_SR_ERRORCODES.xml +++ b/drivers/XE_SR_ERRORCODES.xml @@ -947,4 +947,26 @@ @@ -346,7 +346,7 @@ index 6bbb8179..391c9d63 100755 + diff --git a/drivers/cleanup.py b/drivers/cleanup.py -index a6636c5d..d9237aa7 100755 +index a6636c5..d9237aa 100755 --- a/drivers/cleanup.py +++ b/drivers/cleanup.py @@ -3123,7 +3123,7 @@ def normalizeType(type): @@ -359,7 +359,7 @@ index a6636c5d..d9237aa7 100755 type = SR.TYPE_FILE if type in ["linstor"]: diff --git a/drivers/lvutil.py b/drivers/lvutil.py -index e447fde2..08c2faad 100755 +index e447fde..08c2faa 100755 --- a/drivers/lvutil.py +++ b/drivers/lvutil.py @@ -566,13 +566,17 @@ def resizePV(dev): @@ -384,7 +384,7 @@ index e447fde2..08c2faad 100755 def create(name, size, vgname, tag=None, size_in_percentage=None): if size_in_percentage: diff --git a/drivers/on_slave.py b/drivers/on_slave.py -index 534e6c90..3c7bd340 100755 +index 534e6c9..3c7bd34 100755 --- a/drivers/on_slave.py +++ b/drivers/on_slave.py @@ -76,6 +76,7 @@ def _is_open(session, args): diff --git a/SOURCES/0023-feat-LVHDSR-add-a-way-to-modify-config-of-LVMs-56.patch b/SOURCES/0023-feat-LVHDSR-add-a-way-to-modify-config-of-LVMs-56.patch index 0b71988..1cc8da7 100644 --- a/SOURCES/0023-feat-LVHDSR-add-a-way-to-modify-config-of-LVMs-56.patch +++ b/SOURCES/0023-feat-LVHDSR-add-a-way-to-modify-config-of-LVMs-56.patch @@ -1,7 +1,7 @@ From bc8ee2e18aa6ba1a8923c09ff0d765f931ddc348 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 28 May 2024 15:17:21 +0200 -Subject: [PATCH 023/177] feat(LVHDSR): add a way to modify config of LVMs +Subject: [PATCH 023/178] feat(LVHDSR): add a way to modify config of LVMs (#56) With this change the driver supports a "lvm-conf" param on "other-config". @@ -23,7 +23,7 @@ Signed-off-by: Ronan Abhamon 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/drivers/LVHDSR.py b/drivers/LVHDSR.py -index 6ac3f804..5a83ae0c 100755 +index 6ac3f80..5a83ae0 100755 --- a/drivers/LVHDSR.py +++ b/drivers/LVHDSR.py @@ -161,14 +161,24 @@ class LVHDSR(SR.SR): @@ -62,7 +62,7 @@ index 6ac3f804..5a83ae0c 100755 self.testMode = self.other_conf[self.TEST_MODE_KEY] self._prepareTestMode() diff --git a/drivers/cleanup.py b/drivers/cleanup.py -index d9237aa7..926525f1 100755 +index d9237aa..926525f 100755 --- a/drivers/cleanup.py +++ b/drivers/cleanup.py @@ -2565,7 +2565,12 @@ class LVHDSR(SR): @@ -80,7 +80,7 @@ index d9237aa7..926525f1 100755 self.journaler = journaler.Journaler(self.lvmCache) diff --git a/drivers/lvmcache.py b/drivers/lvmcache.py -index ea0bc171..54930b47 100644 +index ea0bc17..54930b4 100644 --- a/drivers/lvmcache.py +++ b/drivers/lvmcache.py @@ -59,10 +59,11 @@ class LVMCache: diff --git a/SOURCES/0024-Fix-timeout_call-alarm-must-be-reset-in-case-of-succ.patch b/SOURCES/0024-Fix-timeout_call-alarm-must-be-reset-in-case-of-succ.patch index fed5680..8c15437 100644 --- a/SOURCES/0024-Fix-timeout_call-alarm-must-be-reset-in-case-of-succ.patch +++ b/SOURCES/0024-Fix-timeout_call-alarm-must-be-reset-in-case-of-succ.patch @@ -1,7 +1,7 @@ From f76ccb66f769ca352bf1dea9abdaaea5ec1b7942 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 16 Feb 2022 18:24:56 +0100 -Subject: [PATCH 024/177] Fix timeout_call: alarm must be reset in case of +Subject: [PATCH 024/178] Fix timeout_call: alarm must be reset in case of success Otherwise the SIGALRM signal can be emitted after the execution @@ -13,7 +13,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/util.py b/drivers/util.py -index 8bd36351..77f3f190 100755 +index 8bd3635..77f3f19 100755 --- a/drivers/util.py +++ b/drivers/util.py @@ -852,9 +852,8 @@ def timeout_call(timeoutseconds, function, *arguments): diff --git a/SOURCES/0025-timeout_call-returns-the-result-of-user-function-now.patch b/SOURCES/0025-timeout_call-returns-the-result-of-user-function-now.patch index d984c17..c6ff84c 100644 --- a/SOURCES/0025-timeout_call-returns-the-result-of-user-function-now.patch +++ b/SOURCES/0025-timeout_call-returns-the-result-of-user-function-now.patch @@ -1,7 +1,7 @@ From 3db6e67815f3c85768cf253e3d78d01c416fc16f Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 16 Feb 2022 18:28:06 +0100 -Subject: [PATCH 025/177] timeout_call returns the result of user function now +Subject: [PATCH 025/178] timeout_call returns the result of user function now Signed-off-by: Ronan Abhamon --- @@ -9,7 +9,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/util.py b/drivers/util.py -index 77f3f190..54fda469 100755 +index 77f3f19..54fda46 100755 --- a/drivers/util.py +++ b/drivers/util.py @@ -851,7 +851,7 @@ def timeout_call(timeoutseconds, function, *arguments): diff --git a/SOURCES/0026-Always-remove-the-pause-tag-from-VDIs-in-case-of-fai.patch b/SOURCES/0026-Always-remove-the-pause-tag-from-VDIs-in-case-of-fai.patch index c729d4f..749ff94 100644 --- a/SOURCES/0026-Always-remove-the-pause-tag-from-VDIs-in-case-of-fai.patch +++ b/SOURCES/0026-Always-remove-the-pause-tag-from-VDIs-in-case-of-fai.patch @@ -1,7 +1,7 @@ From 7ebdef745b90fe8479555bc44d8d7ce594fc209f Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 5 Feb 2024 23:16:16 +0100 -Subject: [PATCH 026/177] Always remove the pause tag from VDIs in case of +Subject: [PATCH 026/178] Always remove the pause tag from VDIs in case of failure During VDI activation in the blktap module and in case of failure @@ -16,7 +16,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/blktap2.py b/drivers/blktap2.py -index e1f75e9f..e9305ce9 100755 +index e1f75e9..e9305ce 100755 --- a/drivers/blktap2.py +++ b/drivers/blktap2.py @@ -1599,20 +1599,24 @@ class VDI(object): diff --git a/SOURCES/0027-fix-LinstorSR-repair-volumes-only-if-an-exclusive-co.patch b/SOURCES/0027-fix-LinstorSR-repair-volumes-only-if-an-exclusive-co.patch index 41fa7ed..3fd3013 100644 --- a/SOURCES/0027-fix-LinstorSR-repair-volumes-only-if-an-exclusive-co.patch +++ b/SOURCES/0027-fix-LinstorSR-repair-volumes-only-if-an-exclusive-co.patch @@ -1,7 +1,7 @@ From e3f11afdfdc43aa871a7d4f8c6d25564150fd0e4 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 20 Nov 2020 16:42:52 +0100 -Subject: [PATCH 027/177] fix(LinstorSR): repair volumes only if an exclusive +Subject: [PATCH 027/178] fix(LinstorSR): repair volumes only if an exclusive command is executed Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 8be18367..a5bf5abd 100755 +index 8be1836..a5bf5ab 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -388,10 +388,16 @@ class LinstorSR(SR.SR): diff --git a/SOURCES/0028-feat-LinstorSR-Improve-LINSTOR-performance.patch b/SOURCES/0028-feat-LinstorSR-Improve-LINSTOR-performance.patch index 41d83d6..2aac005 100644 --- a/SOURCES/0028-feat-LinstorSR-Improve-LINSTOR-performance.patch +++ b/SOURCES/0028-feat-LinstorSR-Improve-LINSTOR-performance.patch @@ -1,7 +1,7 @@ From fa743060d859c6bcdff75293bfee749b3eaf734c Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 10 Dec 2020 17:56:15 +0100 -Subject: [PATCH 028/177] feat(LinstorSR): Improve LINSTOR performance +Subject: [PATCH 028/178] feat(LinstorSR): Improve LINSTOR performance Details: - vdi_attach and vdi_detach are now exclusive @@ -25,7 +25,7 @@ Signed-off-by: Ronan Abhamon 5 files changed, 463 insertions(+), 238 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index a5bf5abd..548f4b17 100755 +index a5bf5ab..548f4b1 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -92,7 +92,8 @@ DRIVER_CONFIG = {'ATTACH_FROM_CONFIG_WITH_TAPDISK': False} @@ -371,7 +371,7 @@ index a5bf5abd..548f4b17 100755 ) diff --git a/drivers/cleanup.py b/drivers/cleanup.py -index 926525f1..895f36e8 100755 +index 926525f..895f36e 100755 --- a/drivers/cleanup.py +++ b/drivers/cleanup.py @@ -449,7 +449,7 @@ class XAPI: @@ -508,7 +508,7 @@ index 926525f1..895f36e8 100755 def _checkSlaves(self, vdi): diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index f7ce1809..e7e58fd8 100755 +index f7ce180..e7e58fd 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -118,7 +118,9 @@ def detach(session, args): @@ -543,7 +543,7 @@ index f7ce1809..e7e58fd8 100755 return str(False) diff --git a/drivers/linstorvhdutil.py b/drivers/linstorvhdutil.py -index f31c7525..ac858371 100644 +index f31c752..ac85837 100644 --- a/drivers/linstorvhdutil.py +++ b/drivers/linstorvhdutil.py @@ -89,13 +89,33 @@ def linstorhostcall(local_method, remote_method): @@ -625,7 +625,7 @@ index f31c7525..ac858371 100644 # Helpers. # -------------------------------------------------------------------------- diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index d4004217..d617655f 100755 +index d400421..d617655 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -63,6 +63,16 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0029-feat-LinstorSR-robustify-scan-to-avoid-losing-VDIs-i.patch b/SOURCES/0029-feat-LinstorSR-robustify-scan-to-avoid-losing-VDIs-i.patch index 5aa1fef..65911ce 100644 --- a/SOURCES/0029-feat-LinstorSR-robustify-scan-to-avoid-losing-VDIs-i.patch +++ b/SOURCES/0029-feat-LinstorSR-robustify-scan-to-avoid-losing-VDIs-i.patch @@ -1,7 +1,7 @@ From 045d23321e99b135556cb3d9872c1f3c8ae4b9af Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 7 Jan 2021 11:17:08 +0100 -Subject: [PATCH 029/177] feat(LinstorSR): robustify scan to avoid losing VDIs +Subject: [PATCH 029/178] feat(LinstorSR): robustify scan to avoid losing VDIs if function is called outside module Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 548f4b17..52131a59 100755 +index 548f4b1..52131a5 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -325,6 +325,7 @@ class LinstorSR(SR.SR): diff --git a/SOURCES/0030-feat-LinstorSR-display-a-correctly-readable-size-for.patch b/SOURCES/0030-feat-LinstorSR-display-a-correctly-readable-size-for.patch index 5819a4c..b7e7d61 100644 --- a/SOURCES/0030-feat-LinstorSR-display-a-correctly-readable-size-for.patch +++ b/SOURCES/0030-feat-LinstorSR-display-a-correctly-readable-size-for.patch @@ -1,7 +1,7 @@ From 6594b0cfd56df7d8beed5442b7932e6d46623f5f Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 8 Jan 2021 16:12:15 +0100 -Subject: [PATCH 030/177] feat(LinstorSR): display a correctly readable size +Subject: [PATCH 030/178] feat(LinstorSR): display a correctly readable size for the user Signed-off-by: Ronan Abhamon @@ -11,7 +11,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 83 insertions(+), 35 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 52131a59..16cb0d62 100755 +index 52131a5..16cb0d6 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -770,27 +770,19 @@ class LinstorSR(SR.SR): @@ -155,7 +155,7 @@ index 52131a59..16cb0d62 100755 # 10. Return info on the new user-visible leaf VDI. ret_vdi = snap_vdi diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index d617655f..a6f67d8d 100755 +index d617655..a6f67d8 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -131,20 +131,19 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0031-feat-linstor-monitord-scan-all-LINSTOR-SRs-every-12-.patch b/SOURCES/0031-feat-linstor-monitord-scan-all-LINSTOR-SRs-every-12-.patch index 4e9cdd8..94c2244 100644 --- a/SOURCES/0031-feat-linstor-monitord-scan-all-LINSTOR-SRs-every-12-.patch +++ b/SOURCES/0031-feat-linstor-monitord-scan-all-LINSTOR-SRs-every-12-.patch @@ -1,7 +1,7 @@ From bf497ab757571bdb722323cfb98aaa500ec68c44 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 12 Jan 2021 14:06:34 +0100 -Subject: [PATCH 031/177] feat(linstor-monitord): scan all LINSTOR SRs every 12 +Subject: [PATCH 031/178] feat(linstor-monitord): scan all LINSTOR SRs every 12 minutes to update allocated size stats Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 171 insertions(+), 23 deletions(-) diff --git a/linstor/linstor-monitord.c b/linstor/linstor-monitord.c -index 8161813d..a1592fda 100644 +index 8161813..a1592fd 100644 --- a/linstor/linstor-monitord.c +++ b/linstor/linstor-monitord.c @@ -14,8 +14,10 @@ diff --git a/SOURCES/0032-fix-LinstorSR-call-correctly-method-in-_locked_load-.patch b/SOURCES/0032-fix-LinstorSR-call-correctly-method-in-_locked_load-.patch index 8ab48d0..8e70353 100644 --- a/SOURCES/0032-fix-LinstorSR-call-correctly-method-in-_locked_load-.patch +++ b/SOURCES/0032-fix-LinstorSR-call-correctly-method-in-_locked_load-.patch @@ -1,7 +1,7 @@ From 4d41a373da1b9e62d727553cc16f994362d7c5d2 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 15 Jan 2021 17:01:05 +0100 -Subject: [PATCH 032/177] fix(LinstorSR): call correctly method in _locked_load +Subject: [PATCH 032/178] fix(LinstorSR): call correctly method in _locked_load when vdi_attach_from_config is executed Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 16cb0d62..2df2d681 100755 +index 16cb0d6..2df2d68 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -347,19 +347,12 @@ class LinstorSR(SR.SR): diff --git a/SOURCES/0033-feat-LinstorSR-integrate-minidrbdcluster-daemon.patch b/SOURCES/0033-feat-LinstorSR-integrate-minidrbdcluster-daemon.patch index 39b492c..f85e7b4 100644 --- a/SOURCES/0033-feat-LinstorSR-integrate-minidrbdcluster-daemon.patch +++ b/SOURCES/0033-feat-LinstorSR-integrate-minidrbdcluster-daemon.patch @@ -1,7 +1,7 @@ From 2390152b1ccf081874356ded5ee9ae5bad0f00b6 Mon Sep 17 00:00:00 2001 From: Wescoeur Date: Wed, 20 Jan 2021 18:04:26 +0100 -Subject: [PATCH 033/177] feat(LinstorSR): integrate minidrbdcluster daemon +Subject: [PATCH 033/178] feat(LinstorSR): integrate minidrbdcluster daemon Now, we can: - Start a controller on any node @@ -33,7 +33,7 @@ Signed-off-by: Ronan Abhamon create mode 100644 systemd/minidrbdcluster.service diff --git a/Makefile b/Makefile -index 284b9a39..43dd5692 100755 +index 284b9a3..43dd569 100755 --- a/Makefile +++ b/Makefile @@ -92,6 +92,7 @@ PLUGIN_SCRIPT_DEST := /etc/xapi.d/plugins/ @@ -98,7 +98,7 @@ index 284b9a39..43dd5692 100755 .PHONY: clean clean: diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 2df2d681..9650d712 100755 +index 2df2d68..9650d71 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -19,8 +19,11 @@ from constants import CBTLOG_TAG @@ -504,7 +504,7 @@ index 2df2d681..9650d712 100755 # Reload size attrs after inflate or deflate! self._load_this() diff --git a/drivers/cleanup.py b/drivers/cleanup.py -index 895f36e8..9e3a5b07 100755 +index 895f36e..9e3a5b0 100755 --- a/drivers/cleanup.py +++ b/drivers/cleanup.py @@ -52,8 +52,10 @@ from srmetadata import LVMMetadataHandler, VDI_TYPE_TAG @@ -545,7 +545,7 @@ index 895f36e8..9e3a5b07 100755 repair=True, logger=util.SMlog diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index e7e58fd8..f82b73f2 100755 +index e7e58fd..f82b73f 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -22,7 +22,7 @@ import XenAPIPlugin @@ -745,7 +745,7 @@ index e7e58fd8..f82b73f2 100755 'getVHDInfo': get_vhd_info, 'hasParent': has_parent, diff --git a/drivers/linstorjournaler.py b/drivers/linstorjournaler.py -index 74953305..285012ca 100755 +index 7495330..285012c 100755 --- a/drivers/linstorjournaler.py +++ b/drivers/linstorjournaler.py @@ -16,7 +16,7 @@ @@ -811,7 +811,7 @@ index 74953305..285012ca 100755 def _get_key(type, identifier): return '{}/{}'.format(type, identifier) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index a6f67d8d..a383e327 100755 +index a6f67d8..a383e32 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -16,15 +16,30 @@ @@ -1712,7 +1712,7 @@ index a6f67d8d..a383e327 100755 + .format(volume_path, mountpoint, e) + ) diff --git a/drivers/tapdisk-pause b/drivers/tapdisk-pause -index ed6abede..e0bca7be 100755 +index ed6abed..e0bca7b 100755 --- a/drivers/tapdisk-pause +++ b/drivers/tapdisk-pause @@ -30,7 +30,7 @@ import vhdutil @@ -1745,7 +1745,7 @@ index ed6abede..e0bca7be 100755 logger=util.SMlog ).get_device_path(self.vdi_uuid) diff --git a/drivers/util.py b/drivers/util.py -index 54fda469..7151f368 100755 +index 54fda46..7151f36 100755 --- a/drivers/util.py +++ b/drivers/util.py @@ -659,31 +659,10 @@ def get_master_ref(session): @@ -1782,7 +1782,7 @@ index 54fda469..7151f368 100755 filename = '/etc/xensource-inventory' diff --git a/etc/minidrbdcluster.ini b/etc/minidrbdcluster.ini new file mode 100644 -index 00000000..0126e862 +index 0000000..0126e86 --- /dev/null +++ b/etc/minidrbdcluster.ini @@ -0,0 +1,14 @@ @@ -1802,7 +1802,7 @@ index 00000000..0126e862 +systemd-units= diff --git a/etc/systemd/system/linstor-satellite.service.d/override.conf b/etc/systemd/system/linstor-satellite.service.d/override.conf new file mode 100644 -index 00000000..b1686b4f +index 0000000..b1686b4 --- /dev/null +++ b/etc/systemd/system/linstor-satellite.service.d/override.conf @@ -0,0 +1,5 @@ @@ -1813,7 +1813,7 @@ index 00000000..b1686b4f +After=drbd.service diff --git a/etc/systemd/system/var-lib-linstor.mount b/etc/systemd/system/var-lib-linstor.mount new file mode 100644 -index 00000000..a05a7f74 +index 0000000..a05a7f7 --- /dev/null +++ b/etc/systemd/system/var-lib-linstor.mount @@ -0,0 +1,6 @@ @@ -1824,7 +1824,7 @@ index 00000000..a05a7f74 +What=/dev/drbd/by-res/xcp-persistent-database/0 +Where=/var/lib/linstor diff --git a/linstor/linstor-monitord.c b/linstor/linstor-monitord.c -index a1592fda..47740598 100644 +index a1592fd..4774059 100644 --- a/linstor/linstor-monitord.c +++ b/linstor/linstor-monitord.c @@ -287,18 +287,6 @@ static inline int addInotifyWatch (int inotifyFd, const char *filepath, uint32_t @@ -1865,7 +1865,7 @@ index a1592fda..47740598 100644 // Maybe the file doesn't exist. Waiting its creation... diff --git a/scripts/minidrbdcluster b/scripts/minidrbdcluster new file mode 100755 -index 00000000..a04b6c1c +index 0000000..a04b6c1 --- /dev/null +++ b/scripts/minidrbdcluster @@ -0,0 +1,171 @@ @@ -2042,7 +2042,7 @@ index 00000000..a04b6c1c + main() diff --git a/systemd/minidrbdcluster.service b/systemd/minidrbdcluster.service new file mode 100644 -index 00000000..3de6ac4f +index 0000000..3de6ac4 --- /dev/null +++ b/systemd/minidrbdcluster.service @@ -0,0 +1,18 @@ diff --git a/SOURCES/0034-feat-LinstorSR-ensure-heartbeat-and-redo_log-VDIs-ar.patch b/SOURCES/0034-feat-LinstorSR-ensure-heartbeat-and-redo_log-VDIs-ar.patch index f195b50..b74af8f 100644 --- a/SOURCES/0034-feat-LinstorSR-ensure-heartbeat-and-redo_log-VDIs-ar.patch +++ b/SOURCES/0034-feat-LinstorSR-ensure-heartbeat-and-redo_log-VDIs-ar.patch @@ -1,7 +1,7 @@ From 392a7fc2cefde386c048c2daf1250d3b6fc70584 Mon Sep 17 00:00:00 2001 From: Wescoeur Date: Wed, 24 Feb 2021 11:17:23 +0100 -Subject: [PATCH 034/177] feat(LinstorSR): ensure heartbeat and redo_log VDIs +Subject: [PATCH 034/178] feat(LinstorSR): ensure heartbeat and redo_log VDIs are not diskless Signed-off-by: Ronan Abhamon @@ -11,7 +11,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 86 insertions(+), 13 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 9650d712..d943d49e 100755 +index 9650d71..d943d49 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -1463,7 +1463,7 @@ class LinstorVDI(VDI.VDI): @@ -24,7 +24,7 @@ index 9650d712..d943d49e 100755 volume_info = self._linstor.get_volume_info(self.uuid) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index a383e327..d8d64b4a 100755 +index a383e32..d8d64b4 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -468,7 +468,8 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0035-feat-LinstorSR-protect-sr-commands-to-avoid-forgetti.patch b/SOURCES/0035-feat-LinstorSR-protect-sr-commands-to-avoid-forgetti.patch index c00f3a2..cde1d6b 100644 --- a/SOURCES/0035-feat-LinstorSR-protect-sr-commands-to-avoid-forgetti.patch +++ b/SOURCES/0035-feat-LinstorSR-protect-sr-commands-to-avoid-forgetti.patch @@ -1,7 +1,7 @@ From ad4076e7333d047a54a0fb6055d9b00d9030ae28 Mon Sep 17 00:00:00 2001 From: Wescoeur Date: Thu, 25 Feb 2021 17:52:57 +0100 -Subject: [PATCH 035/177] feat(LinstorSR): protect sr commands to avoid +Subject: [PATCH 035/178] feat(LinstorSR): protect sr commands to avoid forgetting LINSTOR volumes when master satellite is down Steps to reproduce: @@ -52,7 +52,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index d943d49e..092f5e8e 100755 +index d943d49..092f5e8 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -256,6 +256,11 @@ class LinstorSR(SR.SR): diff --git a/SOURCES/0036-fix-LinstorJournaler-ensure-uri-is-not-None-during-l.patch b/SOURCES/0036-fix-LinstorJournaler-ensure-uri-is-not-None-during-l.patch index 541b7f3..b6b0990 100644 --- a/SOURCES/0036-fix-LinstorJournaler-ensure-uri-is-not-None-during-l.patch +++ b/SOURCES/0036-fix-LinstorJournaler-ensure-uri-is-not-None-during-l.patch @@ -1,7 +1,7 @@ From dba2e9c951a47c4193a779a934c5a2d415675b10 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 8 Mar 2021 13:25:28 +0100 -Subject: [PATCH 036/177] fix(LinstorJournaler): ensure uri is not None during +Subject: [PATCH 036/178] fix(LinstorJournaler): ensure uri is not None during linstor.KV creation Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/linstorjournaler.py b/drivers/linstorjournaler.py -index 285012ca..3993f601 100755 +index 285012c..3993f60 100755 --- a/drivers/linstorjournaler.py +++ b/drivers/linstorjournaler.py @@ -16,7 +16,8 @@ diff --git a/SOURCES/0037-feat-LinstorSR-add-an-option-to-disable-auto-quorum-.patch b/SOURCES/0037-feat-LinstorSR-add-an-option-to-disable-auto-quorum-.patch index 6a27038..bffcf7c 100644 --- a/SOURCES/0037-feat-LinstorSR-add-an-option-to-disable-auto-quorum-.patch +++ b/SOURCES/0037-feat-LinstorSR-add-an-option-to-disable-auto-quorum-.patch @@ -1,7 +1,7 @@ From 70bb114f08a6957946ab653bef674d5cbe870998 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 22 Mar 2021 17:32:26 +0100 -Subject: [PATCH 037/177] feat(LinstorSR): add an option to disable auto-quorum +Subject: [PATCH 037/178] feat(LinstorSR): add an option to disable auto-quorum on volume DB + fix doc Signed-off-by: Ronan Abhamon @@ -11,7 +11,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 092f5e8e..9f2be58c 100755 +index 092f5e8..9f2be58 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -31,6 +31,7 @@ except ImportError: @@ -52,7 +52,7 @@ index 092f5e8e..9f2be58c 100755 ) self._vhdutil = LinstorVhdUtil(self.session, self._linstor) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index d8d64b4a..27c8df5d 100755 +index d8d64b4..27c8df5 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -1261,15 +1261,17 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0038-fix-LinstorVolumeManager-add-a-workaround-to-create-.patch b/SOURCES/0038-fix-LinstorVolumeManager-add-a-workaround-to-create-.patch index f391aed..93441d4 100644 --- a/SOURCES/0038-fix-LinstorVolumeManager-add-a-workaround-to-create-.patch +++ b/SOURCES/0038-fix-LinstorVolumeManager-add-a-workaround-to-create-.patch @@ -1,7 +1,7 @@ From 5144ab80e4ec0af9e7c23c9ef508390b4900d1fd Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 23 Mar 2021 14:49:39 +0100 -Subject: [PATCH 038/177] fix(LinstorVolumeManager): add a workaround to create +Subject: [PATCH 038/178] fix(LinstorVolumeManager): add a workaround to create properly SR with thin LVM Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 11 insertions(+) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 27c8df5d..3aaffdf4 100755 +index 27c8df5..3aaffdf 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -2134,6 +2134,17 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0039-feat-LinstorSR-add-optional-ips-parameter.patch b/SOURCES/0039-feat-LinstorSR-add-optional-ips-parameter.patch index f295b8e..3a77069 100644 --- a/SOURCES/0039-feat-LinstorSR-add-optional-ips-parameter.patch +++ b/SOURCES/0039-feat-LinstorSR-add-optional-ips-parameter.patch @@ -1,7 +1,7 @@ From c888113ede59c03474468767d28df14cb0e0bf73 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 24 Mar 2021 10:06:58 +0100 -Subject: [PATCH 039/177] feat(LinstorSR): add optional ips parameter +Subject: [PATCH 039/178] feat(LinstorSR): add optional ips parameter Signed-off-by: Ronan Abhamon --- @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 52 insertions(+), 18 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 9f2be58c..4b761b56 100755 +index 9f2be58..4b761b5 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -77,6 +77,7 @@ CAPABILITIES = [ @@ -65,7 +65,7 @@ index 9f2be58c..4b761b56 100755 if len(ips) != len(self._hosts): raise xs_errors.XenError( diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 3aaffdf4..5c04d028 100755 +index 3aaffdf..5c04d02 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -1313,22 +1313,36 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0040-feat-LinstorSR-add-a-helper-log_drbd_erofs-to-trace-.patch b/SOURCES/0040-feat-LinstorSR-add-a-helper-log_drbd_erofs-to-trace-.patch index 8cb5675..e0404bc 100644 --- a/SOURCES/0040-feat-LinstorSR-add-a-helper-log_drbd_erofs-to-trace-.patch +++ b/SOURCES/0040-feat-LinstorSR-add-a-helper-log_drbd_erofs-to-trace-.patch @@ -1,7 +1,7 @@ From f6ed0e05e330f28d09819bf8085d171dfee84d71 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 26 Mar 2021 16:13:20 +0100 -Subject: [PATCH 040/177] feat(LinstorSR): add a helper `log_drbd_erofs` to +Subject: [PATCH 040/178] feat(LinstorSR): add a helper `log_drbd_erofs` to trace EROFS errno code with DRBD resources + check EROFS error Signed-off-by: Ronan Abhamon @@ -13,7 +13,7 @@ Signed-off-by: Ronan Abhamon 4 files changed, 119 insertions(+), 4 deletions(-) diff --git a/drivers/blktap2.py b/drivers/blktap2.py -index e9305ce9..14c564e6 100755 +index e9305ce..14c564e 100755 --- a/drivers/blktap2.py +++ b/drivers/blktap2.py @@ -36,6 +36,7 @@ import json @@ -50,7 +50,7 @@ index e9305ce9..14c564e6 100755 tapdisk = cls.__from_blktap(blktap) node = '/sys/dev/block/%d:%d' % (tapdisk.major(), tapdisk.minor) diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index f82b73f2..a06ed201 100755 +index f82b73f..a06ed20 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -327,6 +327,22 @@ def lock_vdi(session, args): @@ -85,7 +85,7 @@ index f82b73f2..a06ed201 100755 + 'lsofResource': lsof_resource }) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 5c04d028..0357b92d 100755 +index 5c04d02..0357b92 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -16,6 +16,7 @@ @@ -200,7 +200,7 @@ index 5c04d028..0357b92d 100755 # Default LVM extent size. BLOCK_SIZE = 4 * 1024 * 1024 diff --git a/drivers/vhdutil.py b/drivers/vhdutil.py -index 422834eb..0a8fe918 100755 +index 422834e..0a8fe91 100755 --- a/drivers/vhdutil.py +++ b/drivers/vhdutil.py @@ -99,7 +99,7 @@ def fullSizeVHD(virtual_size): diff --git a/SOURCES/0041-fix-LinstorSR-try-to-restart-the-services-again-if-t.patch b/SOURCES/0041-fix-LinstorSR-try-to-restart-the-services-again-if-t.patch index f3009c1..fb81784 100644 --- a/SOURCES/0041-fix-LinstorSR-try-to-restart-the-services-again-if-t.patch +++ b/SOURCES/0041-fix-LinstorSR-try-to-restart-the-services-again-if-t.patch @@ -1,7 +1,7 @@ From 910405472a57989f5f3b9d6015e0c11970123b44 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 28 Apr 2021 15:15:58 +0200 -Subject: [PATCH 041/177] fix(LinstorSR): try to restart the services again if +Subject: [PATCH 041/178] fix(LinstorSR): try to restart the services again if there is a failure in linstor-manager Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index a06ed201..dcd4bc6f 100755 +index a06ed20..dcd4bc6 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -16,6 +16,7 @@ diff --git a/SOURCES/0042-fix-LinstorSR-robustify-linstor-manager-to-never-inc.patch b/SOURCES/0042-fix-LinstorSR-robustify-linstor-manager-to-never-inc.patch index a5905fa..4699780 100644 --- a/SOURCES/0042-fix-LinstorSR-robustify-linstor-manager-to-never-inc.patch +++ b/SOURCES/0042-fix-LinstorSR-robustify-linstor-manager-to-never-inc.patch @@ -1,7 +1,7 @@ From 262c9328fe625aa44416b2795047584de7611f18 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 26 Aug 2021 15:26:11 +0200 -Subject: [PATCH 042/177] fix(LinstorSR): robustify linstor-manager to never +Subject: [PATCH 042/178] fix(LinstorSR): robustify linstor-manager to never include from plugins path Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index dcd4bc6f..f12747f1 100755 +index dcd4bc6..f12747f 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -14,14 +14,18 @@ diff --git a/SOURCES/0043-fix-LinstorSR-prevent-starting-controller-during-fai.patch b/SOURCES/0043-fix-LinstorSR-prevent-starting-controller-during-fai.patch index fc576e8..8b454a1 100644 --- a/SOURCES/0043-fix-LinstorSR-prevent-starting-controller-during-fai.patch +++ b/SOURCES/0043-fix-LinstorSR-prevent-starting-controller-during-fai.patch @@ -1,7 +1,7 @@ From 855fb10643225cae3ec8e6b89c20972eefaee607 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 26 Aug 2021 16:52:01 +0200 -Subject: [PATCH 043/177] fix(LinstorSR): prevent starting controller during +Subject: [PATCH 043/178] fix(LinstorSR): prevent starting controller during fail in linstor manager destroy method Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 0357b92d..e9b7c2f3 100755 +index 0357b92..e9b7c2f 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -1263,9 +1263,11 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0044-feat-LinstorVolumeManager-increase-peer-slots-limit-.patch b/SOURCES/0044-feat-LinstorVolumeManager-increase-peer-slots-limit-.patch index e8e0f8d..9f6f865 100644 --- a/SOURCES/0044-feat-LinstorVolumeManager-increase-peer-slots-limit-.patch +++ b/SOURCES/0044-feat-LinstorVolumeManager-increase-peer-slots-limit-.patch @@ -1,7 +1,7 @@ From 02c4a4a0a092f9ae8d387a4773fbf0fc5b09cb11 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 19 Oct 2021 14:48:17 +0200 -Subject: [PATCH 044/177] feat(LinstorVolumeManager): increase peer slots limit +Subject: [PATCH 044/178] feat(LinstorVolumeManager): increase peer slots limit (support 31 connections to a DRBD) - Also, create diskless devices when db is created @@ -12,7 +12,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 67 insertions(+), 17 deletions(-) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index e9b7c2f3..553e2f50 100755 +index e9b7c2f..553e2f5 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -1507,7 +1507,7 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0045-feat-LinstorVolumeManager-add-a-fallback-to-find-con.patch b/SOURCES/0045-feat-LinstorVolumeManager-add-a-fallback-to-find-con.patch index 2d57b83..54bd049 100644 --- a/SOURCES/0045-feat-LinstorVolumeManager-add-a-fallback-to-find-con.patch +++ b/SOURCES/0045-feat-LinstorVolumeManager-add-a-fallback-to-find-con.patch @@ -1,7 +1,7 @@ From 8ae786437072d4328825c97b0786d7caa1f4ca35 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 20 Oct 2021 14:33:04 +0200 -Subject: [PATCH 045/177] feat(LinstorVolumeManager): add a fallback to find +Subject: [PATCH 045/178] feat(LinstorVolumeManager): add a fallback to find controller uri (when len(hosts) >= 4) Signed-off-by: Ronan Abhamon @@ -11,7 +11,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index f12747f1..afc4bfe5 100755 +index f12747f..afc4bfe 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -364,6 +364,13 @@ def lsof_resource(session, args): @@ -37,7 +37,7 @@ index f12747f1..afc4bfe5 100755 + 'hasControllerRunning': has_controller_running }) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 553e2f50..821ef420 100755 +index 553e2f5..821ef42 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -16,6 +16,7 @@ diff --git a/SOURCES/0046-fix-var-lib-linstor.mount-ensure-we-always-mount-dat.patch b/SOURCES/0046-fix-var-lib-linstor.mount-ensure-we-always-mount-dat.patch index cfc8f54..05cc809 100644 --- a/SOURCES/0046-fix-var-lib-linstor.mount-ensure-we-always-mount-dat.patch +++ b/SOURCES/0046-fix-var-lib-linstor.mount-ensure-we-always-mount-dat.patch @@ -1,7 +1,7 @@ From 7731198de9a684e000a7c70b19dca1cdd330e9c5 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 21 Oct 2021 11:13:07 +0200 -Subject: [PATCH 046/177] fix(var-lib-linstor.mount): ensure we always mount +Subject: [PATCH 046/178] fix(var-lib-linstor.mount): ensure we always mount database with RW flags Sometimes systemd fallback to read only FS if the volume can't be mounted, we must @@ -19,7 +19,7 @@ Signed-off-by: Ronan Abhamon create mode 100644 etc/systemd/system/var-lib-linstor.service diff --git a/Makefile b/Makefile -index 43dd5692..2eb6a868 100755 +index 43dd569..2eb6a86 100755 --- a/Makefile +++ b/Makefile @@ -182,7 +182,7 @@ install: precheck @@ -32,7 +32,7 @@ index 43dd5692..2eb6a868 100755 install -m 644 etc/minidrbdcluster.ini \ $(SM_STAGING)/$(MINI_DRBD_CLUSTER_CONF_DIR) diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index afc4bfe5..af8d2b9e 100755 +index afc4bfe..af8d2b9 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -187,7 +187,7 @@ def destroy(session, args): @@ -54,7 +54,7 @@ index afc4bfe5..af8d2b9e 100755 return str(False) diff --git a/etc/minidrbdcluster.ini b/etc/minidrbdcluster.ini -index 0126e862..9e523427 100644 +index 0126e86..9e52342 100644 --- a/etc/minidrbdcluster.ini +++ b/etc/minidrbdcluster.ini @@ -5,7 +5,7 @@ @@ -68,7 +68,7 @@ index 0126e862..9e523427 100644 systemd-units= diff --git a/etc/systemd/system/var-lib-linstor.mount b/etc/systemd/system/var-lib-linstor.mount deleted file mode 100644 -index a05a7f74..00000000 +index a05a7f7..0000000 --- a/etc/systemd/system/var-lib-linstor.mount +++ /dev/null @@ -1,6 +0,0 @@ @@ -80,7 +80,7 @@ index a05a7f74..00000000 -Where=/var/lib/linstor diff --git a/etc/systemd/system/var-lib-linstor.service b/etc/systemd/system/var-lib-linstor.service new file mode 100644 -index 00000000..d230d048 +index 0000000..d230d04 --- /dev/null +++ b/etc/systemd/system/var-lib-linstor.service @@ -0,0 +1,21 @@ diff --git a/SOURCES/0047-feat-LinstorVolumeManager-add-a-fallback-to-find-nod.patch b/SOURCES/0047-feat-LinstorVolumeManager-add-a-fallback-to-find-nod.patch index c3ad307..3c80898 100644 --- a/SOURCES/0047-feat-LinstorVolumeManager-add-a-fallback-to-find-nod.patch +++ b/SOURCES/0047-feat-LinstorVolumeManager-add-a-fallback-to-find-nod.patch @@ -1,7 +1,7 @@ From 5273224cab21953acab55e07d2fa6941bfa19bba Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 21 Oct 2021 11:51:32 +0200 -Subject: [PATCH 047/177] feat(LinstorVolumeManager): add a fallback to find +Subject: [PATCH 047/178] feat(LinstorVolumeManager): add a fallback to find node name (when len(hosts) >= 4) Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 821ef420..e497afa6 100755 +index 821ef42..e497afa 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -210,19 +210,26 @@ def get_controller_uri(): diff --git a/SOURCES/0048-feat-LinstorSR-explain-on-which-host-plugins-command.patch b/SOURCES/0048-feat-LinstorSR-explain-on-which-host-plugins-command.patch index a6945ed..a863f6b 100644 --- a/SOURCES/0048-feat-LinstorSR-explain-on-which-host-plugins-command.patch +++ b/SOURCES/0048-feat-LinstorSR-explain-on-which-host-plugins-command.patch @@ -1,7 +1,7 @@ From c6328ccfe37e9ad5318dc6a7149ece8705f4a8b5 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 26 Oct 2021 10:44:00 +0200 -Subject: [PATCH 048/177] feat(LinstorSR): explain on which host, plugins +Subject: [PATCH 048/178] feat(LinstorSR): explain on which host, plugins commands are executed Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 4b761b56..519afb29 100755 +index 4b761b5..519afb2 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -775,13 +775,25 @@ class LinstorSR(SR.SR): diff --git a/SOURCES/0049-fix-LinstorSR-create-diskless-path-if-necessary-duri.patch b/SOURCES/0049-fix-LinstorSR-create-diskless-path-if-necessary-duri.patch index e612b51..ff38951 100644 --- a/SOURCES/0049-fix-LinstorSR-create-diskless-path-if-necessary-duri.patch +++ b/SOURCES/0049-fix-LinstorSR-create-diskless-path-if-necessary-duri.patch @@ -1,7 +1,7 @@ From 0125298399ffa92e214ed3b059d3f7cb5443e08b Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 3 Nov 2021 14:59:31 +0100 -Subject: [PATCH 049/177] fix(LinstorSR): create diskless path if necessary +Subject: [PATCH 049/178] fix(LinstorSR): create diskless path if necessary during VDI loading Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 519afb29..15b9dda3 100755 +index 519afb2..15b9dda 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -1899,7 +1899,16 @@ class LinstorVDI(VDI.VDI): diff --git a/SOURCES/0050-feat-LinstorSR-use-HTTP-NBD-instead-of-DRBD-directly.patch b/SOURCES/0050-feat-LinstorSR-use-HTTP-NBD-instead-of-DRBD-directly.patch index 3980e6c..5118d89 100644 --- a/SOURCES/0050-feat-LinstorSR-use-HTTP-NBD-instead-of-DRBD-directly.patch +++ b/SOURCES/0050-feat-LinstorSR-use-HTTP-NBD-instead-of-DRBD-directly.patch @@ -1,7 +1,7 @@ From 7983be637bf274036cd89552891cc406bf20ea0a Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 12 May 2022 17:52:35 +0200 -Subject: [PATCH 050/177] feat(LinstorSR): use HTTP/NBD instead of DRBD +Subject: [PATCH 050/178] feat(LinstorSR): use HTTP/NBD instead of DRBD directly with heartbeat VDI Signed-off-by: Ronan Abhamon @@ -17,7 +17,7 @@ Signed-off-by: Ronan Abhamon create mode 100755 scripts/fork-log-daemon diff --git a/Makefile b/Makefile -index 2eb6a868..af1011a1 100755 +index 2eb6a86..af1011a 100755 --- a/Makefile +++ b/Makefile @@ -239,6 +239,7 @@ install: precheck @@ -29,7 +29,7 @@ index 2eb6a868..af1011a1 100755 install -m 755 scripts/check-device-sharing $(SM_STAGING)$(LIBEXEC) install -m 755 scripts/usb_change $(SM_STAGING)$(LIBEXEC) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 15b9dda3..5bdf6769 100755 +index 15b9dda..5bdf676 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -34,9 +34,13 @@ import cleanup @@ -502,7 +502,7 @@ index 15b9dda3..5bdf6769 100755 diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index af8d2b9e..30230adb 100755 +index af8d2b9..30230ad 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -36,7 +36,7 @@ import vhdutil @@ -580,7 +580,7 @@ index af8d2b9e..30230adb 100755 linstor = LinstorVolumeManager( 'linstor://localhost', diff --git a/drivers/linstorvhdutil.py b/drivers/linstorvhdutil.py -index ac858371..9ba0ac3b 100644 +index ac85837..9ba0ac3 100644 --- a/drivers/linstorvhdutil.py +++ b/drivers/linstorvhdutil.py @@ -42,7 +42,7 @@ def linstorhostcall(local_method, remote_method): @@ -611,7 +611,7 @@ index ac858371..9ba0ac3b 100644 ) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index e497afa6..da98e0b6 100755 +index e497afa..da98e0b 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -329,18 +329,21 @@ class LinstorVolumeManager(object): @@ -662,7 +662,7 @@ index e497afa6..da98e0b6 100755 # We ignore diskless pools of the form "DfltDisklessStorPool". if volume.storage_pool_name == self._group_name: diff --git a/drivers/util.py b/drivers/util.py -index 7151f368..6a9fc1a0 100755 +index 7151f36..6a9fc1a 100755 --- a/drivers/util.py +++ b/drivers/util.py @@ -1801,3 +1801,52 @@ def sessions_less_than_targets(other_config, device_config): @@ -720,7 +720,7 @@ index 7151f368..6a9fc1a0 100755 + return True diff --git a/scripts/fork-log-daemon b/scripts/fork-log-daemon new file mode 100755 -index 00000000..eb0f0b0f +index 0000000..eb0f0b0 --- /dev/null +++ b/scripts/fork-log-daemon @@ -0,0 +1,34 @@ diff --git a/SOURCES/0051-fix-LinstorSR-find-controller-when-XAPI-unreachable-.patch b/SOURCES/0051-fix-LinstorSR-find-controller-when-XAPI-unreachable-.patch index 53bd174..d8c8276 100644 --- a/SOURCES/0051-fix-LinstorSR-find-controller-when-XAPI-unreachable-.patch +++ b/SOURCES/0051-fix-LinstorSR-find-controller-when-XAPI-unreachable-.patch @@ -1,7 +1,7 @@ From 44393c71d8419d61c746fc2699c450bd08183b3b Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 3 Mar 2022 15:02:17 +0100 -Subject: [PATCH 051/177] fix(LinstorSR): find controller when XAPI unreachable +Subject: [PATCH 051/178] fix(LinstorSR): find controller when XAPI unreachable (XHA) Signed-off-by: Ronan Abhamon @@ -11,7 +11,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 74 insertions(+), 20 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 5bdf6769..a4f7afce 100755 +index 5bdf676..a4f7afc 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -46,6 +46,7 @@ import traceback @@ -108,7 +108,7 @@ index 5bdf6769..a4f7afce 100755 if not self._is_master: diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index da98e0b6..b4ee7830 100755 +index da98e0b..b4ee783 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -186,15 +186,16 @@ def _get_controller_uri(): diff --git a/SOURCES/0052-fix-LinstorSR-use-IPs-instead-of-hostnames-in-NBD-se.patch b/SOURCES/0052-fix-LinstorSR-use-IPs-instead-of-hostnames-in-NBD-se.patch index 9d766fc..d4cf332 100644 --- a/SOURCES/0052-fix-LinstorSR-use-IPs-instead-of-hostnames-in-NBD-se.patch +++ b/SOURCES/0052-fix-LinstorSR-use-IPs-instead-of-hostnames-in-NBD-se.patch @@ -1,7 +1,7 @@ From 58bf1f4dbf2f7860d18a55ff313363c6fa3f1305 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 24 Mar 2022 18:13:46 +0100 -Subject: [PATCH 052/177] fix(LinstorSR): use IPs instead of hostnames in NBD +Subject: [PATCH 052/178] fix(LinstorSR): use IPs instead of hostnames in NBD server Without this patch we can't use XCP-ng hosts configured with static IPS. @@ -14,7 +14,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 97 insertions(+), 16 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index a4f7afce..c0bfc3f1 100755 +index a4f7afc..c0bfc3f 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -251,8 +251,15 @@ def deflate(linstor, vdi_uuid, vdi_path, new_size, old_size): @@ -181,7 +181,7 @@ index a4f7afce..c0bfc3f1 100755 raise xs_errors.XenError( 'VDIUnavailable', diff --git a/drivers/util.py b/drivers/util.py -index 6a9fc1a0..7c52703c 100755 +index 6a9fc1a..7c52703 100755 --- a/drivers/util.py +++ b/drivers/util.py @@ -702,6 +702,18 @@ def get_hosts_attached_on(session, vdi_uuids): diff --git a/SOURCES/0053-fix-LinstorVolumeManager-ensure-we-always-use-IPs-in.patch b/SOURCES/0053-fix-LinstorVolumeManager-ensure-we-always-use-IPs-in.patch index a9b3e06..2268f50 100644 --- a/SOURCES/0053-fix-LinstorVolumeManager-ensure-we-always-use-IPs-in.patch +++ b/SOURCES/0053-fix-LinstorVolumeManager-ensure-we-always-use-IPs-in.patch @@ -1,7 +1,7 @@ From 972954832674cdd9c4792868a2fe4771a5c7eda0 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 31 Mar 2022 11:21:19 +0200 -Subject: [PATCH 053/177] fix(LinstorVolumeManager): ensure we always use IPs +Subject: [PATCH 053/178] fix(LinstorVolumeManager): ensure we always use IPs in _get_controller_uri Otherwise if a hostname is returned, we can't use it if the XCP-ng pool @@ -13,7 +13,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index b4ee7830..2d5c63ed 100755 +index b4ee783..2d5c63e 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -192,7 +192,7 @@ def _get_controller_uri(): diff --git a/SOURCES/0054-feat-linstor-manager-add-methods-to-add-remove-host-.patch b/SOURCES/0054-feat-linstor-manager-add-methods-to-add-remove-host-.patch index adf7f93..ef330c4 100644 --- a/SOURCES/0054-feat-linstor-manager-add-methods-to-add-remove-host-.patch +++ b/SOURCES/0054-feat-linstor-manager-add-methods-to-add-remove-host-.patch @@ -1,7 +1,7 @@ From df1b37be2e1b33838aa843f922de1de6cec3a793 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 6 Apr 2022 17:53:02 +0200 -Subject: [PATCH 054/177] feat(linstor-manager): add methods to add remove/host +Subject: [PATCH 054/178] feat(linstor-manager): add methods to add remove/host from LINSTOR SR Signed-off-by: Ronan Abhamon @@ -12,7 +12,7 @@ Signed-off-by: Ronan Abhamon 3 files changed, 338 insertions(+), 5 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index c0bfc3f1..413c5501 100755 +index c0bfc3f..413c550 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -401,7 +401,9 @@ class LinstorSR(SR.SR): @@ -36,7 +36,7 @@ index c0bfc3f1..413c5501 100755 self.physical_utilisation = self._linstor.allocated_volume_size diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index 30230adb..7e34ce65 100755 +index 30230ad..7e34ce6 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -22,8 +22,7 @@ sys.path[0] = '/opt/xensource/sm/' @@ -349,7 +349,7 @@ index 30230adb..7e34ce65 100755 + 'removeHost': remove_host }) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 2d5c63ed..6c0d5aa2 100755 +index 2d5c63e..6c0d5aa 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -402,6 +402,15 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0055-feat-LinstorVolumeManager-support-SR-creation-with-d.patch b/SOURCES/0055-feat-LinstorVolumeManager-support-SR-creation-with-d.patch index bb8bca2..b5f2e0d 100644 --- a/SOURCES/0055-feat-LinstorVolumeManager-support-SR-creation-with-d.patch +++ b/SOURCES/0055-feat-LinstorVolumeManager-support-SR-creation-with-d.patch @@ -1,7 +1,7 @@ From 1cacb61d45a0e8de6d99788a86eeffb7028edd85 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 13 Apr 2022 15:56:42 +0200 -Subject: [PATCH 055/177] feat(LinstorVolumeManager): support SR creation with +Subject: [PATCH 055/178] feat(LinstorVolumeManager): support SR creation with diskless nodes Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 55 insertions(+), 11 deletions(-) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 6c0d5aa2..430e080b 100755 +index 6c0d5aa..430e080 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -1543,9 +1543,14 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0056-feat-LinstorSR-add-a-config-var-to-disable-HTTP-NBD-.patch b/SOURCES/0056-feat-LinstorSR-add-a-config-var-to-disable-HTTP-NBD-.patch index bc346b6..f441ee1 100644 --- a/SOURCES/0056-feat-LinstorSR-add-a-config-var-to-disable-HTTP-NBD-.patch +++ b/SOURCES/0056-feat-LinstorSR-add-a-config-var-to-disable-HTTP-NBD-.patch @@ -1,7 +1,7 @@ From 2e4d783b1d7cd7dd9a7ac40504ac6ec71dcde60c Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 14 Apr 2022 10:30:23 +0200 -Subject: [PATCH 056/177] feat(LinstorSR): add a config var to disable HTTP/NBD +Subject: [PATCH 056/178] feat(LinstorSR): add a config var to disable HTTP/NBD servers Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 413c5501..927e4771 100755 +index 413c550..927e477 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -61,6 +61,13 @@ XHA_CONFIG_PATH = '/etc/xensource/xhad.conf' diff --git a/SOURCES/0057-feat-LinstorSr-ensure-LVM-group-is-activated-during-.patch b/SOURCES/0057-feat-LinstorSr-ensure-LVM-group-is-activated-during-.patch index e25e74e..1ae0311 100644 --- a/SOURCES/0057-feat-LinstorSr-ensure-LVM-group-is-activated-during-.patch +++ b/SOURCES/0057-feat-LinstorSr-ensure-LVM-group-is-activated-during-.patch @@ -1,7 +1,7 @@ From c241c1495897b952e6ea11fd062cac28109394aa Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 14 Apr 2022 15:45:20 +0200 -Subject: [PATCH 057/177] feat(LinstorSr): ensure LVM group is activated during +Subject: [PATCH 057/178] feat(LinstorSr): ensure LVM group is activated during SR.attach/create Signed-off-by: Ronan Abhamon @@ -11,7 +11,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 927e4771..e2d3d783 100755 +index 927e477..e2d3d78 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -34,6 +34,7 @@ import cleanup @@ -82,7 +82,7 @@ index 927e4771..e2d3d783 100755 def _update_minidrbdcluster(self, host, enabled): self._exec_manager_command( diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index 7e34ce65..91731b1d 100755 +index 7e34ce6..91731b1 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -76,6 +76,8 @@ def update_minidrbdcluster_service(start): diff --git a/SOURCES/0058-feat-linstor-manager-add-method-to-create-LinstorSR-.patch b/SOURCES/0058-feat-linstor-manager-add-method-to-create-LinstorSR-.patch index b225781..4712191 100644 --- a/SOURCES/0058-feat-linstor-manager-add-method-to-create-LinstorSR-.patch +++ b/SOURCES/0058-feat-linstor-manager-add-method-to-create-LinstorSR-.patch @@ -1,7 +1,7 @@ From cac2dda720b05ba479b272c9c65b5f14af180956 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 25 Apr 2022 14:47:51 +0200 -Subject: [PATCH 058/177] feat(linstor-manager): add method to create LinstorSR +Subject: [PATCH 058/178] feat(linstor-manager): add method to create LinstorSR + to list/destroy DRBD volumes Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 168 insertions(+), 11 deletions(-) diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index 91731b1d..7893ebc6 100755 +index 91731b1..7893ebc 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -23,6 +23,7 @@ sys.path[0] = '/opt/xensource/sm/' diff --git a/SOURCES/0059-fix-LinstorSR-always-set-vdi_path-in-generate_config.patch b/SOURCES/0059-fix-LinstorSR-always-set-vdi_path-in-generate_config.patch index 14d1e35..d2abdfa 100644 --- a/SOURCES/0059-fix-LinstorSR-always-set-vdi_path-in-generate_config.patch +++ b/SOURCES/0059-fix-LinstorSR-always-set-vdi_path-in-generate_config.patch @@ -1,7 +1,7 @@ From f990493afc8187a52faab4913a6b353f70ab1583 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 26 Apr 2022 11:20:08 +0200 -Subject: [PATCH 059/177] fix(LinstorSR): always set vdi_path in +Subject: [PATCH 059/178] fix(LinstorSR): always set vdi_path in generate_config If the volume of a generated config is not related to HTTP/NBD @@ -14,7 +14,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index e2d3d783..1855e3d9 100755 +index e2d3d78..1855e3d 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -1970,7 +1970,7 @@ class LinstorVDI(VDI.VDI): diff --git a/SOURCES/0060-fix-minidrbdcluster-supports-new-properties-like-for.patch b/SOURCES/0060-fix-minidrbdcluster-supports-new-properties-like-for.patch index aa19534..6fcdd8e 100644 --- a/SOURCES/0060-fix-minidrbdcluster-supports-new-properties-like-for.patch +++ b/SOURCES/0060-fix-minidrbdcluster-supports-new-properties-like-for.patch @@ -1,7 +1,7 @@ From ed527602dea427ea63080a07395aaf7d99572953 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 13 May 2022 14:35:57 +0200 -Subject: [PATCH 060/177] fix(minidrbdcluster): supports new properties like +Subject: [PATCH 060/178] fix(minidrbdcluster): supports new properties like `force-io-failures` Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/minidrbdcluster b/scripts/minidrbdcluster -index a04b6c1c..fb4de09b 100755 +index a04b6c1..fb4de09 100755 --- a/scripts/minidrbdcluster +++ b/scripts/minidrbdcluster @@ -11,15 +11,15 @@ DRBDADM_OPEN_FAILED_RE = re.compile( diff --git a/SOURCES/0061-fix-LinstorSR-enabled-disable-minidrbcluster-with-fi.patch b/SOURCES/0061-fix-LinstorSR-enabled-disable-minidrbcluster-with-fi.patch index 0784c9b..f2c0ccd 100644 --- a/SOURCES/0061-fix-LinstorSR-enabled-disable-minidrbcluster-with-fi.patch +++ b/SOURCES/0061-fix-LinstorSR-enabled-disable-minidrbcluster-with-fi.patch @@ -1,7 +1,7 @@ From 4a1220b9552323f2e79f9512ed030ae45ab4c800 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 18 May 2022 17:28:33 +0200 -Subject: [PATCH 061/177] fix(LinstorSR): enabled/disable minidrbcluster with +Subject: [PATCH 061/178] fix(LinstorSR): enabled/disable minidrbcluster with fixed order Ensure we disable minidrbdcluster during SR destruction on all hosts @@ -16,7 +16,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 1855e3d9..57280e36 100755 +index 1855e3d..57280e3 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -751,7 +751,9 @@ class LinstorSR(SR.SR): diff --git a/SOURCES/0062-fix-linstor-manager-change-linstor-satellite-start-b.patch b/SOURCES/0062-fix-linstor-manager-change-linstor-satellite-start-b.patch index 79490c5..72e06cb 100644 --- a/SOURCES/0062-fix-linstor-manager-change-linstor-satellite-start-b.patch +++ b/SOURCES/0062-fix-linstor-manager-change-linstor-satellite-start-b.patch @@ -1,7 +1,7 @@ From 77eddf395a3248f479ece8223c11da473ba7992b Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 31 May 2022 14:01:45 +0200 -Subject: [PATCH 062/177] fix(linstor-manager): change linstor satellite start +Subject: [PATCH 062/178] fix(linstor-manager): change linstor satellite start behavior Ensure we don't have an invalid cache used by a satellite: @@ -15,7 +15,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index 7893ebc6..c6d622f2 100755 +index 7893ebc..c6d622f 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -61,7 +61,16 @@ def update_all_ports(open): diff --git a/SOURCES/0063-Fix-is_open-call-for-LinstorSR.patch b/SOURCES/0063-Fix-is_open-call-for-LinstorSR.patch index 5d55ce6..8d6a540 100644 --- a/SOURCES/0063-Fix-is_open-call-for-LinstorSR.patch +++ b/SOURCES/0063-Fix-is_open-call-for-LinstorSR.patch @@ -1,7 +1,7 @@ From 4ee79f2016b9816380baaba51b75c4b35830ab5f Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 2 Jun 2022 09:04:28 +0200 -Subject: [PATCH 063/177] Fix is_open call for LinstorSR +Subject: [PATCH 063/178] Fix is_open call for LinstorSR 1. Ensure LinstorSR driver is imported in `_is_open` definition to register it in the driver list. Otherwise this function always fails with a SRUnknownType exception. @@ -17,7 +17,7 @@ Signed-off-by: Ronan Abhamon 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 57280e36..e5f6f85c 100755 +index 57280e3..e5f6f85 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -445,7 +445,11 @@ class LinstorSR(SR.SR): @@ -45,7 +45,7 @@ index 57280e36..e5f6f85c 100755 if not self._is_master: diff --git a/drivers/on_slave.py b/drivers/on_slave.py -index 3c7bd340..bbef4f7f 100755 +index 3c7bd34..bbef4f7 100755 --- a/drivers/on_slave.py +++ b/drivers/on_slave.py @@ -78,6 +78,7 @@ def _is_open(session, args): @@ -81,7 +81,7 @@ index 3c7bd340..bbef4f7f 100755 tapdisk = blktap2.Tapdisk.find_by_path(vdi.path) util.SMlog("Tapdisk for %s: %s" % (vdi.path, tapdisk)) diff --git a/tests/test_on_slave.py b/tests/test_on_slave.py -index 54ebcd38..4c12d903 100644 +index 54ebcd3..4c12d90 100644 --- a/tests/test_on_slave.py +++ b/tests/test_on_slave.py @@ -13,7 +13,15 @@ import on_slave diff --git a/SOURCES/0064-fix-linstorvhdutil-fix-boolean-params-of-check-call.patch b/SOURCES/0064-fix-linstorvhdutil-fix-boolean-params-of-check-call.patch index 6f96b55..7c60fd8 100644 --- a/SOURCES/0064-fix-linstorvhdutil-fix-boolean-params-of-check-call.patch +++ b/SOURCES/0064-fix-linstorvhdutil-fix-boolean-params-of-check-call.patch @@ -1,7 +1,7 @@ From 1c0757759ea80cbf9ff35cc487a0b7d3cc2bfeb6 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 2 Jun 2022 09:28:32 +0200 -Subject: [PATCH 064/177] fix(linstorvhdutil): fix boolean params of `check` +Subject: [PATCH 064/178] fix(linstorvhdutil): fix boolean params of `check` call `ignoreMissingFooter` and `fast` must be string types to be used with XAPI plugin API. @@ -13,7 +13,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index c6d622f2..63c0e3ed 100755 +index c6d622f..63c0e3e 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -289,8 +289,10 @@ def destroy(session, args): @@ -30,7 +30,7 @@ index c6d622f2..63c0e3ed 100755 except Exception as e: util.SMlog('linstor-manager:check error: {}'.format(e)) diff --git a/drivers/linstorvhdutil.py b/drivers/linstorvhdutil.py -index 9ba0ac3b..f3d98705 100644 +index 9ba0ac3..f3d9870 100644 --- a/drivers/linstorvhdutil.py +++ b/drivers/linstorvhdutil.py @@ -111,7 +111,10 @@ class LinstorVhdUtil: diff --git a/SOURCES/0065-feat-linstor-manager-robustify-exec_create_sr.patch b/SOURCES/0065-feat-linstor-manager-robustify-exec_create_sr.patch index 714a350..dcf2c19 100644 --- a/SOURCES/0065-feat-linstor-manager-robustify-exec_create_sr.patch +++ b/SOURCES/0065-feat-linstor-manager-robustify-exec_create_sr.patch @@ -1,7 +1,7 @@ From 2f674984e2454621bd71eb4c3a0573f40704bb45 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 30 Jun 2022 17:09:51 +0200 -Subject: [PATCH 065/177] feat(linstor-manager): robustify exec_create_sr +Subject: [PATCH 065/178] feat(linstor-manager): robustify exec_create_sr - Use lvm.py XCP-ng xapi plugins instead of lvm (old name) - Check arguments to create the SR @@ -15,7 +15,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 78 insertions(+), 34 deletions(-) diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index 63c0e3ed..2930a9ed 100755 +index 63c0e3e..2930a9e 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -36,7 +36,7 @@ import util diff --git a/SOURCES/0066-fix-cleanup-print-LINSTOR-VDI-UUID-if-error-during-i.patch b/SOURCES/0066-fix-cleanup-print-LINSTOR-VDI-UUID-if-error-during-i.patch index d2b097e..9b4a1fb 100644 --- a/SOURCES/0066-fix-cleanup-print-LINSTOR-VDI-UUID-if-error-during-i.patch +++ b/SOURCES/0066-fix-cleanup-print-LINSTOR-VDI-UUID-if-error-during-i.patch @@ -1,7 +1,7 @@ From 21f073b1a262414c1910773a02ca54cd6f92c57e Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 8 Jul 2022 14:52:25 +0200 -Subject: [PATCH 066/177] fix(cleanup): print LINSTOR VDI UUID if error during +Subject: [PATCH 066/178] fix(cleanup): print LINSTOR VDI UUID if error during info loading (not SR UUID) Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/cleanup.py b/drivers/cleanup.py -index 9e3a5b07..7eeeee7f 100755 +index 9e3a5b0..7eeeee7 100755 --- a/drivers/cleanup.py +++ b/drivers/cleanup.py @@ -2974,7 +2974,7 @@ class LinstorSR(SR): diff --git a/SOURCES/0067-feat-cleanup-raise-and-dump-DRBD-openers-in-case-of-.patch b/SOURCES/0067-feat-cleanup-raise-and-dump-DRBD-openers-in-case-of-.patch index b56947b..c3d144a 100644 --- a/SOURCES/0067-feat-cleanup-raise-and-dump-DRBD-openers-in-case-of-.patch +++ b/SOURCES/0067-feat-cleanup-raise-and-dump-DRBD-openers-in-case-of-.patch @@ -1,7 +1,7 @@ From 7b48c2a2c1635be52db7ab1625bc5d6d3b6c635e Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 21 Jul 2022 11:39:20 +0200 -Subject: [PATCH 067/177] feat(cleanup): raise and dump DRBD openers in case of +Subject: [PATCH 067/178] feat(cleanup): raise and dump DRBD openers in case of bad coalesce Signed-off-by: Ronan Abhamon @@ -12,7 +12,7 @@ Signed-off-by: Ronan Abhamon 3 files changed, 70 insertions(+), 18 deletions(-) diff --git a/drivers/cleanup.py b/drivers/cleanup.py -index 7eeeee7f..0a586a67 100755 +index 7eeeee7..0a586a6 100755 --- a/drivers/cleanup.py +++ b/drivers/cleanup.py @@ -3079,27 +3079,17 @@ class LinstorSR(SR): @@ -51,7 +51,7 @@ index 7eeeee7f..0a586a67 100755 ################################################################################ # diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index 2930a9ed..81789e7a 100755 +index 2930a9e..81789e7 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -823,6 +823,43 @@ def destroy_drbd_volumes(session, args): @@ -107,7 +107,7 @@ index 2930a9ed..81789e7a 100755 + 'getDrbdOpeners': get_drbd_openers }) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 430e080b..d17845b5 100755 +index 430e080..d17845b 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -1048,6 +1048,30 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0068-feat-linstorvhdutil-trace-DRBD-openers-in-case-of-ER.patch b/SOURCES/0068-feat-linstorvhdutil-trace-DRBD-openers-in-case-of-ER.patch index c2feda0..de374e8 100644 --- a/SOURCES/0068-feat-linstorvhdutil-trace-DRBD-openers-in-case-of-ER.patch +++ b/SOURCES/0068-feat-linstorvhdutil-trace-DRBD-openers-in-case-of-ER.patch @@ -1,7 +1,7 @@ From 17e39c0d21e3e0385d51d27c3192f8a28022bb3c Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 22 Jul 2022 10:26:20 +0200 -Subject: [PATCH 068/177] feat(linstorvhdutil): trace DRBD openers in case of +Subject: [PATCH 068/178] feat(linstorvhdutil): trace DRBD openers in case of EROFS errors Signed-off-by: Ronan Abhamon @@ -11,7 +11,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 47 insertions(+), 9 deletions(-) diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index 81789e7a..9022499f 100755 +index 81789e7..9022499 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -868,6 +868,13 @@ if __name__ == '__main__': @@ -37,7 +37,7 @@ index 81789e7a..9022499f 100755 'lsofResource': lsof_resource, 'hasControllerRunning': has_controller_running, diff --git a/drivers/linstorvhdutil.py b/drivers/linstorvhdutil.py -index f3d98705..d6a21c26 100644 +index f3d9870..d6a21c2 100644 --- a/drivers/linstorvhdutil.py +++ b/drivers/linstorvhdutil.py @@ -26,6 +26,36 @@ import xs_errors diff --git a/SOURCES/0069-fix-linstorvolumemanager-compute-correctly-size-in-a.patch b/SOURCES/0069-fix-linstorvolumemanager-compute-correctly-size-in-a.patch index c50230c..7a73cd8 100644 --- a/SOURCES/0069-fix-linstorvolumemanager-compute-correctly-size-in-a.patch +++ b/SOURCES/0069-fix-linstorvolumemanager-compute-correctly-size-in-a.patch @@ -1,7 +1,7 @@ From 28090053e877e2bfb9bedf42af9a65a70b355ff5 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 29 Jul 2022 17:25:48 +0200 -Subject: [PATCH 069/177] fix(linstorvolumemanager): compute correctly size in +Subject: [PATCH 069/178] fix(linstorvolumemanager): compute correctly size in allocated_volume_size Remove replication count in computation. @@ -12,7 +12,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 23 insertions(+), 36 deletions(-) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index d17845b5..3806cc91 100755 +index d17845b..3806cc9 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -481,28 +481,6 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0070-feat-LinstorSR-use-DRBD-openers-instead-of-lsof-to-l.patch b/SOURCES/0070-feat-LinstorSR-use-DRBD-openers-instead-of-lsof-to-l.patch index 6abefb4..62e5419 100644 --- a/SOURCES/0070-feat-LinstorSR-use-DRBD-openers-instead-of-lsof-to-l.patch +++ b/SOURCES/0070-feat-LinstorSR-use-DRBD-openers-instead-of-lsof-to-l.patch @@ -1,7 +1,7 @@ From 97e4f95765285fcd3a860d66a8f02f170a4e8e73 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 9 Aug 2022 11:07:57 +0200 -Subject: [PATCH 070/177] feat(LinstorSR): use DRBD openers instead of lsof to +Subject: [PATCH 070/178] feat(LinstorSR): use DRBD openers instead of lsof to log in blktap2 Signed-off-by: Ronan Abhamon @@ -12,7 +12,7 @@ Signed-off-by: Ronan Abhamon 3 files changed, 100 insertions(+), 128 deletions(-) diff --git a/drivers/blktap2.py b/drivers/blktap2.py -index 14c564e6..370f7fb8 100755 +index 14c564e..370f7fb 100755 --- a/drivers/blktap2.py +++ b/drivers/blktap2.py @@ -36,7 +36,7 @@ import json @@ -34,7 +34,7 @@ index 14c564e6..370f7fb8 100755 try: tapdisk = cls.__from_blktap(blktap) diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index 9022499f..4d0ba299 100755 +index 9022499..4d0ba29 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -27,7 +27,7 @@ import XenAPI @@ -114,7 +114,7 @@ index 9022499f..4d0ba299 100755 'addHost': add_host, 'removeHost': remove_host, diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 3806cc91..6f4c5900 100755 +index 3806cc9..6f4c590 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -45,81 +45,56 @@ DRBD_BY_RES_PATH = '/dev/drbd/by-res/' diff --git a/SOURCES/0071-feat-LinstorSR-support-cProfile-to-trace-calls-when-.patch b/SOURCES/0071-feat-LinstorSR-support-cProfile-to-trace-calls-when-.patch index cd54b99..b500a5d 100644 --- a/SOURCES/0071-feat-LinstorSR-support-cProfile-to-trace-calls-when-.patch +++ b/SOURCES/0071-feat-LinstorSR-support-cProfile-to-trace-calls-when-.patch @@ -1,7 +1,7 @@ From 7af2ef8980077fc54ee58661502c9b49f7b973c9 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 25 Aug 2022 12:11:18 +0200 -Subject: [PATCH 071/177] feat(LinstorSR): support cProfile to trace calls when +Subject: [PATCH 071/178] feat(LinstorSR): support cProfile to trace calls when a command is executed Signed-off-by: Ronan Abhamon @@ -11,7 +11,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index e5f6f85c..00554d73 100755 +index e5f6f85..00554d7 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -69,6 +69,9 @@ FORK_LOG_DAEMON = '/opt/xensource/libexec/fork-log-daemon' @@ -39,7 +39,7 @@ index e5f6f85c..00554d73 100755 else: SR.registerSR(LinstorSR) diff --git a/drivers/util.py b/drivers/util.py -index 7c52703c..fe8e13d1 100755 +index 7c52703..fe8e13d 100755 --- a/drivers/util.py +++ b/drivers/util.py @@ -1862,3 +1862,45 @@ def check_pid_exists(pid): diff --git a/SOURCES/0072-fix-LinstorJournaler-reset-namespace-when-get-is-cal.patch b/SOURCES/0072-fix-LinstorJournaler-reset-namespace-when-get-is-cal.patch index bc686b8..7605118 100644 --- a/SOURCES/0072-fix-LinstorJournaler-reset-namespace-when-get-is-cal.patch +++ b/SOURCES/0072-fix-LinstorJournaler-reset-namespace-when-get-is-cal.patch @@ -1,7 +1,7 @@ From ff1e4c6c25e4d804f7b4635dbf8cd4d696beef0a Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 24 Aug 2022 17:09:11 +0200 -Subject: [PATCH 072/177] fix(LinstorJournaler): reset namespace when `get` is +Subject: [PATCH 072/178] fix(LinstorJournaler): reset namespace when `get` is called Otherwise, we can be in the wrong namespace and the key to find will be inaccessible. @@ -10,7 +10,7 @@ Otherwise, we can be in the wrong namespace and the key to find will be inaccess 1 file changed, 1 insertion(+) diff --git a/drivers/linstorjournaler.py b/drivers/linstorjournaler.py -index 3993f601..1e85ec96 100755 +index 3993f60..1e85ec9 100755 --- a/drivers/linstorjournaler.py +++ b/drivers/linstorjournaler.py @@ -107,6 +107,7 @@ class LinstorJournaler: diff --git a/SOURCES/0073-fix-linstorvhdutil-fix-coalesce-with-VM-running-unde.patch b/SOURCES/0073-fix-linstorvhdutil-fix-coalesce-with-VM-running-unde.patch index 27fe6b0..327f4ff 100644 --- a/SOURCES/0073-fix-linstorvhdutil-fix-coalesce-with-VM-running-unde.patch +++ b/SOURCES/0073-fix-linstorvhdutil-fix-coalesce-with-VM-running-unde.patch @@ -1,7 +1,7 @@ From 3bda00e34c79c8448b61d3f02c09ae7d910eb9ce Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 25 Aug 2022 10:54:56 +0200 -Subject: [PATCH 073/177] fix(linstorvhdutil): fix coalesce with VM running +Subject: [PATCH 073/178] fix(linstorvhdutil): fix coalesce with VM running under specific scenario: When a VM is running, we can't coalesce without this patch with a long chain @@ -21,7 +21,7 @@ Impacted vhd-util functions: coalesce, getParent, repair. 5 files changed, 251 insertions(+), 94 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 00554d73..47ac3c85 100755 +index 00554d7..47ac3c8 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -163,7 +163,9 @@ def attach_thin(session, journaler, linstor, sr_uuid, vdi_uuid): @@ -59,7 +59,7 @@ index 00554d73..47ac3c85 100755 # 4.c. Update CBT status of disks either just added # or already in XAPI. diff --git a/drivers/cleanup.py b/drivers/cleanup.py -index 0a586a67..73293632 100755 +index 0a586a6..7329363 100755 --- a/drivers/cleanup.py +++ b/drivers/cleanup.py @@ -840,12 +840,14 @@ class VDI(object): @@ -110,7 +110,7 @@ index 0a586a67..73293632 100755 HIDDEN_TAG = 'hidden' diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index 4d0ba299..5485b900 100755 +index 4d0ba29..5485b90 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -416,6 +416,37 @@ def get_block_bitmap(session, args): @@ -165,7 +165,7 @@ index 4d0ba299..5485b900 100755 'hasControllerRunning': has_controller_running, 'addHost': add_host, diff --git a/drivers/linstorvhdutil.py b/drivers/linstorvhdutil.py -index d6a21c26..4d031e12 100644 +index d6a21c2..4d031e1 100644 --- a/drivers/linstorvhdutil.py +++ b/drivers/linstorvhdutil.py @@ -25,39 +25,30 @@ import xs_errors @@ -534,7 +534,7 @@ index d6a21c26..4d031e12 100644 + ) + return util.retry(remote_call, 5, 2) diff --git a/drivers/vhdutil.py b/drivers/vhdutil.py -index 0a8fe918..d75edb11 100755 +index 0a8fe91..d75edb1 100755 --- a/drivers/vhdutil.py +++ b/drivers/vhdutil.py @@ -97,9 +97,8 @@ def calcOverheadFull(virtual_size): diff --git a/SOURCES/0074-fix-linstorvolumemanager-_get_volumes_info-doesn-t-r.patch b/SOURCES/0074-fix-linstorvolumemanager-_get_volumes_info-doesn-t-r.patch index cdb76c2..d9c7438 100644 --- a/SOURCES/0074-fix-linstorvolumemanager-_get_volumes_info-doesn-t-r.patch +++ b/SOURCES/0074-fix-linstorvolumemanager-_get_volumes_info-doesn-t-r.patch @@ -1,7 +1,7 @@ From 94ede43831ca0996b88a27626a9559d3f6b1f403 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 5 Sep 2022 15:09:17 +0200 -Subject: [PATCH 074/177] fix(linstorvolumemanager): `_get_volumes_info` +Subject: [PATCH 074/178] fix(linstorvolumemanager): `_get_volumes_info` doesn't raise with offline host Ensure this method doesn't raise an exception when a host is offline. @@ -14,7 +14,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 6f4c5900..a1bc151e 100755 +index 6f4c590..a1bc151 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -1789,15 +1789,18 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0075-fix-linstorvolumemanager-remove-double-prefix-on-kv-.patch b/SOURCES/0075-fix-linstorvolumemanager-remove-double-prefix-on-kv-.patch index f0161d2..e92aea4 100644 --- a/SOURCES/0075-fix-linstorvolumemanager-remove-double-prefix-on-kv-.patch +++ b/SOURCES/0075-fix-linstorvolumemanager-remove-double-prefix-on-kv-.patch @@ -1,7 +1,7 @@ From 5d26e090abc329bd612d52e2c82fd4607c01ef17 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 12 Sep 2022 15:56:09 +0200 -Subject: [PATCH 075/177] fix(linstorvolumemanager): remove double prefix on kv +Subject: [PATCH 075/178] fix(linstorvolumemanager): remove double prefix on kv group name - Before this patch, when the kv store was created/accessed, a double "xcp-sr-" prefix was used. @@ -13,7 +13,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index a1bc151e..3ee5d248 100755 +index a1bc151..3ee5d24 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -2195,7 +2195,7 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0076-feat-LinstorSR-add-linstor-kv-dump-helper-to-print-k.patch b/SOURCES/0076-feat-LinstorSR-add-linstor-kv-dump-helper-to-print-k.patch index 67a255e..17b1229 100644 --- a/SOURCES/0076-feat-LinstorSR-add-linstor-kv-dump-helper-to-print-k.patch +++ b/SOURCES/0076-feat-LinstorSR-add-linstor-kv-dump-helper-to-print-k.patch @@ -1,7 +1,7 @@ From cbe616a7450f988cc267eb02b73de8e03f546fd6 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 12 Sep 2022 17:54:57 +0200 -Subject: [PATCH 076/177] feat(LinstorSR): add linstor-kv-dump helper to print +Subject: [PATCH 076/178] feat(LinstorSR): add linstor-kv-dump helper to print kv store Signed-off-by: Ronan Abhamon @@ -12,7 +12,7 @@ Signed-off-by: Ronan Abhamon create mode 100755 scripts/linstor-kv-dump diff --git a/Makefile b/Makefile -index af1011a1..aa71f809 100755 +index af1011a..aa71f80 100755 --- a/Makefile +++ b/Makefile @@ -240,6 +240,7 @@ install: precheck @@ -25,7 +25,7 @@ index af1011a1..aa71f809 100755 install -m 755 scripts/usb_change $(SM_STAGING)$(LIBEXEC) diff --git a/scripts/linstor-kv-dump b/scripts/linstor-kv-dump new file mode 100755 -index 00000000..93598d7c +index 0000000..93598d7 --- /dev/null +++ b/scripts/linstor-kv-dump @@ -0,0 +1,38 @@ diff --git a/SOURCES/0077-fix-LinstorSR-disable-VHD-key-hash-usage-to-limit-ex.patch b/SOURCES/0077-fix-LinstorSR-disable-VHD-key-hash-usage-to-limit-ex.patch index 5484c6d..046db0f 100644 --- a/SOURCES/0077-fix-LinstorSR-disable-VHD-key-hash-usage-to-limit-ex.patch +++ b/SOURCES/0077-fix-LinstorSR-disable-VHD-key-hash-usage-to-limit-ex.patch @@ -1,7 +1,7 @@ From 5232782abcfd52a3ff75a8f83906af61c5a0a77d Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 14 Sep 2022 10:17:18 +0200 -Subject: [PATCH 077/177] fix(LinstorSR): disable VHD key hash usage to limit +Subject: [PATCH 077/178] fix(LinstorSR): disable VHD key hash usage to limit exec time Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 47ac3c85..374d6cb9 100755 +index 47ac3c8..374d6cb 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -72,6 +72,9 @@ USE_HTTP_NBD_SERVERS = True diff --git a/SOURCES/0078-fix-minidrbdcluster-ensure-SIGINT-is-handled-correct.patch b/SOURCES/0078-fix-minidrbdcluster-ensure-SIGINT-is-handled-correct.patch index 8d64f08..ee96fba 100644 --- a/SOURCES/0078-fix-minidrbdcluster-ensure-SIGINT-is-handled-correct.patch +++ b/SOURCES/0078-fix-minidrbdcluster-ensure-SIGINT-is-handled-correct.patch @@ -1,7 +1,7 @@ From 9c9b5a3ea111d22c550e6f983ca7539b14908737 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 15 Sep 2022 11:34:25 +0200 -Subject: [PATCH 078/177] fix(minidrbdcluster): ensure SIGINT is handled +Subject: [PATCH 078/178] fix(minidrbdcluster): ensure SIGINT is handled correctly This patch is here to make sure no LINSTOR controller survives when @@ -20,7 +20,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/scripts/minidrbdcluster b/scripts/minidrbdcluster -index fb4de09b..4cdc59e6 100755 +index fb4de09..4cdc59e 100755 --- a/scripts/minidrbdcluster +++ b/scripts/minidrbdcluster @@ -1,7 +1,6 @@ @@ -83,7 +83,7 @@ index fb4de09b..4cdc59e6 100755 return call_systemd('start', service) diff --git a/systemd/minidrbdcluster.service b/systemd/minidrbdcluster.service -index 3de6ac4f..1ddf91f3 100644 +index 3de6ac4..1ddf91f 100644 --- a/systemd/minidrbdcluster.service +++ b/systemd/minidrbdcluster.service @@ -10,6 +10,7 @@ Environment=PYTHONUNBUFFERED=1 diff --git a/SOURCES/0079-feat-minidrbdcluster-stop-resource-services-at-start.patch b/SOURCES/0079-feat-minidrbdcluster-stop-resource-services-at-start.patch index 8c1780f..b1b275a 100644 --- a/SOURCES/0079-feat-minidrbdcluster-stop-resource-services-at-start.patch +++ b/SOURCES/0079-feat-minidrbdcluster-stop-resource-services-at-start.patch @@ -1,7 +1,7 @@ From 5f8a99eff7f2f137b7afac5738d45c1c56a8846b Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 15 Sep 2022 11:49:34 +0200 -Subject: [PATCH 079/177] feat(minidrbdcluster): stop resource services at +Subject: [PATCH 079/178] feat(minidrbdcluster): stop resource services at startup - Ensure all services are stopped when minidrbcluster is started. @@ -14,7 +14,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/scripts/minidrbdcluster b/scripts/minidrbdcluster -index 4cdc59e6..eae7cbfe 100755 +index 4cdc59e..eae7cbf 100755 --- a/scripts/minidrbdcluster +++ b/scripts/minidrbdcluster @@ -83,8 +83,7 @@ def show_status(services, status): diff --git a/SOURCES/0080-feat-linstor-manager-add-new-healthCheck-function-to.patch b/SOURCES/0080-feat-linstor-manager-add-new-healthCheck-function-to.patch index de206c3..7c8f4ac 100644 --- a/SOURCES/0080-feat-linstor-manager-add-new-healthCheck-function-to.patch +++ b/SOURCES/0080-feat-linstor-manager-add-new-healthCheck-function-to.patch @@ -1,7 +1,7 @@ From 488877ba4b8602148c23e3238a7530e67ad5ea8f Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 23 Sep 2022 17:45:08 +0200 -Subject: [PATCH 080/177] feat(linstor-manager): add new `healthCheck` function +Subject: [PATCH 080/178] feat(linstor-manager): add new `healthCheck` function to monitor pool (#26) Print a JSON output to monitor state of LINSTOR SRs: @@ -109,7 +109,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 220 insertions(+), 1 deletion(-) diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index 5485b900..7abc1054 100755 +index 5485b90..7abc105 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -848,6 +848,119 @@ def get_drbd_openers(session, args): @@ -241,7 +241,7 @@ index 5485b900..7abc1054 100755 + 'healthCheck': health_check }) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 3ee5d248..efe5d53b 100755 +index 3ee5d24..efe5d53 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -1402,6 +1402,111 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0081-fix-LinstorSR-fix-xha-conf-parsing-return-host-ip-no.patch b/SOURCES/0081-fix-LinstorSR-fix-xha-conf-parsing-return-host-ip-no.patch index b0adf8b..691ebe2 100644 --- a/SOURCES/0081-fix-LinstorSR-fix-xha-conf-parsing-return-host-ip-no.patch +++ b/SOURCES/0081-fix-LinstorSR-fix-xha-conf-parsing-return-host-ip-no.patch @@ -1,7 +1,7 @@ From a5be376a1404d031c41abd728e758f8d296a09db Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 4 Oct 2022 11:01:33 +0200 -Subject: [PATCH 081/177] fix(LinstorSR): fix xha conf parsing => return host +Subject: [PATCH 081/178] fix(LinstorSR): fix xha conf parsing => return host ip, not the UUID Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 374d6cb9..d32771fe 100755 +index 374d6cb..d32771f 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -277,7 +277,7 @@ def get_ips_from_xha_config_file(): diff --git a/SOURCES/0082-fix-LinstorSR-start-correctly-HA-servers-HTTP-NBD-af.patch b/SOURCES/0082-fix-LinstorSR-start-correctly-HA-servers-HTTP-NBD-af.patch index fa2cd7b..f11c843 100644 --- a/SOURCES/0082-fix-LinstorSR-start-correctly-HA-servers-HTTP-NBD-af.patch +++ b/SOURCES/0082-fix-LinstorSR-start-correctly-HA-servers-HTTP-NBD-af.patch @@ -1,7 +1,7 @@ From 65d5ff02da3d1c084573924a82735da84f1ec5c4 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 4 Oct 2022 18:48:09 +0200 -Subject: [PATCH 082/177] fix(LinstorSR): start correctly HA servers (HTTP/NBD) +Subject: [PATCH 082/178] fix(LinstorSR): start correctly HA servers (HTTP/NBD) after reboot Use a timeout call after a reboot to get a XAPI session because @@ -15,7 +15,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index d32771fe..ae253858 100755 +index d32771f..ae25385 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -2513,7 +2513,10 @@ class LinstorVDI(VDI.VDI): diff --git a/SOURCES/0083-fix-linstorvolumemanager-use-an-array-to-store-diskf.patch b/SOURCES/0083-fix-linstorvolumemanager-use-an-array-to-store-diskf.patch index 177326d..241546d 100644 --- a/SOURCES/0083-fix-linstorvolumemanager-use-an-array-to-store-diskf.patch +++ b/SOURCES/0083-fix-linstorvolumemanager-use-an-array-to-store-diskf.patch @@ -1,7 +1,7 @@ From 90cd3fd85ce5c73b4727a579acda75721252963a Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 5 Oct 2022 10:45:50 +0200 -Subject: [PATCH 083/177] fix(linstorvolumemanager): use an array to store +Subject: [PATCH 083/178] fix(linstorvolumemanager): use an array to store diskful volumes info Otherwise the `is_diskful` attr only reflects the info of one host @@ -15,7 +15,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index ae253858..b8558077 100755 +index ae25385..b855807 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -39,6 +39,7 @@ import os @@ -37,7 +37,7 @@ index ae253858..b8558077 100755 drbd_path = None if must_get_device_path or self.sr._is_master: diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index efe5d53b..e577f63c 100755 +index efe5d53..e577f63 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -307,19 +307,19 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0084-feat-linstorvolumemanager-support-snaps-when-a-host-.patch b/SOURCES/0084-feat-linstorvolumemanager-support-snaps-when-a-host-.patch index bc46485..f060e6e 100644 --- a/SOURCES/0084-feat-linstorvolumemanager-support-snaps-when-a-host-.patch +++ b/SOURCES/0084-feat-linstorvolumemanager-support-snaps-when-a-host-.patch @@ -1,7 +1,7 @@ From 8e4f41d2b6caa3830f1073e3ab463657e9bb0d67 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 6 Oct 2022 17:54:10 +0200 -Subject: [PATCH 084/177] feat(linstorvolumemanager): support snaps when a host +Subject: [PATCH 084/178] feat(linstorvolumemanager): support snaps when a host is offline - Don't create diskless volumes during clone, delay it. @@ -12,7 +12,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 6 deletions(-) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index e577f63c..09aad42f 100755 +index e577f63..09aad42 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -1199,12 +1199,6 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0085-fix-linstorvolumemanager-support-offline-hosts-when-.patch b/SOURCES/0085-fix-linstorvolumemanager-support-offline-hosts-when-.patch index a32829a..5574f5d 100644 --- a/SOURCES/0085-fix-linstorvolumemanager-support-offline-hosts-when-.patch +++ b/SOURCES/0085-fix-linstorvolumemanager-support-offline-hosts-when-.patch @@ -1,7 +1,7 @@ From 53755a3d8e40a2493bc006139e9631ed7c3ae531 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 7 Oct 2022 17:18:37 +0200 -Subject: [PATCH 085/177] fix(linstorvolumemanager): support offline hosts when +Subject: [PATCH 085/178] fix(linstorvolumemanager): support offline hosts when plugins are called - Robustify plugin calls @@ -13,7 +13,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 52 insertions(+), 17 deletions(-) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 09aad42f..58c02382 100755 +index 09aad42..58c0238 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -83,15 +83,30 @@ def get_all_volume_openers(resource_name, volume): diff --git a/SOURCES/0086-fix-linstorvolumemanager-define-_base_group_name-mem.patch b/SOURCES/0086-fix-linstorvolumemanager-define-_base_group_name-mem.patch index f7fa187..ea8d62f 100644 --- a/SOURCES/0086-fix-linstorvolumemanager-define-_base_group_name-mem.patch +++ b/SOURCES/0086-fix-linstorvolumemanager-define-_base_group_name-mem.patch @@ -1,7 +1,7 @@ From 61f2aa4e8c0ee7ed0a7bb514a8c5d6e7d8b1e789 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 7 Oct 2022 17:45:26 +0200 -Subject: [PATCH 086/177] fix(linstorvolumemanager): define _base_group_name +Subject: [PATCH 086/178] fix(linstorvolumemanager): define _base_group_name member at SR creation Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 2 insertions(+) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 58c02382..d19effbe 100755 +index 58c0238..d19effb 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -1622,6 +1622,7 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0087-feat-linstorvhdutil-modify-logic-of-local-vhdutil-ca.patch b/SOURCES/0087-feat-linstorvhdutil-modify-logic-of-local-vhdutil-ca.patch index 19f1160..9a02ada 100644 --- a/SOURCES/0087-feat-linstorvhdutil-modify-logic-of-local-vhdutil-ca.patch +++ b/SOURCES/0087-feat-linstorvhdutil-modify-logic-of-local-vhdutil-ca.patch @@ -1,7 +1,7 @@ From f42a4f663b05544178d929d46740a16abc5d6ca9 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 10 Oct 2022 14:33:24 +0200 -Subject: [PATCH 087/177] feat(linstorvhdutil): modify logic of local vhdutil +Subject: [PATCH 087/178] feat(linstorvhdutil): modify logic of local vhdutil calls - Always log openers when we can't call vhdutil locally @@ -13,7 +13,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 44 insertions(+), 28 deletions(-) diff --git a/drivers/linstorvhdutil.py b/drivers/linstorvhdutil.py -index 4d031e12..2687cadf 100644 +index 4d031e1..2687cad 100644 --- a/drivers/linstorvhdutil.py +++ b/drivers/linstorvhdutil.py @@ -65,12 +65,17 @@ def linstorhostcall(local_method, remote_method): diff --git a/SOURCES/0088-fix-linstorvolumemanager-robustify-failed-snapshots.patch b/SOURCES/0088-fix-linstorvolumemanager-robustify-failed-snapshots.patch index d03ce1c..27e4e25 100644 --- a/SOURCES/0088-fix-linstorvolumemanager-robustify-failed-snapshots.patch +++ b/SOURCES/0088-fix-linstorvolumemanager-robustify-failed-snapshots.patch @@ -1,7 +1,7 @@ From f5a1ae173fe0af8c91f125796f1785b6971d1405 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 17 Oct 2022 18:14:16 +0200 -Subject: [PATCH 088/177] fix(linstorvolumemanager): robustify failed snapshots +Subject: [PATCH 088/178] fix(linstorvolumemanager): robustify failed snapshots - Ensure we can always rename a failed snap, so we must check if we have metadata in the KV-store. Otherwise an error is triggered @@ -15,7 +15,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index d19effbe..44b247e8 100755 +index d19effb..44b247e 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -951,7 +951,11 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0089-fix-linstorvolumemanager-use-a-namespace-for-volumes.patch b/SOURCES/0089-fix-linstorvolumemanager-use-a-namespace-for-volumes.patch index 0dac5ab..434a384 100644 --- a/SOURCES/0089-fix-linstorvolumemanager-use-a-namespace-for-volumes.patch +++ b/SOURCES/0089-fix-linstorvolumemanager-use-a-namespace-for-volumes.patch @@ -1,7 +1,7 @@ From f7cf38ee5935f024250d13a40be3f2b81eaf6a7e Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 8 Nov 2022 17:31:45 +0100 -Subject: [PATCH 089/177] fix(linstorvolumemanager): use a namespace for +Subject: [PATCH 089/178] fix(linstorvolumemanager): use a namespace for volumes - This change is not compatible with existing LINSTOR SR instances! @@ -12,7 +12,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 44b247e8..8c253d49 100755 +index 44b247e..8c253d4 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -308,7 +308,7 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0090-feat-linstor-kv-dump-rename-to-linstor-kv-tool-add-r.patch b/SOURCES/0090-feat-linstor-kv-dump-rename-to-linstor-kv-tool-add-r.patch index 154bfee..3b6278d 100644 --- a/SOURCES/0090-feat-linstor-kv-dump-rename-to-linstor-kv-tool-add-r.patch +++ b/SOURCES/0090-feat-linstor-kv-dump-rename-to-linstor-kv-tool-add-r.patch @@ -1,7 +1,7 @@ From ef7f0c07eab1c25393611a57162e1290c6b54308 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 14 Nov 2022 17:18:48 +0100 -Subject: [PATCH 090/177] feat(linstor-kv-dump): rename to linstor-kv-tool + +Subject: [PATCH 090/178] feat(linstor-kv-dump): rename to linstor-kv-tool + add remove volume helpers --- @@ -11,7 +11,7 @@ Subject: [PATCH 090/177] feat(linstor-kv-dump): rename to linstor-kv-tool + rename scripts/{linstor-kv-dump => linstor-kv-tool} (51%) diff --git a/Makefile b/Makefile -index aa71f809..42058c82 100755 +index aa71f80..42058c8 100755 --- a/Makefile +++ b/Makefile @@ -240,7 +240,7 @@ install: precheck @@ -27,7 +27,7 @@ diff --git a/scripts/linstor-kv-dump b/scripts/linstor-kv-tool similarity index 51% rename from scripts/linstor-kv-dump rename to scripts/linstor-kv-tool -index 93598d7c..128d8992 100755 +index 93598d7..128d899 100755 --- a/scripts/linstor-kv-dump +++ b/scripts/linstor-kv-tool @@ -18,6 +18,7 @@ import argparse diff --git a/SOURCES/0091-fix-LinstorSR-handle-correctly-localhost-during-star.patch b/SOURCES/0091-fix-LinstorSR-handle-correctly-localhost-during-star.patch index 9ed5986..68a565e 100644 --- a/SOURCES/0091-fix-LinstorSR-handle-correctly-localhost-during-star.patch +++ b/SOURCES/0091-fix-LinstorSR-handle-correctly-localhost-during-star.patch @@ -1,7 +1,7 @@ From 196dce016c304f57e9e60a60397fc58c992d459f Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 16 Nov 2022 12:12:12 +0100 -Subject: [PATCH 091/177] fix(LinstorSR): handle correctly localhost during +Subject: [PATCH 091/178] fix(LinstorSR): handle correctly localhost during start/stop of minidrbdcluster Otherwise another controller can be started during `xe sr-destroy` call. @@ -14,7 +14,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index b8558077..ba284524 100755 +index b855807..ba28452 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -967,25 +967,48 @@ class LinstorSR(SR.SR): diff --git a/SOURCES/0092-fix-cleanup.py-call-repair-on-another-host-when-EROF.patch b/SOURCES/0092-fix-cleanup.py-call-repair-on-another-host-when-EROF.patch index b841295..f19208b 100644 --- a/SOURCES/0092-fix-cleanup.py-call-repair-on-another-host-when-EROF.patch +++ b/SOURCES/0092-fix-cleanup.py-call-repair-on-another-host-when-EROF.patch @@ -1,7 +1,7 @@ From 628668575b779ebb479e4621170b78ae2636b928 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 17 Nov 2022 15:43:25 +0100 -Subject: [PATCH 092/177] fix(cleanup.py): call repair on another host when +Subject: [PATCH 092/178] fix(cleanup.py): call repair on another host when EROFS is returned (DRBD) Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/drivers/cleanup.py b/drivers/cleanup.py -index 73293632..f6c4346b 100755 +index 7329363..f6c4346 100755 --- a/drivers/cleanup.py +++ b/drivers/cleanup.py @@ -726,6 +726,12 @@ class VDI(object): diff --git a/SOURCES/0093-fix-LinstorSR-avoid-introduction-of-DELETED-volumes.patch b/SOURCES/0093-fix-LinstorSR-avoid-introduction-of-DELETED-volumes.patch index 0fc1210..4cd4c5f 100644 --- a/SOURCES/0093-fix-LinstorSR-avoid-introduction-of-DELETED-volumes.patch +++ b/SOURCES/0093-fix-LinstorSR-avoid-introduction-of-DELETED-volumes.patch @@ -1,7 +1,7 @@ From a7b89628ae53027de00b1cfe03d6bedc38e02f4a Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 17 Nov 2022 15:46:02 +0100 -Subject: [PATCH 093/177] fix(LinstorSR): avoid introduction of DELETED volumes +Subject: [PATCH 093/178] fix(LinstorSR): avoid introduction of DELETED volumes Signed-off-by: Ronan Abhamon --- @@ -9,7 +9,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 3 insertions(+) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index ba284524..9e5b3cda 100755 +index ba28452..9e5b3cd 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -1170,6 +1170,9 @@ class LinstorSR(SR.SR): diff --git a/SOURCES/0094-feat-linstor-kv-tool-remove-all-volumes-supports-jou.patch b/SOURCES/0094-feat-linstor-kv-tool-remove-all-volumes-supports-jou.patch index e6374eb..28d4988 100644 --- a/SOURCES/0094-feat-linstor-kv-tool-remove-all-volumes-supports-jou.patch +++ b/SOURCES/0094-feat-linstor-kv-tool-remove-all-volumes-supports-jou.patch @@ -1,7 +1,7 @@ From e609d0fca2a6dd7efbadf3d97ff9b0f85549a216 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 18 Nov 2022 10:40:58 +0100 -Subject: [PATCH 094/177] feat(linstor-kv-tool): remove-all-volumes supports +Subject: [PATCH 094/178] feat(linstor-kv-tool): remove-all-volumes supports journals now Not yet supported for remove-volume, not sure about the consequences @@ -13,7 +13,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/linstor-kv-tool b/scripts/linstor-kv-tool -index 128d8992..c9070270 100755 +index 128d899..c907027 100755 --- a/scripts/linstor-kv-tool +++ b/scripts/linstor-kv-tool @@ -48,7 +48,7 @@ def remove_all_volumes(controller_uri, group_name): diff --git a/SOURCES/0095-fix-linstorvhdutil-due-to-bad-refactoring-check-call.patch b/SOURCES/0095-fix-linstorvhdutil-due-to-bad-refactoring-check-call.patch index b86def5..0d3f736 100644 --- a/SOURCES/0095-fix-linstorvhdutil-due-to-bad-refactoring-check-call.patch +++ b/SOURCES/0095-fix-linstorvhdutil-due-to-bad-refactoring-check-call.patch @@ -1,7 +1,7 @@ From fb05d2668ccc6f24109d5c30611fbfc167e34340 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 23 Nov 2022 15:26:51 +0100 -Subject: [PATCH 095/177] fix(linstorvhdutil): due to bad refactoring, check +Subject: [PATCH 095/178] fix(linstorvhdutil): due to bad refactoring, check call was broken Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/linstorvhdutil.py b/drivers/linstorvhdutil.py -index 2687cadf..a883ca4d 100644 +index 2687cad..a883ca4 100644 --- a/drivers/linstorvhdutil.py +++ b/drivers/linstorvhdutil.py @@ -124,11 +124,11 @@ class LinstorVhdUtil: diff --git a/SOURCES/0096-feat-linstorvhdutil-ensure-we-use-VHD-parent-to-find.patch b/SOURCES/0096-feat-linstorvhdutil-ensure-we-use-VHD-parent-to-find.patch index 8bbeed3..a54a743 100644 --- a/SOURCES/0096-feat-linstorvhdutil-ensure-we-use-VHD-parent-to-find.patch +++ b/SOURCES/0096-feat-linstorvhdutil-ensure-we-use-VHD-parent-to-find.patch @@ -1,7 +1,7 @@ From a765c54efe219c79f7a40550aadd7311f29757fe Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 23 Nov 2022 15:28:23 +0100 -Subject: [PATCH 096/177] feat(linstorvhdutil): ensure we use VHD parent to +Subject: [PATCH 096/178] feat(linstorvhdutil): ensure we use VHD parent to find host where to coalesce Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/drivers/linstorvhdutil.py b/drivers/linstorvhdutil.py -index a883ca4d..c2e9665f 100644 +index a883ca4..c2e9665 100644 --- a/drivers/linstorvhdutil.py +++ b/drivers/linstorvhdutil.py @@ -228,15 +228,15 @@ class LinstorVhdUtil: diff --git a/SOURCES/0097-feat-linstorvolumemanager-force-DRBD-demote-after-fa.patch b/SOURCES/0097-feat-linstorvolumemanager-force-DRBD-demote-after-fa.patch index 5e88dc2..c5380de 100644 --- a/SOURCES/0097-feat-linstorvolumemanager-force-DRBD-demote-after-fa.patch +++ b/SOURCES/0097-feat-linstorvolumemanager-force-DRBD-demote-after-fa.patch @@ -1,7 +1,7 @@ From be33740647adac8be43e998a0ce620524f43db24 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 5 Dec 2022 18:40:11 +0100 -Subject: [PATCH 097/177] feat(linstorvolumemanager): force DRBD demote after +Subject: [PATCH 097/178] feat(linstorvolumemanager): force DRBD demote after failed volume creation/clone Signed-off-by: Ronan Abhamon @@ -11,7 +11,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 91 insertions(+), 23 deletions(-) diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index 7abc1054..5c4c5c90 100755 +index 7abc105..5c4c5c9 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -804,6 +804,18 @@ def create_sr(session, args): @@ -42,7 +42,7 @@ index 7abc1054..5c4c5c90 100755 'destroyDrbdVolumes': destroy_drbd_volumes, 'getDrbdOpeners': get_drbd_openers, diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 8c253d49..2e2feb23 100755 +index 8c253d4..2e2feb2 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -242,6 +242,29 @@ def get_controller_node_name(): diff --git a/SOURCES/0098-fix-linstorvhdutil-ensure-we-retry-creation-in-all-s.patch b/SOURCES/0098-fix-linstorvhdutil-ensure-we-retry-creation-in-all-s.patch index 7c4420d..c5249f7 100644 --- a/SOURCES/0098-fix-linstorvhdutil-ensure-we-retry-creation-in-all-s.patch +++ b/SOURCES/0098-fix-linstorvhdutil-ensure-we-retry-creation-in-all-s.patch @@ -1,7 +1,7 @@ From 11cd26e0cd28d9aa622bdc31ace20008c11ab02e Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 6 Dec 2022 11:22:15 +0100 -Subject: [PATCH 098/177] fix(linstorvhdutil): ensure we retry creation in all +Subject: [PATCH 098/178] fix(linstorvhdutil): ensure we retry creation in all situations Without this patch, a basic resource creation is never restarted @@ -14,7 +14,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 35 insertions(+), 39 deletions(-) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 2e2feb23..81cce802 100755 +index 2e2feb2..81cce80 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -2044,9 +2044,25 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0099-fix-linstorvhdutil-don-t-retry-local-vhdutil-call-wh.patch b/SOURCES/0099-fix-linstorvhdutil-don-t-retry-local-vhdutil-call-wh.patch index 04815de..c22011c 100644 --- a/SOURCES/0099-fix-linstorvhdutil-don-t-retry-local-vhdutil-call-wh.patch +++ b/SOURCES/0099-fix-linstorvhdutil-don-t-retry-local-vhdutil-call-wh.patch @@ -1,7 +1,7 @@ From 9a688cb7ccdf0d6dacda5f92caff8fe6a058967d Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 7 Dec 2022 17:56:39 +0100 -Subject: [PATCH 099/177] fix(linstorvhdutil): don't retry local vhdutil call +Subject: [PATCH 099/178] fix(linstorvhdutil): don't retry local vhdutil call when EROFS is detected Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 48 insertions(+), 31 deletions(-) diff --git a/drivers/linstorvhdutil.py b/drivers/linstorvhdutil.py -index c2e9665f..63d59ab5 100644 +index c2e9665..63d59ab 100644 --- a/drivers/linstorvhdutil.py +++ b/drivers/linstorvhdutil.py @@ -47,6 +47,14 @@ def call_vhd_util_on_host(session, host_ref, method, device_path, args): diff --git a/SOURCES/0100-feat-fork-log-daemon-ignore-SIGTERM.patch b/SOURCES/0100-feat-fork-log-daemon-ignore-SIGTERM.patch index 88f65fe..5cae536 100644 --- a/SOURCES/0100-feat-fork-log-daemon-ignore-SIGTERM.patch +++ b/SOURCES/0100-feat-fork-log-daemon-ignore-SIGTERM.patch @@ -1,7 +1,7 @@ From 3ff1971e28327c89e72f1df2d952339aed48ebeb Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 15 Dec 2022 14:36:04 +0100 -Subject: [PATCH 100/177] feat(fork-log-daemon): ignore SIGTERM +Subject: [PATCH 100/178] feat(fork-log-daemon): ignore SIGTERM Without this patch, the output logs of the fork-log-daemon child are never displayed when SIGTERM is sent to the PGID. @@ -12,7 +12,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 2 insertions(+) diff --git a/scripts/fork-log-daemon b/scripts/fork-log-daemon -index eb0f0b0f..665a60ba 100755 +index eb0f0b0..665a60b 100755 --- a/scripts/fork-log-daemon +++ b/scripts/fork-log-daemon @@ -1,12 +1,14 @@ diff --git a/SOURCES/0101-feat-LinstorSR-wait-for-http-disk-server-startup.patch b/SOURCES/0101-feat-LinstorSR-wait-for-http-disk-server-startup.patch index 56dc35a..3700926 100644 --- a/SOURCES/0101-feat-LinstorSR-wait-for-http-disk-server-startup.patch +++ b/SOURCES/0101-feat-LinstorSR-wait-for-http-disk-server-startup.patch @@ -1,7 +1,7 @@ From 2023aa15d2bbd899eb6af814584b88a3deb3f6bf Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 16 Dec 2022 16:52:50 +0100 -Subject: [PATCH 101/177] feat(LinstorSR): wait for http-disk-server startup +Subject: [PATCH 101/178] feat(LinstorSR): wait for http-disk-server startup Avoid a race condition with NBD server. We must be sure the HTTP server is reachable before the NBD server execution, @@ -13,7 +13,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 9e5b3cda..f336534e 100755 +index 9e5b3cd..f336534 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -2527,13 +2527,10 @@ class LinstorVDI(VDI.VDI): diff --git a/SOURCES/0102-fix-LinstorSR-handle-inflate-resize-actions-correctl.patch b/SOURCES/0102-fix-LinstorSR-handle-inflate-resize-actions-correctl.patch index df9479c..8a77c0f 100644 --- a/SOURCES/0102-fix-LinstorSR-handle-inflate-resize-actions-correctl.patch +++ b/SOURCES/0102-fix-LinstorSR-handle-inflate-resize-actions-correctl.patch @@ -1,7 +1,7 @@ From 574565e1b754b653ab88a8ad6d897a5725462fb4 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 16 Jan 2023 17:58:51 +0100 -Subject: [PATCH 102/177] fix(LinstorSR): handle inflate + resize actions +Subject: [PATCH 102/178] fix(LinstorSR): handle inflate + resize actions correctly - Ensure LINSTOR set the expected new volume size when inflate is executed, @@ -17,7 +17,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index f336534e..72ec9de7 100755 +index f336534..72ec9de 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -234,7 +234,7 @@ def inflate(journaler, linstor, vdi_uuid, vdi_path, new_size, old_size): diff --git a/SOURCES/0103-fix-linstor-manager-add-a-static-iptables-rule-for-D.patch b/SOURCES/0103-fix-linstor-manager-add-a-static-iptables-rule-for-D.patch index 8736c29..2b0c4e6 100644 --- a/SOURCES/0103-fix-linstor-manager-add-a-static-iptables-rule-for-D.patch +++ b/SOURCES/0103-fix-linstor-manager-add-a-static-iptables-rule-for-D.patch @@ -1,7 +1,7 @@ From 01efc1b1f0655e160932bb3667c0fa74733ec84c Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 17 Jan 2023 11:55:00 +0100 -Subject: [PATCH 103/177] fix(linstor-manager): add a static iptables rule for +Subject: [PATCH 103/178] fix(linstor-manager): add a static iptables rule for DRBD volumes Using the XAPI iptables firewall may drop DRBD packets when the connection @@ -17,7 +17,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index 5c4c5c90..6ee435c6 100755 +index 5c4c5c9..6ee435c 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -40,11 +40,12 @@ LVM_PLUGIN = 'lvm.py' diff --git a/SOURCES/0104-feat-LinstorSR-sync-with-last-http-nbd-transfer-vers.patch b/SOURCES/0104-feat-LinstorSR-sync-with-last-http-nbd-transfer-vers.patch index 21b5963..4123e4e 100644 --- a/SOURCES/0104-feat-LinstorSR-sync-with-last-http-nbd-transfer-vers.patch +++ b/SOURCES/0104-feat-LinstorSR-sync-with-last-http-nbd-transfer-vers.patch @@ -1,7 +1,7 @@ From 511280dc71a3766cead7f37138cc3b8f843a187b Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 3 Feb 2023 16:38:49 +0100 -Subject: [PATCH 104/177] feat(LinstorSR): sync with last http-nbd-transfer +Subject: [PATCH 104/178] feat(LinstorSR): sync with last http-nbd-transfer version - Increase auto promote timeout of heartbeat VDI to reduce CPU usage @@ -15,7 +15,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 72ec9de7..31f45055 100755 +index 72ec9de..31f4505 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -1761,6 +1761,13 @@ class LinstorVDI(VDI.VDI): @@ -88,7 +88,7 @@ index 72ec9de7..31f45055 100755 return match.group(1) # Use a timeout to never block the smapi if there is a problem. diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 81cce802..e0f39e71 100755 +index 81cce80..e0f39e7 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -851,6 +851,25 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0105-fix-LinstorSR-don-t-check-VDI-metadata-while-listing.patch b/SOURCES/0105-fix-LinstorSR-don-t-check-VDI-metadata-while-listing.patch index 3446543..5c08217 100644 --- a/SOURCES/0105-fix-LinstorSR-don-t-check-VDI-metadata-while-listing.patch +++ b/SOURCES/0105-fix-LinstorSR-don-t-check-VDI-metadata-while-listing.patch @@ -1,7 +1,7 @@ From 344d0c58408c89f48fb41cb1bfd70e5bed56781e Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 13 Feb 2023 17:24:16 +0100 -Subject: [PATCH 105/177] fix(LinstorSR): don't check VDI metadata while +Subject: [PATCH 105/178] fix(LinstorSR): don't check VDI metadata while listing VDIs if it's deleted Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 31f45055..41ece825 100755 +index 31f4505..41ece82 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -1169,6 +1169,9 @@ class LinstorSR(SR.SR): diff --git a/SOURCES/0106-fix-LinstorSR-don-t-check-metadata-when-destroying-s.patch b/SOURCES/0106-fix-LinstorSR-don-t-check-metadata-when-destroying-s.patch index f0b94ad..357c4b7 100644 --- a/SOURCES/0106-fix-LinstorSR-don-t-check-metadata-when-destroying-s.patch +++ b/SOURCES/0106-fix-LinstorSR-don-t-check-metadata-when-destroying-s.patch @@ -1,7 +1,7 @@ From a00ccf6b47da3012b77dcba6cc22e21124434ec9 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 13 Feb 2023 17:27:43 +0100 -Subject: [PATCH 106/177] fix(LinstorSR): don't check metadata when destroying +Subject: [PATCH 106/178] fix(LinstorSR): don't check metadata when destroying snap in undo_clone Remove useless check in the snap rollback helper when there is an error @@ -16,7 +16,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 4 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 41ece825..94cf1b77 100755 +index 41ece82..94cf1b7 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -1496,10 +1496,6 @@ class LinstorSR(SR.SR): diff --git a/SOURCES/0107-fix-linstorvhdutil-handle-correctly-generic-exceptio.patch b/SOURCES/0107-fix-linstorvhdutil-handle-correctly-generic-exceptio.patch index 4846877..bc7354f 100644 --- a/SOURCES/0107-fix-linstorvhdutil-handle-correctly-generic-exceptio.patch +++ b/SOURCES/0107-fix-linstorvhdutil-handle-correctly-generic-exceptio.patch @@ -1,7 +1,7 @@ From 04722ec04e536210e0504bb784e649639d6af306 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 15 Feb 2023 11:34:54 +0100 -Subject: [PATCH 107/177] fix(linstorvhdutil): handle correctly generic +Subject: [PATCH 107/178] fix(linstorvhdutil): handle correctly generic exceptions in _raise_openers_exception Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/linstorvhdutil.py b/drivers/linstorvhdutil.py -index 63d59ab5..05225e88 100644 +index 63d59ab..05225e8 100644 --- a/drivers/linstorvhdutil.py +++ b/drivers/linstorvhdutil.py @@ -289,25 +289,26 @@ class LinstorVhdUtil: diff --git a/SOURCES/0108-fix-minidrbdcluster-robustify-to-unmount-correctly-L.patch b/SOURCES/0108-fix-minidrbdcluster-robustify-to-unmount-correctly-L.patch index 796e273..af9ce3b 100644 --- a/SOURCES/0108-fix-minidrbdcluster-robustify-to-unmount-correctly-L.patch +++ b/SOURCES/0108-fix-minidrbdcluster-robustify-to-unmount-correctly-L.patch @@ -1,7 +1,7 @@ From 3b63e456318beb1746adab95136d142d1ee93f9e Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 16 Feb 2023 14:24:07 +0100 -Subject: [PATCH 108/177] fix(minidrbdcluster): robustify to unmount correctly +Subject: [PATCH 108/178] fix(minidrbdcluster): robustify to unmount correctly LINSTOR DB There is a small delay during which the database may not be unmounted @@ -17,7 +17,7 @@ Signed-off-by: Ronan Abhamon create mode 100755 scripts/safe-umount diff --git a/Makefile b/Makefile -index 42058c82..72d7be3f 100755 +index 42058c8..72d7be3 100755 --- a/Makefile +++ b/Makefile @@ -241,6 +241,7 @@ install: precheck @@ -29,7 +29,7 @@ index 42058c82..72d7be3f 100755 install -m 755 scripts/check-device-sharing $(SM_STAGING)$(LIBEXEC) install -m 755 scripts/usb_change $(SM_STAGING)$(LIBEXEC) diff --git a/etc/systemd/system/var-lib-linstor.service b/etc/systemd/system/var-lib-linstor.service -index d230d048..e9deb904 100644 +index d230d04..e9deb90 100644 --- a/etc/systemd/system/var-lib-linstor.service +++ b/etc/systemd/system/var-lib-linstor.service @@ -17,5 +17,5 @@ Description=Mount filesystem for the LINSTOR controller @@ -41,7 +41,7 @@ index d230d048..e9deb904 100644 RemainAfterExit=true diff --git a/scripts/safe-umount b/scripts/safe-umount new file mode 100755 -index 00000000..9c1dcc40 +index 0000000..9c1dcc4 --- /dev/null +++ b/scripts/safe-umount @@ -0,0 +1,39 @@ diff --git a/SOURCES/0109-fix-minidrbdcluster-handle-correctly-KeyboardInterru.patch b/SOURCES/0109-fix-minidrbdcluster-handle-correctly-KeyboardInterru.patch index 6e1765e..d7988c2 100644 --- a/SOURCES/0109-fix-minidrbdcluster-handle-correctly-KeyboardInterru.patch +++ b/SOURCES/0109-fix-minidrbdcluster-handle-correctly-KeyboardInterru.patch @@ -1,7 +1,7 @@ From af8bb2c311fb2dcf54f158b60b62c4b77073bbe8 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 20 Feb 2023 19:30:18 +0100 -Subject: [PATCH 109/177] fix(minidrbdcluster): handle correctly +Subject: [PATCH 109/178] fix(minidrbdcluster): handle correctly KeyboardInterrupt with systemd units It's necessary to always add systemd services in the running list before @@ -15,7 +15,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/minidrbdcluster b/scripts/minidrbdcluster -index eae7cbfe..03d6b010 100755 +index eae7cbf..03d6b01 100755 --- a/scripts/minidrbdcluster +++ b/scripts/minidrbdcluster @@ -104,10 +104,11 @@ def process(events2, resources, running_services, status): diff --git a/SOURCES/0110-feat-LinstorSR-use-drbd-reactor-instead-of-minidrbdc.patch b/SOURCES/0110-feat-LinstorSR-use-drbd-reactor-instead-of-minidrbdc.patch index 9a60125..fc5830e 100644 --- a/SOURCES/0110-feat-LinstorSR-use-drbd-reactor-instead-of-minidrbdc.patch +++ b/SOURCES/0110-feat-LinstorSR-use-drbd-reactor-instead-of-minidrbdc.patch @@ -1,7 +1,7 @@ From 180f9e933cad1eefb1d9694b4a98d912d70b8697 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 24 Feb 2023 14:28:29 +0100 -Subject: [PATCH 110/177] feat(LinstorSR): use drbd-reactor instead of +Subject: [PATCH 110/178] feat(LinstorSR): use drbd-reactor instead of minidrbdcluster Signed-off-by: Ronan Abhamon @@ -19,7 +19,7 @@ Signed-off-by: Ronan Abhamon delete mode 100644 systemd/minidrbdcluster.service diff --git a/Makefile b/Makefile -index 72d7be3f..bc3e97fe 100755 +index 72d7be3..bc3e97f 100755 --- a/Makefile +++ b/Makefile @@ -100,7 +100,6 @@ MPATH_CUSTOM_CONF_DIR := /etc/multipath/conf.d/ @@ -65,7 +65,7 @@ index 72d7be3f..bc3e97fe 100755 .PHONY: clean clean: diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 94cf1b77..a3da28e7 100755 +index 94cf1b7..a3da28e 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -461,6 +461,10 @@ class LinstorSR(SR.SR): @@ -187,7 +187,7 @@ index 94cf1b77..a3da28e7 100755 # -------------------------------------------------------------------------- # Metadata. diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index 6ee435c6..7e34b5f6 100755 +index 6ee435c..7e34b5f 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -22,6 +22,7 @@ sys.path[0] = '/opt/xensource/sm/' @@ -341,7 +341,7 @@ index 6ee435c6..7e34b5f6 100755 'detach': detach, 'destroy': destroy, diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index e0f39e71..4662043c 100755 +index e0f39e7..4662043 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -1622,7 +1622,7 @@ class LinstorVolumeManager(object): @@ -364,7 +364,7 @@ index e0f39e71..4662043c 100755 'DrbdOptions/auto-quorum': 'disabled', diff --git a/etc/minidrbdcluster.ini b/etc/minidrbdcluster.ini deleted file mode 100644 -index 9e523427..00000000 +index 9e52342..0000000 --- a/etc/minidrbdcluster.ini +++ /dev/null @@ -1,14 +0,0 @@ @@ -384,7 +384,7 @@ index 9e523427..00000000 -systemd-units= diff --git a/scripts/minidrbdcluster b/scripts/minidrbdcluster deleted file mode 100755 -index 03d6b010..00000000 +index 03d6b01..0000000 --- a/scripts/minidrbdcluster +++ /dev/null @@ -1,203 +0,0 @@ @@ -593,7 +593,7 @@ index 03d6b010..00000000 - main() diff --git a/systemd/minidrbdcluster.service b/systemd/minidrbdcluster.service deleted file mode 100644 -index 1ddf91f3..00000000 +index 1ddf91f..0000000 --- a/systemd/minidrbdcluster.service +++ /dev/null @@ -1,19 +0,0 @@ diff --git a/SOURCES/0111-fix-LinstorSR-ensure-vhdutil-calls-are-correctly-exe.patch b/SOURCES/0111-fix-LinstorSR-ensure-vhdutil-calls-are-correctly-exe.patch index 7ba0109..470076f 100644 --- a/SOURCES/0111-fix-LinstorSR-ensure-vhdutil-calls-are-correctly-exe.patch +++ b/SOURCES/0111-fix-LinstorSR-ensure-vhdutil-calls-are-correctly-exe.patch @@ -1,7 +1,7 @@ From b49b91f7a56cc4e673fbc6edcc05bc40a14d1bea Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 1 Mar 2023 10:56:43 +0100 -Subject: [PATCH 111/177] fix(LinstorSR): ensure vhdutil calls are correctly +Subject: [PATCH 111/178] fix(LinstorSR): ensure vhdutil calls are correctly executed on pools with > 3 hosts Signed-off-by: Ronan Abhamon @@ -12,7 +12,7 @@ Signed-off-by: Ronan Abhamon 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index a3da28e7..10e0f543 100755 +index a3da28e..10e0f54 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -1884,9 +1884,12 @@ class LinstorVDI(VDI.VDI): @@ -50,7 +50,7 @@ index a3da28e7..10e0f543 100755 self.size = vhd_info.sizeVirt self.parent = vhd_info.parentUuid diff --git a/drivers/linstorvhdutil.py b/drivers/linstorvhdutil.py -index 05225e88..c1b817d7 100644 +index 05225e8..c1b817d 100644 --- a/drivers/linstorvhdutil.py +++ b/drivers/linstorvhdutil.py @@ -47,7 +47,7 @@ def call_vhd_util_on_host(session, host_ref, method, device_path, args): @@ -112,7 +112,7 @@ index 05225e88..c1b817d7 100644 # Retry only locally if it's not an EROFS exception. return util.retry(local_call, 5, 2, exceptions=[util.CommandException]) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 4662043c..5ab83c41 100755 +index 4662043..5ab83c4 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -1410,12 +1410,12 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0112-fix-LinstorSR-replace-bad-param-in-detach_thin-impl.patch b/SOURCES/0112-fix-LinstorSR-replace-bad-param-in-detach_thin-impl.patch index 446ca15..0da0574 100644 --- a/SOURCES/0112-fix-LinstorSR-replace-bad-param-in-detach_thin-impl.patch +++ b/SOURCES/0112-fix-LinstorSR-replace-bad-param-in-detach_thin-impl.patch @@ -1,7 +1,7 @@ From 099f7a633435610b5e09c487ef0d42473d8fd9a9 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 9 Mar 2023 17:06:59 +0100 -Subject: [PATCH 112/177] fix(LinstorSR): replace bad param in detach_thin impl +Subject: [PATCH 112/178] fix(LinstorSR): replace bad param in detach_thin impl To get the physical size, the volume UUID must be used, not the path. @@ -11,7 +11,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 10e0f543..c42f07d6 100755 +index 10e0f54..c42f07d 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -215,7 +215,7 @@ def detach_thin(session, linstor, sr_uuid, vdi_uuid): diff --git a/SOURCES/0113-fix-linstorvolumemanager-remove-usage-of-realpath.patch b/SOURCES/0113-fix-linstorvolumemanager-remove-usage-of-realpath.patch index 7a2a0be..b3f6545 100644 --- a/SOURCES/0113-fix-linstorvolumemanager-remove-usage-of-realpath.patch +++ b/SOURCES/0113-fix-linstorvolumemanager-remove-usage-of-realpath.patch @@ -1,7 +1,7 @@ From 1d84de36cf45bbaba8fa0ea993bba09e1c18616d Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 10 Mar 2023 18:11:10 +0100 -Subject: [PATCH 113/177] fix(linstorvolumemanager): remove usage of realpath +Subject: [PATCH 113/178] fix(linstorvolumemanager): remove usage of realpath Because a diskless DRBD path not always exist, get_volume_name_from_device_path can fail. It's easy to reproduce using > 4 hosts and with a call to linstorvhdutil.get_vhd_info: @@ -13,7 +13,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 5ab83c41..8befb33f 100755 +index 5ab83c4..8befb33 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -914,28 +914,17 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0114-fix-linstorvhdutil-avoid-parent-path-resolution.patch b/SOURCES/0114-fix-linstorvhdutil-avoid-parent-path-resolution.patch index bbc1c4e..2895668 100644 --- a/SOURCES/0114-fix-linstorvhdutil-avoid-parent-path-resolution.patch +++ b/SOURCES/0114-fix-linstorvhdutil-avoid-parent-path-resolution.patch @@ -1,7 +1,7 @@ From e7550ad1ca7033adb3bb6dbc3c6a79fa2386d90b Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 16 Mar 2023 18:54:46 +0100 -Subject: [PATCH 114/177] fix(linstorvhdutil): avoid parent path resolution +Subject: [PATCH 114/178] fix(linstorvhdutil): avoid parent path resolution When many hosts are used (>= 4), we can fail to get VHD info (with parent option) because the local parent VDI @@ -19,7 +19,7 @@ Signed-off-by: Ronan Abhamon 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index 7e34b5f6..9e96aaca 100755 +index 7e34b5f..9e96aac 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -400,7 +400,7 @@ def get_vhd_info(session, args): @@ -32,7 +32,7 @@ index 7e34b5f6..9e96aaca 100755 return json.dumps(vhd_info.__dict__) except Exception as e: diff --git a/drivers/linstorvhdutil.py b/drivers/linstorvhdutil.py -index c1b817d7..8b6985d9 100644 +index c1b817d..8b6985d 100644 --- a/drivers/linstorvhdutil.py +++ b/drivers/linstorvhdutil.py @@ -143,8 +143,8 @@ class LinstorVhdUtil: @@ -59,7 +59,7 @@ index c1b817d7..8b6985d9 100644 # https://github.com/PyCQA/pylint/pull/2926 return self._get_vhd_info(vdi_uuid, self._extract_uuid, **kwargs) # pylint: disable = E1123 diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 8befb33f..91db3d80 100755 +index 8befb33..91db3d8 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -920,11 +920,18 @@ class LinstorVolumeManager(object): @@ -85,7 +85,7 @@ index 8befb33f..91db3d80 100755 def update_volume_uuid(self, volume_uuid, new_volume_uuid, force=False): """ diff --git a/drivers/vhdutil.py b/drivers/vhdutil.py -index d75edb11..48337f87 100755 +index d75edb1..48337f8 100755 --- a/drivers/vhdutil.py +++ b/drivers/vhdutil.py @@ -100,13 +100,16 @@ def fullSizeVHD(virtual_size): diff --git a/SOURCES/0115-fix-LinstorSR-create-parent-path-during-attach.patch b/SOURCES/0115-fix-LinstorSR-create-parent-path-during-attach.patch index f2f3337..1193c58 100644 --- a/SOURCES/0115-fix-LinstorSR-create-parent-path-during-attach.patch +++ b/SOURCES/0115-fix-LinstorSR-create-parent-path-during-attach.patch @@ -1,7 +1,7 @@ From 03a0c875d8ee453743237f36e9dcd9715f4a07d2 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 17 Mar 2023 12:06:08 +0100 -Subject: [PATCH 115/177] fix(LinstorSR): create parent path during attach +Subject: [PATCH 115/178] fix(LinstorSR): create parent path during attach It's necessary to force DRBD diskless path creation when a VDI is attached. Otherwise the attach can fail on pool with @@ -13,7 +13,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index c42f07d6..48feec7a 100755 +index c42f07d..48feec7 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -1883,13 +1883,14 @@ class LinstorVDI(VDI.VDI): diff --git a/SOURCES/0116-fix-LinstorSR-retry-if-we-can-t-build-volume-cache.patch b/SOURCES/0116-fix-LinstorSR-retry-if-we-can-t-build-volume-cache.patch index 54aefd2..a43dac6 100644 --- a/SOURCES/0116-fix-LinstorSR-retry-if-we-can-t-build-volume-cache.patch +++ b/SOURCES/0116-fix-LinstorSR-retry-if-we-can-t-build-volume-cache.patch @@ -1,7 +1,7 @@ From 601a07072f2ce0bb275c31a0daa5d803d9cfc885 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 3 Apr 2023 10:03:57 +0200 -Subject: [PATCH 116/177] fix(LinstorSR): retry if we can't build volume cache +Subject: [PATCH 116/178] fix(LinstorSR): retry if we can't build volume cache Otherwise after SR creation, the master PBD can be unplugged. See: https://xcp-ng.org/forum/post/60726 @@ -12,7 +12,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 48feec7a..324033a0 100755 +index 48feec7..324033a 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -1553,7 +1553,11 @@ class LinstorSR(SR.SR): diff --git a/SOURCES/0117-fix-linstorvolumemanager-reduce-peer-slots-param-to-.patch b/SOURCES/0117-fix-linstorvolumemanager-reduce-peer-slots-param-to-.patch index 371b903..37ebbf5 100644 --- a/SOURCES/0117-fix-linstorvolumemanager-reduce-peer-slots-param-to-.patch +++ b/SOURCES/0117-fix-linstorvolumemanager-reduce-peer-slots-param-to-.patch @@ -1,7 +1,7 @@ From 2d862e93882ff9d63aa75c39d671825aeeefeba7 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 25 Apr 2023 10:46:00 +0200 -Subject: [PATCH 117/177] fix(linstorvolumemanager): reduce peer-slots param to +Subject: [PATCH 117/178] fix(linstorvolumemanager): reduce peer-slots param to 3 Because we use 3 backing disks at most, it's useless to increase the default linstor limit (8). @@ -15,7 +15,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 91db3d80..6f20c02c 100755 +index 91db3d8..6f20c02 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -2089,7 +2089,7 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0118-fix-LinstorSR-attach-a-valid-XAPI-session-is_open-is.patch b/SOURCES/0118-fix-LinstorSR-attach-a-valid-XAPI-session-is_open-is.patch index fd807a8..7cd4791 100644 --- a/SOURCES/0118-fix-LinstorSR-attach-a-valid-XAPI-session-is_open-is.patch +++ b/SOURCES/0118-fix-LinstorSR-attach-a-valid-XAPI-session-is_open-is.patch @@ -1,7 +1,7 @@ From e13b45dc17a75702f4a6999e9bc28105ee0e48fb Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 25 Apr 2023 11:20:55 +0200 -Subject: [PATCH 118/177] fix(LinstorSR): attach a valid XAPI session is_open +Subject: [PATCH 118/178] fix(LinstorSR): attach a valid XAPI session is_open is called Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 6 insertions(+) diff --git a/drivers/on_slave.py b/drivers/on_slave.py -index bbef4f7f..a1976607 100755 +index bbef4f7..a197660 100755 --- a/drivers/on_slave.py +++ b/drivers/on_slave.py @@ -125,6 +125,12 @@ def _is_open(session, args): diff --git a/SOURCES/0119-fix-LinstorSR-ensure-we-always-have-a-DRBD-path-to-s.patch b/SOURCES/0119-fix-LinstorSR-ensure-we-always-have-a-DRBD-path-to-s.patch index efa18e3..208ab26 100644 --- a/SOURCES/0119-fix-LinstorSR-ensure-we-always-have-a-DRBD-path-to-s.patch +++ b/SOURCES/0119-fix-LinstorSR-ensure-we-always-have-a-DRBD-path-to-s.patch @@ -1,7 +1,7 @@ From 05bc50d10da120a065fff476a0a0532058d8192e Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 28 Apr 2023 10:43:27 +0200 -Subject: [PATCH 119/177] fix(LinstorSR): ensure we always have a DRBD path to +Subject: [PATCH 119/178] fix(LinstorSR): ensure we always have a DRBD path to snap Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 3 insertions(+) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 324033a0..8c0b007d 100755 +index 324033a..8c0b007 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -2392,6 +2392,9 @@ class LinstorVDI(VDI.VDI): diff --git a/SOURCES/0120-fix-LinstorSR-remove-hosts-ips-param.patch b/SOURCES/0120-fix-LinstorSR-remove-hosts-ips-param.patch index f4aef61..61c5266 100644 --- a/SOURCES/0120-fix-LinstorSR-remove-hosts-ips-param.patch +++ b/SOURCES/0120-fix-LinstorSR-remove-hosts-ips-param.patch @@ -1,7 +1,7 @@ From c7030966d57e33747b6dde463f35e9d7d79e6fb5 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 30 May 2023 11:19:13 +0200 -Subject: [PATCH 120/177] fix(LinstorSR): remove hosts/ips param +Subject: [PATCH 120/178] fix(LinstorSR): remove hosts/ips param --- drivers/LinstorSR.py | 47 +++++---------------------------- @@ -9,7 +9,7 @@ Subject: [PATCH 120/177] fix(LinstorSR): remove hosts/ips param 2 files changed, 11 insertions(+), 47 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 8c0b007d..7a9cbac6 100755 +index 8c0b007..7a9cbac 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -100,8 +100,6 @@ CAPABILITIES = [ @@ -115,7 +115,7 @@ index 8c0b007d..7a9cbac6 100755 self._redundancy, thin_provisioning=self._provisioning == 'thin', diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 6f20c02c..464ab2ce 100755 +index 6f20c02..464ab2c 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -1588,14 +1588,13 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0121-fix-LinstorSR-compute-correctly-SR-size-using-pool-c.patch b/SOURCES/0121-fix-LinstorSR-compute-correctly-SR-size-using-pool-c.patch index 0039908..91ed049 100644 --- a/SOURCES/0121-fix-LinstorSR-compute-correctly-SR-size-using-pool-c.patch +++ b/SOURCES/0121-fix-LinstorSR-compute-correctly-SR-size-using-pool-c.patch @@ -1,7 +1,7 @@ From 54fa0adaf9bd385ca6e3f7b2eab5616f10b458be Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 1 Jun 2023 17:40:37 +0200 -Subject: [PATCH 121/177] fix(LinstorSR): compute correctly SR size using pool +Subject: [PATCH 121/178] fix(LinstorSR): compute correctly SR size using pool count Signed-off-by: Ronan Abhamon @@ -11,7 +11,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 7a9cbac6..f6c43569 100755 +index 7a9cbac..f6c4356 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -1065,8 +1065,8 @@ class LinstorSR(SR.SR): @@ -26,7 +26,7 @@ index 7a9cbac6..f6c43569 100755 self.physical_utilisation = self._linstor.allocated_volume_size diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 464ab2ce..ee637ae2 100755 +index 464ab2c..ee637ae 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -492,28 +492,6 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0122-fix-blktap2-ensure-we-can-import-this-module-when-LI.patch b/SOURCES/0122-fix-blktap2-ensure-we-can-import-this-module-when-LI.patch index becc395..4f30c01 100644 --- a/SOURCES/0122-fix-blktap2-ensure-we-can-import-this-module-when-LI.patch +++ b/SOURCES/0122-fix-blktap2-ensure-we-can-import-this-module-when-LI.patch @@ -1,7 +1,7 @@ From 3cf1299c59cab4cf4f92a7a98db1757b0c876996 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 6 Jun 2023 11:50:54 +0200 -Subject: [PATCH 122/177] fix(blktap2): ensure we can import this module when +Subject: [PATCH 122/178] fix(blktap2): ensure we can import this module when LINSTOR is not installed Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/blktap2.py b/drivers/blktap2.py -index 370f7fb8..fd7c643d 100755 +index 370f7fb..fd7c643 100755 --- a/drivers/blktap2.py +++ b/drivers/blktap2.py @@ -36,7 +36,6 @@ import json diff --git a/SOURCES/0123-fix-LinstorSR-ensure-volume-cache-can-be-recreated.patch b/SOURCES/0123-fix-LinstorSR-ensure-volume-cache-can-be-recreated.patch index 4cf95c0..36a8b3f 100644 --- a/SOURCES/0123-fix-LinstorSR-ensure-volume-cache-can-be-recreated.patch +++ b/SOURCES/0123-fix-LinstorSR-ensure-volume-cache-can-be-recreated.patch @@ -1,7 +1,7 @@ From b06882d0cdb391ca92cd08146b935648cbb6ef6e Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 21 Jun 2023 14:10:18 +0200 -Subject: [PATCH 123/177] fix(LinstorSR): ensure volume cache can be recreated +Subject: [PATCH 123/178] fix(LinstorSR): ensure volume cache can be recreated After SR creation we may fail to load volumes with this exception: "Failed to get usable size of..." and so we can't plug the master PBD. @@ -15,7 +15,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 40 insertions(+), 24 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index f6c43569..0bccc167 100755 +index f6c4356..0bccc16 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -523,28 +523,7 @@ class LinstorSR(SR.SR): diff --git a/SOURCES/0124-fix-linstor-manager-remove-dead-useless-code-in-add-.patch b/SOURCES/0124-fix-linstor-manager-remove-dead-useless-code-in-add-.patch index 3424fe3..8e430fd 100644 --- a/SOURCES/0124-fix-linstor-manager-remove-dead-useless-code-in-add-.patch +++ b/SOURCES/0124-fix-linstor-manager-remove-dead-useless-code-in-add-.patch @@ -1,7 +1,7 @@ From 085905977ebf04aea99cc2301aaea15fd1f8ee4f Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 20 Jul 2023 10:46:33 +0200 -Subject: [PATCH 124/177] fix(linstor-manager): remove dead/useless code in +Subject: [PATCH 124/178] fix(linstor-manager): remove dead/useless code in add/remove_host helpers Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 15 insertions(+), 113 deletions(-) diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index 9e96aaca..45201eed 100755 +index 9e96aac..45201ee 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -555,7 +555,7 @@ def has_controller_running(session, args): diff --git a/SOURCES/0125-fix-LinstorSR-Ensure-we-always-have-a-device-path-du.patch b/SOURCES/0125-fix-LinstorSR-Ensure-we-always-have-a-device-path-du.patch index 3cac9a0..f08f0e1 100644 --- a/SOURCES/0125-fix-LinstorSR-Ensure-we-always-have-a-device-path-du.patch +++ b/SOURCES/0125-fix-LinstorSR-Ensure-we-always-have-a-device-path-du.patch @@ -1,7 +1,7 @@ From 6dc4f983d955ca094c0bfb580cfda4dbb194ca3d Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 1 Aug 2023 15:16:17 +0200 -Subject: [PATCH 125/177] fix(LinstorSR): Ensure we always have a device path +Subject: [PATCH 125/178] fix(LinstorSR): Ensure we always have a device path during leaf-coalesce calls So we must not verify that we have a valid DRBD path in the load step, @@ -18,7 +18,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/cleanup.py b/drivers/cleanup.py -index f6c4346b..19d03d96 100755 +index f6c4346..19d03d9 100755 --- a/drivers/cleanup.py +++ b/drivers/cleanup.py @@ -1394,11 +1394,6 @@ class LinstorVDI(VDI): diff --git a/SOURCES/0126-fix-LinstorSR-always-use-lock.acquire-during-attach-.patch b/SOURCES/0126-fix-LinstorSR-always-use-lock.acquire-during-attach-.patch index ed9d595..00cf89b 100644 --- a/SOURCES/0126-fix-LinstorSR-always-use-lock.acquire-during-attach-.patch +++ b/SOURCES/0126-fix-LinstorSR-always-use-lock.acquire-during-attach-.patch @@ -1,7 +1,7 @@ From a4de2c2acab46a3d45ffea3be0818669ed559320 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 16 Aug 2023 12:04:01 +0200 -Subject: [PATCH 126/177] fix(LinstorSR): always use lock.acquire() during +Subject: [PATCH 126/178] fix(LinstorSR): always use lock.acquire() during attach/detach We can't use a retry range on the lock because we can trigger a bad situation @@ -18,7 +18,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 0bccc167..98919a48 100755 +index 0bccc16..98919a4 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -142,14 +142,6 @@ def compute_volume_size(virtual_size, image_type): diff --git a/SOURCES/0127-fix-LinstorSR-mare-sure-hostnames-are-unique-at-SR-c.patch b/SOURCES/0127-fix-LinstorSR-mare-sure-hostnames-are-unique-at-SR-c.patch index e91d273..f564dc5 100644 --- a/SOURCES/0127-fix-LinstorSR-mare-sure-hostnames-are-unique-at-SR-c.patch +++ b/SOURCES/0127-fix-LinstorSR-mare-sure-hostnames-are-unique-at-SR-c.patch @@ -1,7 +1,7 @@ From a7c3c1602e8210ebd74741d5c8ec2f1ef474918b Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 17 Aug 2023 14:52:13 +0200 -Subject: [PATCH 127/177] fix(LinstorSR): mare sure hostnames are unique at SR +Subject: [PATCH 127/178] fix(LinstorSR): mare sure hostnames are unique at SR creation Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 6 insertions(+) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 98919a48..e512487c 100755 +index 98919a4..e512487 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -649,6 +649,12 @@ class LinstorSR(SR.SR): diff --git a/SOURCES/0128-fix-LinstorSR-ensure-we-can-attach-non-special-stati.patch b/SOURCES/0128-fix-LinstorSR-ensure-we-can-attach-non-special-stati.patch index e9af586..df414d5 100644 --- a/SOURCES/0128-fix-LinstorSR-ensure-we-can-attach-non-special-stati.patch +++ b/SOURCES/0128-fix-LinstorSR-ensure-we-can-attach-non-special-stati.patch @@ -1,7 +1,7 @@ From 54bca8660c18628ec36c1835b9f14aec80c187a8 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 18 Aug 2023 11:06:56 +0200 -Subject: [PATCH 128/177] fix(LinstorSR): ensure we can attach non-special +Subject: [PATCH 128/178] fix(LinstorSR): ensure we can attach non-special static VDIs Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 3 insertions(+) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index e512487c..17083703 100755 +index e512487..1708370 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -461,6 +461,9 @@ class LinstorSR(SR.SR): diff --git a/SOURCES/0129-fix-LinstorSR-ensure-we-can-detach-when-deflate-call.patch b/SOURCES/0129-fix-LinstorSR-ensure-we-can-detach-when-deflate-call.patch index 7a58884..3eedc2f 100644 --- a/SOURCES/0129-fix-LinstorSR-ensure-we-can-detach-when-deflate-call.patch +++ b/SOURCES/0129-fix-LinstorSR-ensure-we-can-detach-when-deflate-call.patch @@ -1,7 +1,7 @@ From 9a295973c226d411ab4276b5bee8a241dc7c555e Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 31 Aug 2023 18:00:27 +0200 -Subject: [PATCH 129/177] fix(LinstorSR): ensure we can detach when deflate +Subject: [PATCH 129/178] fix(LinstorSR): ensure we can detach when deflate call is not possible Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 17083703..a6ca8840 100755 +index 1708370..a6ca884 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -175,7 +175,7 @@ def attach_thin(session, journaler, linstor, sr_uuid, vdi_uuid): diff --git a/SOURCES/0130-fix-LinstorSR-assume-VDI-is-always-a-VHD-when-the-in.patch b/SOURCES/0130-fix-LinstorSR-assume-VDI-is-always-a-VHD-when-the-in.patch index 610ce8f..ec674fb 100644 --- a/SOURCES/0130-fix-LinstorSR-assume-VDI-is-always-a-VHD-when-the-in.patch +++ b/SOURCES/0130-fix-LinstorSR-assume-VDI-is-always-a-VHD-when-the-in.patch @@ -1,7 +1,7 @@ From 0065166fc2de0bb1368eb590d6a12762cabdda04 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 28 Sep 2023 16:00:02 +0200 -Subject: [PATCH 130/177] fix(LinstorSR): assume VDI is always a VHD when the +Subject: [PATCH 130/178] fix(LinstorSR): assume VDI is always a VHD when the info is missing during cleanup Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/cleanup.py b/drivers/cleanup.py -index 19d03d96..5353e9aa 100755 +index 19d03d9..5353e9a 100755 --- a/drivers/cleanup.py +++ b/drivers/cleanup.py @@ -2995,11 +2995,11 @@ class LinstorSR(SR): diff --git a/SOURCES/0131-fix-LinstorSR-remove-SR-lock-during-thin-attach-deta.patch b/SOURCES/0131-fix-LinstorSR-remove-SR-lock-during-thin-attach-deta.patch index ce3ebf7..803d874 100644 --- a/SOURCES/0131-fix-LinstorSR-remove-SR-lock-during-thin-attach-deta.patch +++ b/SOURCES/0131-fix-LinstorSR-remove-SR-lock-during-thin-attach-deta.patch @@ -1,7 +1,7 @@ From f894c7a0cadbed19314bb93e04bdc4a7a6bcb62b Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 2 Oct 2023 16:48:49 +0200 -Subject: [PATCH 131/177] fix(LinstorSR): remove SR lock during thin +Subject: [PATCH 131/178] fix(LinstorSR): remove SR lock during thin attach/detach This lock is normally useless and can create a dead lock when thin mode is activated: @@ -20,7 +20,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 45 insertions(+), 57 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index a6ca8840..ed41e77a 100755 +index a6ca884..ed41e77 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -148,32 +148,26 @@ def attach_thin(session, journaler, linstor, sr_uuid, vdi_uuid): diff --git a/SOURCES/0132-fix-LinstorSR-ensure-database-is-mounted-during-scan.patch b/SOURCES/0132-fix-LinstorSR-ensure-database-is-mounted-during-scan.patch index 89966d4..0ca1f20 100644 --- a/SOURCES/0132-fix-LinstorSR-ensure-database-is-mounted-during-scan.patch +++ b/SOURCES/0132-fix-LinstorSR-ensure-database-is-mounted-during-scan.patch @@ -1,7 +1,7 @@ From 30b45e72a11b9e72a9edcdd22d71a15b8d132e63 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 3 Oct 2023 18:42:42 +0200 -Subject: [PATCH 132/177] fix(LinstorSR): ensure database is mounted during +Subject: [PATCH 132/178] fix(LinstorSR): ensure database is mounted during scan Signed-off-by: Ronan Abhamon @@ -11,7 +11,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index ed41e77a..ed5998e8 100755 +index ed41e77..ed5998e 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -824,6 +824,21 @@ class LinstorSR(SR.SR): @@ -37,7 +37,7 @@ index ed41e77a..ed5998e8 100755 # bad sync in the process if new VDIs have been introduced. ret = super(LinstorSR, self).scan(self.uuid) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index ee637ae2..f1f3bce7 100755 +index ee637ae..f1f3bce 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -884,7 +884,7 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0133-fix-LinstorSR-restart-drbd-reactor-in-case-of-failur.patch b/SOURCES/0133-fix-LinstorSR-restart-drbd-reactor-in-case-of-failur.patch index 503effa..ef0087e 100644 --- a/SOURCES/0133-fix-LinstorSR-restart-drbd-reactor-in-case-of-failur.patch +++ b/SOURCES/0133-fix-LinstorSR-restart-drbd-reactor-in-case-of-failur.patch @@ -1,7 +1,7 @@ From 6603e355de8b19f851669fa3d58a42662ea4e0eb Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 4 Oct 2023 14:30:36 +0200 -Subject: [PATCH 133/177] fix(LinstorSR): restart drbd-reactor in case of +Subject: [PATCH 133/178] fix(LinstorSR): restart drbd-reactor in case of failure Otherwise we can have all hosts unusable after a massive reboot: @@ -16,7 +16,7 @@ Signed-off-by: Ronan Abhamon create mode 100644 etc/systemd/system/drbd-reactor.service.d/override.conf diff --git a/Makefile b/Makefile -index bc3e97fe..7f7740cb 100755 +index bc3e97f..7f7740c 100755 --- a/Makefile +++ b/Makefile @@ -149,6 +149,7 @@ install: precheck @@ -38,7 +38,7 @@ index bc3e97fe..7f7740cb 100755 install -m 644 etc/systemd/system/var-lib-linstor.service \ diff --git a/etc/systemd/system/drbd-reactor.service.d/override.conf b/etc/systemd/system/drbd-reactor.service.d/override.conf new file mode 100644 -index 00000000..2f99a46a +index 0000000..2f99a46 --- /dev/null +++ b/etc/systemd/system/drbd-reactor.service.d/override.conf @@ -0,0 +1,6 @@ diff --git a/SOURCES/0134-fix-linstorvolumemanager-retry-in-case-of-failure-du.patch b/SOURCES/0134-fix-linstorvolumemanager-retry-in-case-of-failure-du.patch index 31f2a66..209f8e6 100644 --- a/SOURCES/0134-fix-linstorvolumemanager-retry-in-case-of-failure-du.patch +++ b/SOURCES/0134-fix-linstorvolumemanager-retry-in-case-of-failure-du.patch @@ -1,7 +1,7 @@ From ac881521fa06183435435e47933c6e7f034dfed8 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 9 Oct 2023 10:37:32 +0200 -Subject: [PATCH 134/177] fix(linstorvolumemanager): retry in case of failure +Subject: [PATCH 134/178] fix(linstorvolumemanager): retry in case of failure during mkfs call on database The device is not always ready after creation. @@ -13,7 +13,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index f1f3bce7..23e80d91 100755 +index f1f3bce..23e80d9 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -2666,7 +2666,10 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0135-fix-linstorvolumemanager-avoid-diskless-creation-whe.patch b/SOURCES/0135-fix-linstorvolumemanager-avoid-diskless-creation-whe.patch index b55b86f..2b64460 100644 --- a/SOURCES/0135-fix-linstorvolumemanager-avoid-diskless-creation-whe.patch +++ b/SOURCES/0135-fix-linstorvolumemanager-avoid-diskless-creation-whe.patch @@ -1,7 +1,7 @@ From 69ddfe0cf317308e2097ef4cacb081b9c4c60c40 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 26 Sep 2023 11:48:38 +0200 -Subject: [PATCH 135/177] fix(linstorvolumemanager): avoid diskless creation +Subject: [PATCH 135/178] fix(linstorvolumemanager): avoid diskless creation when a new resource is added Like said in this discussion https://github.com/xcp-ng/sm/pull/34 : @@ -15,7 +15,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 9 insertions(+), 42 deletions(-) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 23e80d91..49ca83c0 100755 +index 23e80d9..49ca83c 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -614,8 +614,7 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0136-fix-LinstorSR-remove-diskless-after-VDI.detach-calls.patch b/SOURCES/0136-fix-LinstorSR-remove-diskless-after-VDI.detach-calls.patch index 8daf637..ba58191 100644 --- a/SOURCES/0136-fix-LinstorSR-remove-diskless-after-VDI.detach-calls.patch +++ b/SOURCES/0136-fix-LinstorSR-remove-diskless-after-VDI.detach-calls.patch @@ -1,7 +1,7 @@ From 7e6f37fb95ad0974b7e4be3e336b348517fa0946 Mon Sep 17 00:00:00 2001 From: Rene Peinthor Date: Tue, 25 Jul 2023 11:19:39 +0200 -Subject: [PATCH 136/177] fix(LinstorSR): remove diskless after VDI.detach +Subject: [PATCH 136/178] fix(LinstorSR): remove diskless after VDI.detach calls Signed-off-by: Rene Peinthor @@ -12,7 +12,7 @@ Co-authored-by: Ronan Abhamon 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index ed5998e8..7b9a8e57 100755 +index ed5998e..7b9a8e5 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -1943,6 +1943,26 @@ class LinstorVDI(VDI.VDI): @@ -43,7 +43,7 @@ index ed5998e8..7b9a8e57 100755 util.SMlog('LinstorVDI.resize for {}'.format(self.uuid)) if not self.sr._is_master: diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 49ca83c0..0f6fbcf3 100755 +index 49ca83c..0f6fbcf 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -781,6 +781,28 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0137-fix-LinstorSR-robustify-_load_vdi_info-in-cleanup.py.patch b/SOURCES/0137-fix-LinstorSR-robustify-_load_vdi_info-in-cleanup.py.patch index e6446d0..34c0f7c 100644 --- a/SOURCES/0137-fix-LinstorSR-robustify-_load_vdi_info-in-cleanup.py.patch +++ b/SOURCES/0137-fix-LinstorSR-robustify-_load_vdi_info-in-cleanup.py.patch @@ -1,7 +1,7 @@ From 995c6b7cf9ecb9baee34e05586320ccb4339651b Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 11 Oct 2023 12:39:56 +0200 -Subject: [PATCH 137/177] fix(LinstorSR): robustify _load_vdi_info in +Subject: [PATCH 137/178] fix(LinstorSR): robustify _load_vdi_info in cleanup.py After a failed snapshot like that: @@ -24,7 +24,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/drivers/cleanup.py b/drivers/cleanup.py -index 5353e9aa..376da3ec 100755 +index 5353e9a..376da3e 100755 --- a/drivers/cleanup.py +++ b/drivers/cleanup.py @@ -2990,16 +2990,31 @@ class LinstorSR(SR): diff --git a/SOURCES/0138-fix-LinstorSR-ensure-detach-never-fails-on-plugin-fa.patch b/SOURCES/0138-fix-LinstorSR-ensure-detach-never-fails-on-plugin-fa.patch index 51f0ecb..fb748b0 100644 --- a/SOURCES/0138-fix-LinstorSR-ensure-detach-never-fails-on-plugin-fa.patch +++ b/SOURCES/0138-fix-LinstorSR-ensure-detach-never-fails-on-plugin-fa.patch @@ -1,7 +1,7 @@ From 64d36a80ff1e19ee7b4a8816f537b1e90ccda32f Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 23 Oct 2023 14:31:27 +0200 -Subject: [PATCH 138/177] fix(LinstorSR): ensure detach never fails on plugin +Subject: [PATCH 138/178] fix(LinstorSR): ensure detach never fails on plugin failure Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 7b9a8e57..d0fc4219 100755 +index 7b9a8e5..d0fc421 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -2241,7 +2241,12 @@ class LinstorVDI(VDI.VDI): diff --git a/SOURCES/0139-fix-LinstorSR-ensure-we-coalesce-only-volumes-with-a.patch b/SOURCES/0139-fix-LinstorSR-ensure-we-coalesce-only-volumes-with-a.patch index b7211db..905ee7f 100644 --- a/SOURCES/0139-fix-LinstorSR-ensure-we-coalesce-only-volumes-with-a.patch +++ b/SOURCES/0139-fix-LinstorSR-ensure-we-coalesce-only-volumes-with-a.patch @@ -1,7 +1,7 @@ From c9ab4bc2198754e8eacc2fe4699eb5e6e5e4728e Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 23 Oct 2023 15:52:23 +0200 -Subject: [PATCH 139/177] fix(LinstorSR): ensure we coalesce only volumes with +Subject: [PATCH 139/178] fix(LinstorSR): ensure we coalesce only volumes with a valid size --- @@ -11,7 +11,7 @@ Subject: [PATCH 139/177] fix(LinstorSR): ensure we coalesce only volumes with 3 files changed, 47 insertions(+), 3 deletions(-) diff --git a/drivers/cleanup.py b/drivers/cleanup.py -index 376da3ec..4e4620f3 100755 +index 376da3e..4e4620f 100755 --- a/drivers/cleanup.py +++ b/drivers/cleanup.py @@ -1441,6 +1441,20 @@ class LinstorVDI(VDI): @@ -36,7 +36,7 @@ index 376da3ec..4e4620f3 100755 def getParent(self): diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index 45201eed..9e5e1d6e 100755 +index 45201ee..9e5e1d6 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -485,6 +485,18 @@ def get_block_bitmap(session, args): @@ -69,7 +69,7 @@ index 45201eed..9e5e1d6e 100755 # is opened on a non-local host. 'setParent': set_parent, diff --git a/drivers/linstorvhdutil.py b/drivers/linstorvhdutil.py -index 8b6985d9..5f3ae084 100644 +index 8b6985d..5f3ae08 100644 --- a/drivers/linstorvhdutil.py +++ b/drivers/linstorvhdutil.py @@ -38,7 +38,7 @@ def call_vhd_util_on_host(session, host_ref, method, device_path, args): diff --git a/SOURCES/0140-fix-LinstorSR-don-t-try-to-repair-persistent-volumes.patch b/SOURCES/0140-fix-LinstorSR-don-t-try-to-repair-persistent-volumes.patch index d58554b..3bb928d 100644 --- a/SOURCES/0140-fix-LinstorSR-don-t-try-to-repair-persistent-volumes.patch +++ b/SOURCES/0140-fix-LinstorSR-don-t-try-to-repair-persistent-volumes.patch @@ -1,7 +1,7 @@ From e615d0cc2f5dad974bec0de819fa3bf0a4b5d07a Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 24 Oct 2023 11:57:40 +0200 -Subject: [PATCH 140/177] fix(LinstorSR): don't try to repair persistent +Subject: [PATCH 140/178] fix(LinstorSR): don't try to repair persistent volumes in GC Use constants to simplify maintenance. @@ -12,7 +12,7 @@ Use constants to simplify maintenance. 3 files changed, 43 insertions(+), 36 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index d0fc4219..d0ce079a 100755 +index d0fc421..d0ce079 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -23,6 +23,7 @@ try: @@ -94,7 +94,7 @@ index d0fc4219..d0ce079a 100755 self._start_persistent_http_server(volume_name) diff --git a/drivers/cleanup.py b/drivers/cleanup.py -index 4e4620f3..1f898225 100755 +index 4e4620f..1f89822 100755 --- a/drivers/cleanup.py +++ b/drivers/cleanup.py @@ -55,6 +55,7 @@ try: @@ -178,7 +178,7 @@ index 4e4620f3..1f898225 100755 return all_vdi_info diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 0f6fbcf3..47ca4e87 100755 +index 0f6fbcf..47ca4e8 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -30,9 +30,11 @@ import time diff --git a/SOURCES/0141-fix-linstorvhdutil-format-correctly-message-if-vhd-u.patch b/SOURCES/0141-fix-linstorvhdutil-format-correctly-message-if-vhd-u.patch index edabecf..51a8d09 100644 --- a/SOURCES/0141-fix-linstorvhdutil-format-correctly-message-if-vhd-u.patch +++ b/SOURCES/0141-fix-linstorvhdutil-format-correctly-message-if-vhd-u.patch @@ -1,7 +1,7 @@ From ed396144e6293ac060fe8bbfde48363ed0313468 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 14 Nov 2023 18:21:53 +0100 -Subject: [PATCH 141/177] fix(linstorvhdutil): format correctly message if +Subject: [PATCH 141/178] fix(linstorvhdutil): format correctly message if vhd-util cannot be run Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/linstorvhdutil.py b/drivers/linstorvhdutil.py -index 5f3ae084..3ce7ab9e 100644 +index 5f3ae08..3ce7ab9 100644 --- a/drivers/linstorvhdutil.py +++ b/drivers/linstorvhdutil.py @@ -441,7 +441,7 @@ class LinstorVhdUtil: diff --git a/SOURCES/0142-fix-LinstorSR-wait-during-attach-to-open-DRBD-path.patch b/SOURCES/0142-fix-LinstorSR-wait-during-attach-to-open-DRBD-path.patch index 2e92d27..9aa02d3 100644 --- a/SOURCES/0142-fix-LinstorSR-wait-during-attach-to-open-DRBD-path.patch +++ b/SOURCES/0142-fix-LinstorSR-wait-during-attach-to-open-DRBD-path.patch @@ -1,7 +1,7 @@ From 7d872f79b8857c2db490cf0c77a5c1c647af59e2 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 24 Oct 2023 23:07:23 +0200 -Subject: [PATCH 142/177] fix(LinstorSR): wait during attach to open DRBD path +Subject: [PATCH 142/178] fix(LinstorSR): wait during attach to open DRBD path ENODATA and other errors like EROFS can be raised when a new DRBD path is created on the fly. So ensure to block before tapdisk starts. @@ -12,7 +12,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 19 insertions(+) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index d0ce079a..3063abf4 100755 +index d0ce079..3063abf 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -1901,6 +1901,25 @@ class LinstorVDI(VDI.VDI): diff --git a/SOURCES/0143-fix-LinstorSR-support-different-volume-sizes-in-clea.patch b/SOURCES/0143-fix-LinstorSR-support-different-volume-sizes-in-clea.patch index 4237fc8..041f3e3 100644 --- a/SOURCES/0143-fix-LinstorSR-support-different-volume-sizes-in-clea.patch +++ b/SOURCES/0143-fix-LinstorSR-support-different-volume-sizes-in-clea.patch @@ -1,7 +1,7 @@ From d1e3ace3c5c16ba428c4151482f4065d09930621 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 14 Nov 2023 18:08:26 +0100 -Subject: [PATCH 143/177] fix(LinstorSR): support different volume sizes in +Subject: [PATCH 143/178] fix(LinstorSR): support different volume sizes in cleanup.py Signed-off-by: Ronan Abhamon @@ -12,7 +12,7 @@ Signed-off-by: Ronan Abhamon 3 files changed, 194 insertions(+), 106 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 3063abf4..6802f494 100755 +index 3063abf..6802f49 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -134,19 +134,6 @@ OPS_EXCLUSIVE = [ @@ -211,7 +211,7 @@ index 3063abf4..6802f494 100755 new_volume_size, old_volume_size ) diff --git a/drivers/cleanup.py b/drivers/cleanup.py -index 1f898225..d2fb884f 100755 +index 1f89822..d2fb884 100755 --- a/drivers/cleanup.py +++ b/drivers/cleanup.py @@ -1383,8 +1383,6 @@ class LVHDVDI(VDI): @@ -399,7 +399,7 @@ index 1f898225..d2fb884f 100755 def _hasValidDevicePath(self, uuid): try: diff --git a/drivers/linstorvhdutil.py b/drivers/linstorvhdutil.py -index 3ce7ab9e..239a10ad 100644 +index 3ce7ab9..239a10a 100644 --- a/drivers/linstorvhdutil.py +++ b/drivers/linstorvhdutil.py @@ -14,6 +14,8 @@ diff --git a/SOURCES/0144-fix-LinstorSR-remove-useless-IPS_XHA_CACHE-var.patch b/SOURCES/0144-fix-LinstorSR-remove-useless-IPS_XHA_CACHE-var.patch index c147a46..b996de3 100644 --- a/SOURCES/0144-fix-LinstorSR-remove-useless-IPS_XHA_CACHE-var.patch +++ b/SOURCES/0144-fix-LinstorSR-remove-useless-IPS_XHA_CACHE-var.patch @@ -1,7 +1,7 @@ From 79d4085610ef1ca85107eccd5a6e79f91d460027 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 20 Nov 2023 10:52:27 +0100 -Subject: [PATCH 144/177] fix(LinstorSR): remove useless IPS_XHA_CACHE var +Subject: [PATCH 144/178] fix(LinstorSR): remove useless IPS_XHA_CACHE var Signed-off-by: Ronan Abhamon --- @@ -9,7 +9,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 6 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 6802f494..c570925f 100755 +index 6802f49..c570925 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -210,13 +210,7 @@ def detach_thin(session, linstor, sr_uuid, vdi_uuid): diff --git a/SOURCES/0145-fix-LinstorSR-ensure-we-can-deflate-on-any-host-afte.patch b/SOURCES/0145-fix-LinstorSR-ensure-we-can-deflate-on-any-host-afte.patch index d10edce..4f5599d 100644 --- a/SOURCES/0145-fix-LinstorSR-ensure-we-can-deflate-on-any-host-afte.patch +++ b/SOURCES/0145-fix-LinstorSR-ensure-we-can-deflate-on-any-host-afte.patch @@ -1,7 +1,7 @@ From 5cd04079c9bca752f6f78532ad1ae0bf962c3902 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 21 Nov 2023 13:50:24 +0100 -Subject: [PATCH 145/177] fix(LinstorSR): ensure we can deflate on any host +Subject: [PATCH 145/178] fix(LinstorSR): ensure we can deflate on any host after a journal rollback Signed-off-by: Ronan Abhamon @@ -13,7 +13,7 @@ Signed-off-by: Ronan Abhamon 4 files changed, 76 insertions(+), 42 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index c570925f..1d1b51a8 100755 +index c570925..1d1b51a 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -197,7 +197,7 @@ def detach_thin_impl(session, linstor, sr_uuid, vdi_uuid): @@ -41,7 +41,7 @@ index c570925f..1d1b51a8 100755 def _handle_interrupted_clone( self, vdi_uuid, clone_info, force_undo=False diff --git a/drivers/cleanup.py b/drivers/cleanup.py -index d2fb884f..3c2810cd 100755 +index d2fb884..3c2810c 100755 --- a/drivers/cleanup.py +++ b/drivers/cleanup.py @@ -1432,7 +1432,7 @@ class LinstorVDI(VDI): @@ -54,7 +54,7 @@ index d2fb884f..3c2810cd 100755 self.sr.unlock() self.drbd_size = self.sr._vhdutil.get_drbd_size(self.uuid) diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index 9e5e1d6e..7726c1b7 100755 +index 9e5e1d6..7726c1b 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -28,6 +28,7 @@ import XenAPI @@ -103,7 +103,7 @@ index 9e5e1d6e..7726c1b7 100755 'hasControllerRunning': has_controller_running, 'addHost': add_host, diff --git a/drivers/linstorvhdutil.py b/drivers/linstorvhdutil.py -index 239a10ad..23d8b6a0 100644 +index 239a10a..23d8b6a 100644 --- a/drivers/linstorvhdutil.py +++ b/drivers/linstorvhdutil.py @@ -31,7 +31,7 @@ MANAGER_PLUGIN = 'linstor-manager' diff --git a/SOURCES/0146-fix-LinstorSR-ensure-we-always-use-real-DRBD-VHD-siz.patch b/SOURCES/0146-fix-LinstorSR-ensure-we-always-use-real-DRBD-VHD-siz.patch index bfb2bb1..9f7c808 100644 --- a/SOURCES/0146-fix-LinstorSR-ensure-we-always-use-real-DRBD-VHD-siz.patch +++ b/SOURCES/0146-fix-LinstorSR-ensure-we-always-use-real-DRBD-VHD-siz.patch @@ -1,7 +1,7 @@ From f3726fc7b992ceb2d51e3e1725cc1cb6eff2dc77 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 27 Nov 2023 12:15:43 +0100 -Subject: [PATCH 146/177] fix(LinstorSR): ensure we always use real DRBD/VHD +Subject: [PATCH 146/178] fix(LinstorSR): ensure we always use real DRBD/VHD sizes in inflate/deflate GC calls --- @@ -9,7 +9,7 @@ Subject: [PATCH 146/177] fix(LinstorSR): ensure we always use real DRBD/VHD 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/drivers/cleanup.py b/drivers/cleanup.py -index 3c2810cd..8635f488 100755 +index 3c2810c..8635f48 100755 --- a/drivers/cleanup.py +++ b/drivers/cleanup.py @@ -1405,38 +1405,49 @@ class LinstorVDI(VDI): diff --git a/SOURCES/0147-feat-linstor-kv-tool-If-no-controller-uri-option-is-.patch b/SOURCES/0147-feat-linstor-kv-tool-If-no-controller-uri-option-is-.patch index 6d24bfa..2c8f5aa 100644 --- a/SOURCES/0147-feat-linstor-kv-tool-If-no-controller-uri-option-is-.patch +++ b/SOURCES/0147-feat-linstor-kv-tool-If-no-controller-uri-option-is-.patch @@ -1,7 +1,7 @@ From 95d463f76f5227f4dd4726c50695c739882f92a2 Mon Sep 17 00:00:00 2001 From: BenjiReis Date: Mon, 27 Nov 2023 14:23:57 +0100 -Subject: [PATCH 147/177] feat(linstor-kv-tool): If no controller uri option is +Subject: [PATCH 147/178] feat(linstor-kv-tool): If no controller uri option is provided fetch it (#48) Signed-off-by: BenjiReis @@ -10,7 +10,7 @@ Signed-off-by: BenjiReis 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/linstor-kv-tool b/scripts/linstor-kv-tool -index c9070270..b845ec2b 100755 +index c907027..b845ec2 100755 --- a/scripts/linstor-kv-tool +++ b/scripts/linstor-kv-tool @@ -13,6 +13,10 @@ diff --git a/SOURCES/0148-fix-linstorvolumemanager-robustify-SR-destroy-46.patch b/SOURCES/0148-fix-linstorvolumemanager-robustify-SR-destroy-46.patch index c7b6e7e..311a3cd 100644 --- a/SOURCES/0148-fix-linstorvolumemanager-robustify-SR-destroy-46.patch +++ b/SOURCES/0148-fix-linstorvolumemanager-robustify-SR-destroy-46.patch @@ -1,7 +1,7 @@ From b8e4a29597f8dc8034e4ea307cd5e347d6a3b631 Mon Sep 17 00:00:00 2001 From: BenjiReis Date: Wed, 29 Nov 2023 15:45:32 +0100 -Subject: [PATCH 148/177] fix(linstorvolumemanager): robustify SR destroy (#46) +Subject: [PATCH 148/178] fix(linstorvolumemanager): robustify SR destroy (#46) Signed-off-by: Ronan Abhamon Co-authored-by: BenjiReis @@ -10,7 +10,7 @@ Co-authored-by: BenjiReis 1 file changed, 86 insertions(+), 32 deletions(-) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 47ca4e87..d27c84e6 100755 +index 47ca4e8..d27c84e 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -1372,35 +1372,63 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0149-feat-linstor-manager-extend-API-with-createNodeInter.patch b/SOURCES/0149-feat-linstor-manager-extend-API-with-createNodeInter.patch index 2d0c241..df226b6 100644 --- a/SOURCES/0149-feat-linstor-manager-extend-API-with-createNodeInter.patch +++ b/SOURCES/0149-feat-linstor-manager-extend-API-with-createNodeInter.patch @@ -1,7 +1,7 @@ From 9a3af8ca152d5f94314886acb12f1971892bdf22 Mon Sep 17 00:00:00 2001 From: BenjiReis Date: Wed, 29 Nov 2023 16:54:30 +0100 -Subject: [PATCH 149/177] feat(linstor-manager): extend API with +Subject: [PATCH 149/178] feat(linstor-manager): extend API with createNodeInterface and setNodePreferredInterface (#47) Signed-off-by: BenjiReis @@ -11,7 +11,7 @@ Signed-off-by: BenjiReis 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index 7726c1b7..2469b506 100755 +index 7726c1b..2469b50 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -977,6 +977,51 @@ def health_check(session, args): @@ -77,7 +77,7 @@ index 7726c1b7..2469b506 100755 + 'setNodePreferredInterface': set_node_preferred_interface }) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index d27c84e6..fef34d3b 100755 +index d27c84e..fef34d3 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -1529,6 +1529,22 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0150-fix-LinstorSR-support-VDI.resize-on-thick-volumes.patch b/SOURCES/0150-fix-LinstorSR-support-VDI.resize-on-thick-volumes.patch index e4f46fe..5cd78cc 100644 --- a/SOURCES/0150-fix-LinstorSR-support-VDI.resize-on-thick-volumes.patch +++ b/SOURCES/0150-fix-LinstorSR-support-VDI.resize-on-thick-volumes.patch @@ -1,14 +1,14 @@ From 36459279481994f97bb186e6522c117b9669120a Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 1 Dec 2023 11:55:12 +0100 -Subject: [PATCH 150/177] fix(LinstorSR): support VDI.resize on thick volumes +Subject: [PATCH 150/178] fix(LinstorSR): support VDI.resize on thick volumes --- drivers/LinstorSR.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 1d1b51a8..a5243381 100755 +index 1d1b51a..a524338 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -1939,11 +1939,14 @@ class LinstorVDI(VDI.VDI): diff --git a/SOURCES/0151-fix-linstorvolumemanager-format-correctly-exception-.patch b/SOURCES/0151-fix-linstorvolumemanager-format-correctly-exception-.patch index 7e467ea..6e5b9dc 100644 --- a/SOURCES/0151-fix-linstorvolumemanager-format-correctly-exception-.patch +++ b/SOURCES/0151-fix-linstorvolumemanager-format-correctly-exception-.patch @@ -1,7 +1,7 @@ From 4119be3b2769b7c29013cb5f60e68238a439b474 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 4 Dec 2023 16:36:55 +0100 -Subject: [PATCH 151/177] fix(linstorvolumemanager): format correctly exception +Subject: [PATCH 151/178] fix(linstorvolumemanager): format correctly exception during db mount Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index fef34d3b..a41314e5 100755 +index fef34d3..a41314e 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -2764,9 +2764,9 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0152-fix-LinstorSR-ensure-we-can-skip-coalesces-if-device.patch b/SOURCES/0152-fix-LinstorSR-ensure-we-can-skip-coalesces-if-device.patch index 8646443..400bc87 100644 --- a/SOURCES/0152-fix-LinstorSR-ensure-we-can-skip-coalesces-if-device.patch +++ b/SOURCES/0152-fix-LinstorSR-ensure-we-can-skip-coalesces-if-device.patch @@ -1,7 +1,7 @@ From 9f3c9d85430ad14214b25fc6d529c88e8c217985 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 4 Dec 2023 18:57:08 +0100 -Subject: [PATCH 152/177] fix(LinstorSR): ensure we can skip coalesces if +Subject: [PATCH 152/178] fix(LinstorSR): ensure we can skip coalesces if device path can't be fetched Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/cleanup.py b/drivers/cleanup.py -index 8635f488..8c16f689 100755 +index 8635f48..8c16f68 100755 --- a/drivers/cleanup.py +++ b/drivers/cleanup.py @@ -1548,7 +1548,12 @@ class LinstorVDI(VDI): diff --git a/SOURCES/0153-feat-linstor-manager-add-methods-to-modify-destroy-l.patch b/SOURCES/0153-feat-linstor-manager-add-methods-to-modify-destroy-l.patch index a5c1577..93217fc 100644 --- a/SOURCES/0153-feat-linstor-manager-add-methods-to-modify-destroy-l.patch +++ b/SOURCES/0153-feat-linstor-manager-add-methods-to-modify-destroy-l.patch @@ -1,7 +1,7 @@ From d607e5c450a9cbe39ea5826c2a4ec7f63751f805 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 19 Dec 2023 14:49:33 +0100 -Subject: [PATCH 153/177] feat(linstor-manager): add methods to +Subject: [PATCH 153/178] feat(linstor-manager): add methods to modify/destroy/list net interfaces Signed-off-by: Ronan Abhamon @@ -11,7 +11,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 152 insertions(+), 22 deletions(-) diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index 2469b506..6b45875d 100755 +index 2469b50..6b45875 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -265,6 +265,19 @@ def force_destroy_drbd_volume(minor): @@ -125,7 +125,7 @@ index 2469b506..6b45875d 100755 'setNodePreferredInterface': set_node_preferred_interface }) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index a41314e5..32d15334 100755 +index a41314e..32d1533 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -872,7 +872,6 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0154-fix-LinstorSR-force-a-defined-volume-prefix-if-we-ca.patch b/SOURCES/0154-fix-LinstorSR-force-a-defined-volume-prefix-if-we-ca.patch index 2a5a415..ca335ce 100644 --- a/SOURCES/0154-fix-LinstorSR-force-a-defined-volume-prefix-if-we-ca.patch +++ b/SOURCES/0154-fix-LinstorSR-force-a-defined-volume-prefix-if-we-ca.patch @@ -1,7 +1,7 @@ From 0fcc4fbd4814578062bf83d7e26f3975cc120cd1 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 12 Jan 2024 10:28:20 +0100 -Subject: [PATCH 154/177] fix(LinstorSR): force a defined volume prefix if we +Subject: [PATCH 154/178] fix(LinstorSR): force a defined volume prefix if we can't import libs Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 2 insertions(+) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index a5243381..a73ae5a2 100755 +index a524338..a73ae5a 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -27,6 +27,8 @@ try: diff --git a/SOURCES/0155-fix-LinstorSR-explicit-error-message-when-a-group-is.patch b/SOURCES/0155-fix-LinstorSR-explicit-error-message-when-a-group-is.patch index 9e9f9d3..6eaaf1d 100644 --- a/SOURCES/0155-fix-LinstorSR-explicit-error-message-when-a-group-is.patch +++ b/SOURCES/0155-fix-LinstorSR-explicit-error-message-when-a-group-is.patch @@ -1,7 +1,7 @@ From c83b1aeacc1db0ec6110accaa128eed05eb36294 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 18 Jan 2024 10:24:01 +0100 -Subject: [PATCH 155/177] fix(LinstorSR): explicit error message when a group +Subject: [PATCH 155/178] fix(LinstorSR): explicit error message when a group is not unique during SR creation Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index a73ae5a2..fed1de2b 100755 +index a73ae5a..fed1de2 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -569,7 +569,9 @@ class LinstorSR(SR.SR): diff --git a/SOURCES/0156-fix-LinstorSR-make-sure-VDI.delete-doesn-t-throw-und.patch b/SOURCES/0156-fix-LinstorSR-make-sure-VDI.delete-doesn-t-throw-und.patch index 900be09..e40a14e 100644 --- a/SOURCES/0156-fix-LinstorSR-make-sure-VDI.delete-doesn-t-throw-und.patch +++ b/SOURCES/0156-fix-LinstorSR-make-sure-VDI.delete-doesn-t-throw-und.patch @@ -1,7 +1,7 @@ From a428724082121c6a61de9636efdeb3b0f2aead49 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 18 Jan 2024 11:18:11 +0100 -Subject: [PATCH 156/177] fix(LinstorSR): make sure VDI.delete doesn't throw +Subject: [PATCH 156/178] fix(LinstorSR): make sure VDI.delete doesn't throw under specific conditions If we can update the volume state in the KV-store, there is no reason to raise @@ -15,7 +15,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index fed1de2b..1e09e9bb 100755 +index fed1de2..1e09e9b 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -1760,7 +1760,14 @@ class LinstorVDI(VDI.VDI): @@ -35,7 +35,7 @@ index fed1de2b..1e09e9bb 100755 if self.uuid in self.sr.vdis: del self.sr.vdis[self.uuid] diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 32d15334..97e53725 100755 +index 32d1533..97e5372 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -272,7 +272,8 @@ def demote_drbd_resource(node_name, resource_name): diff --git a/SOURCES/0157-fix-LinstorSR-add-drbd-in-the-blacklist-of-multipath.patch b/SOURCES/0157-fix-LinstorSR-add-drbd-in-the-blacklist-of-multipath.patch index aff4b33..0c078df 100644 --- a/SOURCES/0157-fix-LinstorSR-add-drbd-in-the-blacklist-of-multipath.patch +++ b/SOURCES/0157-fix-LinstorSR-add-drbd-in-the-blacklist-of-multipath.patch @@ -1,7 +1,7 @@ From db9f69a83b5402daf90fd1d2c44d9e65e37708c5 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 19 Jan 2024 14:39:17 +0100 -Subject: [PATCH 157/177] fix(LinstorSR): add drbd in the blacklist of +Subject: [PATCH 157/178] fix(LinstorSR): add drbd in the blacklist of multipath.conf If DRBD is installed for the first time, and if the multipathd @@ -18,7 +18,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 1 insertion(+) diff --git a/multipath/multipath.conf b/multipath/multipath.conf -index ede40bad..935d3d67 100644 +index ede40ba..935d3d6 100644 --- a/multipath/multipath.conf +++ b/multipath/multipath.conf @@ -23,6 +23,7 @@ blacklist { diff --git a/SOURCES/0158-fix-linstorvolumemanager-create-cloned-volumes-on-ho.patch b/SOURCES/0158-fix-linstorvolumemanager-create-cloned-volumes-on-ho.patch index 0f3c89e..44ef689 100644 --- a/SOURCES/0158-fix-linstorvolumemanager-create-cloned-volumes-on-ho.patch +++ b/SOURCES/0158-fix-linstorvolumemanager-create-cloned-volumes-on-ho.patch @@ -1,7 +1,7 @@ From 4dbb05941ce89601e4766452e87e75a8abfbc63c Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 22 Jan 2024 11:25:25 +0100 -Subject: [PATCH 158/177] fix(linstorvolumemanager): create cloned volumes on +Subject: [PATCH 158/178] fix(linstorvolumemanager): create cloned volumes on host selected by LINSTOR Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 3 insertions(+), 91 deletions(-) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 97e53725..5de86a1b 100755 +index 97e5372..5de86a1 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -1245,8 +1245,7 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0159-fix-linstorvolumemanager-don-t-align-volumes-on-LVM-.patch b/SOURCES/0159-fix-linstorvolumemanager-don-t-align-volumes-on-LVM-.patch index 005dbad..171464f 100644 --- a/SOURCES/0159-fix-linstorvolumemanager-don-t-align-volumes-on-LVM-.patch +++ b/SOURCES/0159-fix-linstorvolumemanager-don-t-align-volumes-on-LVM-.patch @@ -1,7 +1,7 @@ From 0e86f2c9c1acdf9a669807d0db783cb58ac29499 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 26 Jan 2024 15:29:21 +0100 -Subject: [PATCH 159/177] fix(linstorvolumemanager): don't align volumes on LVM +Subject: [PATCH 159/178] fix(linstorvolumemanager): don't align volumes on LVM sector size It's the goal of the LINSTOR stack to align properly on the LVM layer. @@ -13,7 +13,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 5de86a1b..7410fd7a 100755 +index 5de86a1..7410fd7 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -309,8 +309,8 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0160-fix-linstorvolumemanager-assert-with-message-after-l.patch b/SOURCES/0160-fix-linstorvolumemanager-assert-with-message-after-l.patch index c18ec16..4b7c0ee 100644 --- a/SOURCES/0160-fix-linstorvolumemanager-assert-with-message-after-l.patch +++ b/SOURCES/0160-fix-linstorvolumemanager-assert-with-message-after-l.patch @@ -1,7 +1,7 @@ From 67926a299d10072816286df087cb1fe3a0111717 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 5 Feb 2024 18:01:22 +0100 -Subject: [PATCH 160/177] fix(linstorvolumemanager): assert with message after +Subject: [PATCH 160/178] fix(linstorvolumemanager): assert with message after log in update_volume_uuid Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 7410fd7a..5f2e06ee 100755 +index 7410fd7..5f2e06e 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -972,12 +972,12 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0161-fix-linstorvolumemanager-retry-resize-if-volume-is-n.patch b/SOURCES/0161-fix-linstorvolumemanager-retry-resize-if-volume-is-n.patch index ac937cb..d1990e1 100644 --- a/SOURCES/0161-fix-linstorvolumemanager-retry-resize-if-volume-is-n.patch +++ b/SOURCES/0161-fix-linstorvolumemanager-retry-resize-if-volume-is-n.patch @@ -1,7 +1,7 @@ From 0fc311b8ac8da92ba91f99a1ceb97ee7663c88ed Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 5 Feb 2024 23:13:06 +0100 -Subject: [PATCH 161/177] fix(linstorvolumemanager): retry resize if volume is +Subject: [PATCH 161/178] fix(linstorvolumemanager): retry resize if volume is not up to date Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 5f2e06ee..79ac84a4 100755 +index 5f2e06e..79ac84a 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -824,18 +824,30 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0162-fix-LinstorSR-create-DRBD-diskless-if-necessary-for-.patch b/SOURCES/0162-fix-LinstorSR-create-DRBD-diskless-if-necessary-for-.patch index 3c55748..33ce8f7 100644 --- a/SOURCES/0162-fix-LinstorSR-create-DRBD-diskless-if-necessary-for-.patch +++ b/SOURCES/0162-fix-LinstorSR-create-DRBD-diskless-if-necessary-for-.patch @@ -1,7 +1,7 @@ From 0d61202439fd59c9d0121d71ce63e41e5a7d7f68 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 6 Feb 2024 00:10:32 +0100 -Subject: [PATCH 162/177] fix(LinstorSR): create DRBD diskless if necessary for +Subject: [PATCH 162/178] fix(LinstorSR): create DRBD diskless if necessary for each VHD parent It's necessary to have all parents during snapshot to create a new VHD child. @@ -12,7 +12,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 1e09e9bb..53afbefe 100755 +index 1e09e9b..53afbef 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -1827,32 +1827,7 @@ class LinstorVDI(VDI.VDI): diff --git a/SOURCES/0163-fix-LinstorSR-fix-bad-call-to-vhdutil.inflate-bad-ex.patch b/SOURCES/0163-fix-LinstorSR-fix-bad-call-to-vhdutil.inflate-bad-ex.patch index 106c6b7..ea1ffe6 100644 --- a/SOURCES/0163-fix-LinstorSR-fix-bad-call-to-vhdutil.inflate-bad-ex.patch +++ b/SOURCES/0163-fix-LinstorSR-fix-bad-call-to-vhdutil.inflate-bad-ex.patch @@ -1,7 +1,7 @@ From 574d72fc61a205b0a037cfe6a0002f2602f8e99d Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 6 Feb 2024 00:14:11 +0100 -Subject: [PATCH 163/177] fix(LinstorSR): fix bad call to vhdutil.inflate + bad +Subject: [PATCH 163/178] fix(LinstorSR): fix bad call to vhdutil.inflate + bad exception Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 53afbefe..de10f423 100755 +index 53afbef..de10f42 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -1944,7 +1944,7 @@ class LinstorVDI(VDI.VDI): diff --git a/SOURCES/0164-fix-LinstorSR-activate-VG-if-attach-from-config-is-a.patch b/SOURCES/0164-fix-LinstorSR-activate-VG-if-attach-from-config-is-a.patch index ffdd7b1..98b368e 100644 --- a/SOURCES/0164-fix-LinstorSR-activate-VG-if-attach-from-config-is-a.patch +++ b/SOURCES/0164-fix-LinstorSR-activate-VG-if-attach-from-config-is-a.patch @@ -1,7 +1,7 @@ From fdd9b4d9038c31c1c54d31b5ea135f6cab85ac24 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 12 Feb 2024 20:54:06 +0100 -Subject: [PATCH 164/177] fix(LinstorSR): activate VG if attach from config is +Subject: [PATCH 164/178] fix(LinstorSR): activate VG if attach from config is asked Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index de10f423..b6b15298 100755 +index de10f42..b6b1529 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -382,7 +382,7 @@ class LinstorSR(SR.SR): diff --git a/SOURCES/0165-feat-LinstorSR-use-a-specific-resource-group-for-DB-.patch b/SOURCES/0165-feat-LinstorSR-use-a-specific-resource-group-for-DB-.patch index 6ad76cb..77e6e30 100644 --- a/SOURCES/0165-feat-LinstorSR-use-a-specific-resource-group-for-DB-.patch +++ b/SOURCES/0165-feat-LinstorSR-use-a-specific-resource-group-for-DB-.patch @@ -1,7 +1,7 @@ From 51699827c68a7674b379b44bcc9fa51c95c9b9a2 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 19 Mar 2024 23:09:54 +0100 -Subject: [PATCH 165/177] feat(LinstorSR): use a specific resource group for DB +Subject: [PATCH 165/178] feat(LinstorSR): use a specific resource group for DB and HA Signed-off-by: Ronan Abhamon @@ -11,7 +11,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 182 insertions(+), 78 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index b6b15298..3421f79f 100755 +index b6b1529..3421f79 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -1662,8 +1662,11 @@ class LinstorVDI(VDI.VDI): @@ -29,7 +29,7 @@ index b6b15298..3421f79f 100755 volume_info = self._linstor.get_volume_info(self.uuid) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 79ac84a4..4118a28f 100755 +index 79ac84a..4118a28 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -273,7 +273,8 @@ class LinstorVolumeManagerError(Exception): diff --git a/SOURCES/0166-feat-linstor-manager-add-getNodePreferredInterface-h.patch b/SOURCES/0166-feat-linstor-manager-add-getNodePreferredInterface-h.patch index 303d4da..0bcef7a 100644 --- a/SOURCES/0166-feat-linstor-manager-add-getNodePreferredInterface-h.patch +++ b/SOURCES/0166-feat-linstor-manager-add-getNodePreferredInterface-h.patch @@ -1,7 +1,7 @@ From d3d377079f5153fa41220b4df9de176b733cd6a8 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 15 Apr 2024 11:22:18 +0200 -Subject: [PATCH 166/177] feat(linstor-manager): add +Subject: [PATCH 166/178] feat(linstor-manager): add `getNodePreferredInterface` helper Signed-off-by: Ronan Abhamon @@ -11,7 +11,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 33 insertions(+) diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index 6b45875d..a2501d74 100755 +index 6b45875..a2501d7 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -1062,6 +1062,21 @@ def list_node_interfaces(session, args): @@ -44,7 +44,7 @@ index 6b45875d..a2501d74 100755 'setNodePreferredInterface': set_node_preferred_interface }) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 4118a28f..46c3283d 100755 +index 4118a28..46c3283 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -1544,6 +1544,23 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0167-fix-linstorvolumemanager-blocks-deletion-of-default-.patch b/SOURCES/0167-fix-linstorvolumemanager-blocks-deletion-of-default-.patch index 92cdc3b..d48907c 100644 --- a/SOURCES/0167-fix-linstorvolumemanager-blocks-deletion-of-default-.patch +++ b/SOURCES/0167-fix-linstorvolumemanager-blocks-deletion-of-default-.patch @@ -1,7 +1,7 @@ From 297296c0ec9c5df659267e1432e4de0ac6af5618 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 15 Apr 2024 11:26:00 +0200 -Subject: [PATCH 167/177] fix(linstorvolumemanager): blocks deletion of default +Subject: [PATCH 167/178] fix(linstorvolumemanager): blocks deletion of default network interface Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 6 insertions(+) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 46c3283d..02059d81 100755 +index 46c3283..02059d8 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -1491,6 +1491,12 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0168-feat-linstorvolumemanager-change-logic-of-get_resour.patch b/SOURCES/0168-feat-linstorvolumemanager-change-logic-of-get_resour.patch index c20b589..974f10e 100644 --- a/SOURCES/0168-feat-linstorvolumemanager-change-logic-of-get_resour.patch +++ b/SOURCES/0168-feat-linstorvolumemanager-change-logic-of-get_resour.patch @@ -1,7 +1,7 @@ From 1d940461f9f408b93eef80c09156f74745d62570 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 15 Apr 2024 17:56:47 +0200 -Subject: [PATCH 168/177] feat(linstorvolumemanager): change logic of +Subject: [PATCH 168/178] feat(linstorvolumemanager): change logic of `get_resources_info`: - Add a nested level "nodes" for each resource - Add a "uuid" attr on resources - Rename LINSTOR "uuid" to "linstor-uuid" - Optimize code @@ -13,7 +13,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index a2501d74..ed855257 100755 +index a2501d7..ed85525 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -884,6 +884,7 @@ def health_check(session, args): @@ -25,7 +25,7 @@ index a2501d74..ed855257 100755 'errors': [] } diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 02059d81..25c226ac 100755 +index 02059d8..25c226a 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -1624,7 +1624,7 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0169-feat-linstor-manager-add-error-codes-to-healthCheck-.patch b/SOURCES/0169-feat-linstor-manager-add-error-codes-to-healthCheck-.patch index 2d2f456..417d727 100644 --- a/SOURCES/0169-feat-linstor-manager-add-error-codes-to-healthCheck-.patch +++ b/SOURCES/0169-feat-linstor-manager-add-error-codes-to-healthCheck-.patch @@ -1,7 +1,7 @@ From c377cf900ae07d3b6de4004dd3a65df9086c30b3 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 18 Apr 2024 13:57:37 +0200 -Subject: [PATCH 169/177] feat(linstor-manager): add error codes to healthCheck +Subject: [PATCH 169/178] feat(linstor-manager): add error codes to healthCheck helper Signed-off-by: Ronan Abhamon @@ -11,7 +11,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 120 insertions(+), 35 deletions(-) diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index ed855257..94aa4fb9 100755 +index ed85525..94aa4fb 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -27,6 +27,7 @@ import socket @@ -234,7 +234,7 @@ index ed855257..94aa4fb9 100755 return format_result() diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 25c226ac..94d5c514 100755 +index 25c226a..94d5c51 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -1623,7 +1623,7 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0170-fix-LinstorSR-fix-bad-exception-reference-during-sna.patch b/SOURCES/0170-fix-LinstorSR-fix-bad-exception-reference-during-sna.patch index 0618e2e..4175ac9 100644 --- a/SOURCES/0170-fix-LinstorSR-fix-bad-exception-reference-during-sna.patch +++ b/SOURCES/0170-fix-LinstorSR-fix-bad-exception-reference-during-sna.patch @@ -1,7 +1,7 @@ From 84e236ff9a967f5df25535213f89e377d51d4b5f Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 24 Apr 2024 15:10:49 +0200 -Subject: [PATCH 170/177] fix(LinstorSR): fix bad exception reference during +Subject: [PATCH 170/178] fix(LinstorSR): fix bad exception reference during snapshot Signed-off-by: Ronan Abhamon @@ -10,7 +10,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 3421f79f..3bd31e9e 100755 +index 3421f79..3bd31e9 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -2500,17 +2500,17 @@ class LinstorVDI(VDI.VDI): diff --git a/SOURCES/0171-fix-tapdisk-pause-ensure-LINSTOR-VHD-chain-is-availa.patch b/SOURCES/0171-fix-tapdisk-pause-ensure-LINSTOR-VHD-chain-is-availa.patch index d0b342a..0986c7d 100644 --- a/SOURCES/0171-fix-tapdisk-pause-ensure-LINSTOR-VHD-chain-is-availa.patch +++ b/SOURCES/0171-fix-tapdisk-pause-ensure-LINSTOR-VHD-chain-is-availa.patch @@ -1,7 +1,7 @@ From 66ec66a863f3d5c8c95e5310dd2e9c77335faab5 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 24 Apr 2024 17:29:26 +0200 -Subject: [PATCH 171/177] fix(tapdisk-pause): ensure LINSTOR VHD chain is +Subject: [PATCH 171/178] fix(tapdisk-pause): ensure LINSTOR VHD chain is available Signed-off-by: Ronan Abhamon @@ -12,7 +12,7 @@ Signed-off-by: Ronan Abhamon 3 files changed, 44 insertions(+), 35 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 3bd31e9e..c5ed7c58 100755 +index 3bd31e9..c5ed7c5 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -1830,7 +1830,7 @@ class LinstorVDI(VDI.VDI): @@ -72,7 +72,7 @@ index 3bd31e9e..c5ed7c58 100755 diff --git a/drivers/linstorvhdutil.py b/drivers/linstorvhdutil.py -index 23d8b6a0..17b7790e 100644 +index 23d8b6a..17b7790 100644 --- a/drivers/linstorvhdutil.py +++ b/drivers/linstorvhdutil.py @@ -21,6 +21,7 @@ import distutils.util @@ -128,7 +128,7 @@ index 23d8b6a0..17b7790e 100644 # Getters: read locally and try on another host in case of failure. # -------------------------------------------------------------------------- diff --git a/drivers/tapdisk-pause b/drivers/tapdisk-pause -index e0bca7be..c316cdfa 100755 +index e0bca7b..c316cdf 100755 --- a/drivers/tapdisk-pause +++ b/drivers/tapdisk-pause @@ -30,6 +30,7 @@ import vhdutil diff --git a/SOURCES/0172-fix-linstorvhdutil-retry-check-on-another-machine-in.patch b/SOURCES/0172-fix-linstorvhdutil-retry-check-on-another-machine-in.patch index 61b2053..e1fd6c9 100644 --- a/SOURCES/0172-fix-linstorvhdutil-retry-check-on-another-machine-in.patch +++ b/SOURCES/0172-fix-linstorvhdutil-retry-check-on-another-machine-in.patch @@ -1,7 +1,7 @@ From 5a48b3ddc8683c3f6217c1bcce17d4f064efaee9 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 6 May 2024 18:15:00 +0200 -Subject: [PATCH 172/177] fix(linstorvhdutil): retry check on another machine +Subject: [PATCH 172/178] fix(linstorvhdutil): retry check on another machine in case of failure (#54) Signed-off-by: Ronan Abhamon @@ -11,7 +11,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index 94aa4fb9..47cbd2b7 100755 +index 94aa4fb..47cbd2b 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -29,7 +29,7 @@ import XenAPIPlugin @@ -34,7 +34,7 @@ index 94aa4fb9..47cbd2b7 100755 util.SMlog('linstor-manager:check error: {}'.format(e)) raise diff --git a/drivers/linstorvhdutil.py b/drivers/linstorvhdutil.py -index 17b7790e..fd2bc8be 100644 +index 17b7790..fd2bc8b 100644 --- a/drivers/linstorvhdutil.py +++ b/drivers/linstorvhdutil.py @@ -50,6 +50,16 @@ def call_remote_method(session, host_ref, method, device_path, args): diff --git a/SOURCES/0173-fix-LinstorSR-explicit-errors-when-database-path-is-.patch b/SOURCES/0173-fix-LinstorSR-explicit-errors-when-database-path-is-.patch index c24d52c..e22587f 100644 --- a/SOURCES/0173-fix-LinstorSR-explicit-errors-when-database-path-is-.patch +++ b/SOURCES/0173-fix-LinstorSR-explicit-errors-when-database-path-is-.patch @@ -1,7 +1,7 @@ From 13ff45ec98437db8d85e3d9c52d6bb353f8f9656 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 6 May 2024 21:35:36 +0200 -Subject: [PATCH 173/177] fix(LinstorSR): explicit errors when database path is +Subject: [PATCH 173/178] fix(LinstorSR): explicit errors when database path is fetched --- @@ -10,7 +10,7 @@ Subject: [PATCH 173/177] fix(LinstorSR): explicit errors when database path is 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index c5ed7c58..9f0986cd 100755 +index c5ed7c5..9f0986c 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -766,7 +766,7 @@ class LinstorSR(SR.SR): @@ -32,7 +32,7 @@ index c5ed7c58..9f0986cd 100755 # Update the database before the restart of the GC to avoid diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 94d5c514..948d45df 100755 +index 94d5c51..948d45d 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -2648,7 +2648,7 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0174-fix-LinstorSR-Misc-fixes-on-destroy.patch b/SOURCES/0174-fix-LinstorSR-Misc-fixes-on-destroy.patch index c381a90..b8b7ee8 100644 --- a/SOURCES/0174-fix-LinstorSR-Misc-fixes-on-destroy.patch +++ b/SOURCES/0174-fix-LinstorSR-Misc-fixes-on-destroy.patch @@ -1,7 +1,7 @@ From 34e414b5d11363ebcce4c0f3a98d9e8de6c90432 Mon Sep 17 00:00:00 2001 From: Damien Thenot Date: Tue, 30 Apr 2024 15:38:34 +0200 -Subject: [PATCH 174/177] fix(LinstorSR): Misc fixes on destroy +Subject: [PATCH 174/178] fix(LinstorSR): Misc fixes on destroy linstor-manager: - fix on get_drbd_volumes @@ -27,7 +27,7 @@ Co-authored-by: Ronan Abhamon 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 9f0986cd..8d958908 100755 +index 9f0986c..8d95890 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -650,17 +650,17 @@ class LinstorSR(SR.SR): @@ -62,7 +62,7 @@ index 9f0986cd..8d958908 100755 except Exception as e: try: diff --git a/drivers/linstor-manager b/drivers/linstor-manager -index 47cbd2b7..f0404b80 100755 +index 47cbd2b..f0404b8 100755 --- a/drivers/linstor-manager +++ b/drivers/linstor-manager @@ -241,7 +241,10 @@ def get_drbd_volumes(volume_group=None): @@ -78,7 +78,7 @@ index 47cbd2b7..f0404b80 100755 if not match: continue diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 948d45df..103f91b7 100755 +index 948d45d..103f91b 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -18,7 +18,6 @@ diff --git a/SOURCES/0175-fix-LinstorSR-open-non-leaf-volumes-in-RO-mode-creat.patch b/SOURCES/0175-fix-LinstorSR-open-non-leaf-volumes-in-RO-mode-creat.patch index b7d09f1..d1464c9 100644 --- a/SOURCES/0175-fix-LinstorSR-open-non-leaf-volumes-in-RO-mode-creat.patch +++ b/SOURCES/0175-fix-LinstorSR-open-non-leaf-volumes-in-RO-mode-creat.patch @@ -1,7 +1,7 @@ From 383d6484765a0b316402f1899bc9a2ec2cf81521 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 20 Jun 2024 22:37:40 +0200 -Subject: [PATCH 175/177] fix(LinstorSR): open non-leaf volumes in RO mode +Subject: [PATCH 175/178] fix(LinstorSR): open non-leaf volumes in RO mode (create_chain_paths) We must never open non-leaf volumes with the write option. @@ -15,7 +15,7 @@ Signed-off-by: Ronan Abhamon 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 8d958908..21270570 100755 +index 8d95890..2127057 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -1793,10 +1793,10 @@ class LinstorVDI(VDI.VDI): @@ -51,7 +51,7 @@ index 8d958908..21270570 100755 volume_path = self.path if not util.pathexists(volume_path): diff --git a/drivers/linstorvhdutil.py b/drivers/linstorvhdutil.py -index fd2bc8be..7f8efa12 100644 +index fd2bc8b..7f8efa1 100644 --- a/drivers/linstorvhdutil.py +++ b/drivers/linstorvhdutil.py @@ -152,7 +152,7 @@ class LinstorVhdUtil: diff --git a/SOURCES/0176-fix-LinstorSR-ensure-_is_master-is-always-set.patch b/SOURCES/0176-fix-LinstorSR-ensure-_is_master-is-always-set.patch index 88b2e98..1e62dc6 100644 --- a/SOURCES/0176-fix-LinstorSR-ensure-_is_master-is-always-set.patch +++ b/SOURCES/0176-fix-LinstorSR-ensure-_is_master-is-always-set.patch @@ -1,7 +1,7 @@ From 0cbabd180b8fc5ecaf2ca8ff066f37bd18706b68 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 26 Jul 2024 11:32:20 +0200 -Subject: [PATCH 176/177] fix(LinstorSR): ensure `_is_master` is always set +Subject: [PATCH 176/178] fix(LinstorSR): ensure `_is_master` is always set `_is_master` is not always initialized, and more precisely in the case of detach where LinstorSR.load method is not called. @@ -16,7 +16,7 @@ Signed-off-by: Ronan Abhamon 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py -index 21270570..fdcad17e 100755 +index 2127057..fdcad17 100755 --- a/drivers/LinstorSR.py +++ b/drivers/LinstorSR.py @@ -362,9 +362,6 @@ class LinstorSR(SR.SR): diff --git a/SOURCES/0177-fix-linstor-check-if-resource-is-tiebreaker-62.patch b/SOURCES/0177-fix-linstor-check-if-resource-is-tiebreaker-62.patch index 6c577c2..1ab1141 100644 --- a/SOURCES/0177-fix-linstor-check-if-resource-is-tiebreaker-62.patch +++ b/SOURCES/0177-fix-linstor-check-if-resource-is-tiebreaker-62.patch @@ -1,7 +1,7 @@ From 8d6cfc70d30e13cdf6a8ea2be3a534bace9fb936 Mon Sep 17 00:00:00 2001 From: Damien Thenot Date: Fri, 26 Jul 2024 14:13:05 +0200 -Subject: [PATCH 177/177] fix(linstor): check if resource is tiebreaker (#62) +Subject: [PATCH 177/178] fix(linstor): check if resource is tiebreaker (#62) We check if a resource is already a tiebreaker before trying to delete the resource. @@ -13,7 +13,7 @@ Signed-off-by: Damien Thenot 1 file changed, 7 insertions(+) diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py -index 103f91b7..8bfd1c1b 100755 +index 103f91b..8bfd1c1 100755 --- a/drivers/linstorvolumemanager.py +++ b/drivers/linstorvolumemanager.py @@ -812,6 +812,13 @@ class LinstorVolumeManager(object): diff --git a/SOURCES/0178-linstor-Fix-to-add-sync-to-DD.patch b/SOURCES/0178-linstor-Fix-to-add-sync-to-DD.patch new file mode 100644 index 0000000..6b39c73 --- /dev/null +++ b/SOURCES/0178-linstor-Fix-to-add-sync-to-DD.patch @@ -0,0 +1,23 @@ +From 0e5b94b307afba1df9637afb762322bd8aaa8fa9 Mon Sep 17 00:00:00 2001 +From: Damien Thenot +Date: Wed, 9 Oct 2024 16:20:46 +0200 +Subject: [PATCH 178/178] linstor: Fix to add sync to DD + +Signed-off-by: Damien Thenot +--- + drivers/util.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/util.py b/drivers/util.py +index fe8e13d..673cd6e 100755 +--- a/drivers/util.py ++++ b/drivers/util.py +@@ -575,7 +575,7 @@ def zeroOut(path, fromByte, bytes): + bytesBefore = bytes + bytes -= bytesBefore + cmd = [CMD_DD, "if=/dev/zero", "of=%s" % path, "bs=1", \ +- "seek=%s" % fromByte, "count=%s" % bytesBefore] ++ "seek=%s" % fromByte, "count=%s" % bytesBefore, "conv=fsync"] + try: + text = pread2(cmd) + except CommandException: diff --git a/SPECS/sm.spec b/SPECS/sm.spec index 39f848c..ce7f1bc 100644 --- a/SPECS/sm.spec +++ b/SPECS/sm.spec @@ -11,7 +11,7 @@ Summary: sm - XCP storage managers Name: sm Version: 2.30.8 -Release: %{?xsrel}.1.0.linstor.1%{?dist} +Release: %{?xsrel}.1.0.linstor.2%{?dist} Group: System/Hypervisor License: LGPL URL: https://github.com/xapi-project/sm @@ -279,6 +279,7 @@ Patch1174: 0174-fix-LinstorSR-Misc-fixes-on-destroy.patch Patch1175: 0175-fix-LinstorSR-open-non-leaf-volumes-in-RO-mode-creat.patch Patch1176: 0176-fix-LinstorSR-ensure-_is_master-is-always-set.patch Patch1177: 0177-fix-linstor-check-if-resource-is-tiebreaker-62.patch +Patch1178: 0178-linstor-Fix-to-add-sync-to-DD.patch %description This package contains storage backends used in XCP @@ -696,6 +697,9 @@ cp -r htmlcov %{buildroot}/htmlcov %{_unitdir}/linstor-monitor.service %changelog +* Tue Nov 12 2024 Damien Thenot - 2.30.8-13.1.0.linstor.2 +- Add 0178-linstor-Fix-to-add-sync-to-DD.patch + * Thu Oct 03 2024 Ronan Abhamon - 2.30.8-13.1.0.linstor.1 - Add "Provides": sm-linstor (necessary for the "Requires" of xcp-ng-linstor) - Add LINSTOR patches