Remove 0024-Revert-CA-379329-check-for-missing-iSCSI-sessions-an.patch (

#63)

Signed-off-by: Ronan Abhamon <[email protected]>

SOURCES/0001-backport-of-ccd121cc248d79b749a63d4ad099e6d5f4b8b588.patch

@@ -1,7 +1,7 @@
 From a365619c2835e593259dad3c26761575f64066d6 Mon Sep 17 00:00:00 2001
 From: Mark Syms <[email protected]>
 Date: Thu, 20 May 2021 17:40:06 +0100
-Subject: [PATCH 001/178] backport of ccd121cc248d79b749a63d4ad099e6d5f4b8b588:
+Subject: [PATCH 001/177] backport of ccd121cc248d79b749a63d4ad099e6d5f4b8b588:
  CA-354692: check for device parameter in create/probe calls
 
 Signed-off-by: Mark Syms <[email protected]>
@@ -13,7 +13,7 @@ Signed-off-by: Ronan Abhamon <[email protected]>
  3 files changed, 15 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/EXTSR.py b/drivers/EXTSR.py
-index 4caa09d..da43082 100755
+index 4caa09df..da43082e 100755
 --- a/drivers/EXTSR.py
 +++ b/drivers/EXTSR.py
 @@ -18,6 +18,7 @@
@@ -38,7 +38,7 @@ index 4caa09d..da43082 100755
          if self._checkmount():
              raise xs_errors.XenError('SRExists')
 diff --git a/drivers/LVHDSR.py b/drivers/LVHDSR.py
-index cfee071..dd8e20b 100755
+index cfee0717..dd8e20b9 100755
 --- a/drivers/LVHDSR.py
 +++ b/drivers/LVHDSR.py
 @@ -19,6 +19,7 @@
@@ -67,7 +67,7 @@ index cfee071..dd8e20b 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 aa5a6b1..c752863 100755
+index aa5a6b1e..c7528638 100755
 --- a/drivers/SR.py
 +++ b/drivers/SR.py
 @@ -49,6 +49,15 @@ class SROSError(SRException):
@@ -86,6 +86,3 @@ index aa5a6b1..c752863 100755
  backends = []
  def registerSR(SRClass):
      """Register SR with handler. All SR subclasses should call this in 
--- 
-2.46.0
-

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

@@ -1,7 +1,7 @@
 From 283242d159438c4b301e153a95adde5dfaea3b58 Mon Sep 17 00:00:00 2001
 From: Samuel Verschelde <[email protected]>
 Date: Thu, 13 Aug 2020 15:22:17 +0200
-Subject: [PATCH 002/178] Update xs-sm.service's description for XCP-ng
+Subject: [PATCH 002/177] 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 99cb313..609c6ef 100644
+index 99cb313f..609c6ef5 100644
 --- a/systemd/xs-sm.service
 +++ b/systemd/xs-sm.service
 @@ -1,5 +1,5 @@
@@ -20,6 +20,3 @@ index 99cb313..609c6ef 100644
  Before=xapi.service
  Conflicts=shutdown.target
  RefuseManualStop=yes
--- 
-2.46.0
-

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

@@ -1,7 +1,7 @@
 From d6528d899b762ec5d7ceec1fb9c8b13c2c7e6f73 Mon Sep 17 00:00:00 2001
 From: Samuel Verschelde <[email protected]>
 Date: Thu, 13 Aug 2020 15:26:43 +0200
-Subject: [PATCH 003/178] Add TrueNAS multipath config
+Subject: [PATCH 003/177] 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 9f3dfa7..f63506d 100644
+index 9f3dfa72..f63506d8 100644
 --- a/multipath/multipath.conf
 +++ b/multipath/multipath.conf
 @@ -116,4 +116,11 @@ devices {
@@ -25,6 +25,3 @@ index 9f3dfa7..f63506d 100644
 +		prio			alua
 +	}
  }
--- 
-2.46.0
-

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

@@ -1,7 +1,7 @@
 From 13542e244eea28a4c60708de99a50fa8c3d4ec5a Mon Sep 17 00:00:00 2001
 From: Ronan Abhamon <[email protected]>
 Date: Mon, 20 Jul 2020 16:26:42 +0200
-Subject: [PATCH 004/178] feat(drivers): add CephFS, GlusterFS and XFS drivers
+Subject: [PATCH 004/177] feat(drivers): add CephFS, GlusterFS and XFS drivers
 
 ---
  Makefile               |   3 +
@@ -15,7 +15,7 @@ Subject: [PATCH 004/178] feat(drivers): add CephFS, GlusterFS and XFS drivers
  create mode 100644 drivers/XFSSR.py
 
 diff --git a/Makefile b/Makefile
-index d07a8ca..0a10470 100755
+index d07a8ca3..0a10470a 100755
 --- a/Makefile
 +++ b/Makefile
 @@ -17,6 +17,9 @@ SM_DRIVERS += OCFSoHBA
@@ -30,7 +30,7 @@ index d07a8ca..0a10470 100755
  SM_LIBS += SRCommand
 diff --git a/drivers/CephFSSR.py b/drivers/CephFSSR.py
 new file mode 100644
-index 0000000..d797490
+index 00000000..d7974907
 --- /dev/null
 +++ b/drivers/CephFSSR.py
 @@ -0,0 +1,296 @@
@@ -332,7 +332,7 @@ index 0000000..d797490
 +    SR.registerSR(CephFSSR)
 diff --git a/drivers/GlusterFSSR.py b/drivers/GlusterFSSR.py
 new file mode 100644
-index 0000000..a2f7484
+index 00000000..a2f7484f
 --- /dev/null
 +++ b/drivers/GlusterFSSR.py
 @@ -0,0 +1,287 @@
@@ -625,7 +625,7 @@ index 0000000..a2f7484
 +    SR.registerSR(GlusterFSSR)
 diff --git a/drivers/XFSSR.py b/drivers/XFSSR.py
 new file mode 100644
-index 0000000..de35d73
+index 00000000..de35d738
 --- /dev/null
 +++ b/drivers/XFSSR.py
 @@ -0,0 +1,242 @@
@@ -872,7 +872,7 @@ index 0000000..de35d73
 +else:
 +    SR.registerSR(XFSSR)
 diff --git a/drivers/cleanup.py b/drivers/cleanup.py
-index dce460e..aff51ae 100755
+index dce460ea..aff51aed 100755
 --- a/drivers/cleanup.py
 +++ b/drivers/cleanup.py
 @@ -2765,7 +2765,10 @@ def normalizeType(type):
@@ -887,6 +887,3 @@ index dce460e..aff51ae 100755
          type = SR.TYPE_FILE
      if not type in SR.TYPES:
          raise util.SMException("Unsupported SR type: %s" % type)
--- 
-2.46.0
-

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

@@ -1,7 +1,7 @@
 From 4525a55b84eb46f4c67797da6eaf61a329dac9d7 Mon Sep 17 00:00:00 2001
 From: Ronan Abhamon <[email protected]>
 Date: Wed, 12 Aug 2020 11:14:33 +0200
-Subject: [PATCH 005/178] feat(drivers): add ZFS driver to avoid losing VDI
+Subject: [PATCH 005/177] feat(drivers): add ZFS driver to avoid losing VDI
  metadata (xcp-ng/xcp#401)
 
 ---
@@ -13,7 +13,7 @@ Subject: [PATCH 005/178] feat(drivers): add ZFS driver to avoid losing VDI
  create mode 100644 drivers/ZFSSR.py
 
 diff --git a/Makefile b/Makefile
-index 0a10470..f93b7be 100755
+index 0a10470a..f93b7be5 100755
 --- a/Makefile
 +++ b/Makefile
 @@ -20,6 +20,7 @@ SM_DRIVERS += LVHDoFCoE
@@ -25,7 +25,7 @@ index 0a10470..f93b7be 100755
  SM_LIBS := SR
  SM_LIBS += SRCommand
 diff --git a/drivers/XE_SR_ERRORCODES.xml b/drivers/XE_SR_ERRORCODES.xml
-index 7ab7bc1..535c9dc 100755
+index 7ab7bc1c..535c9dc3 100755
 --- a/drivers/XE_SR_ERRORCODES.xml
 +++ b/drivers/XE_SR_ERRORCODES.xml
 @@ -900,5 +900,15 @@
@@ -46,7 +46,7 @@ index 7ab7bc1..535c9dc 100755
  </SM-errorcodes>
 diff --git a/drivers/ZFSSR.py b/drivers/ZFSSR.py
 new file mode 100644
-index 0000000..1b2f398
+index 00000000..1b2f398f
 --- /dev/null
 +++ b/drivers/ZFSSR.py
 @@ -0,0 +1,137 @@
@@ -188,7 +188,7 @@ index 0000000..1b2f398
 +else:
 +    SR.registerSR(ZFSSR)
 diff --git a/drivers/cleanup.py b/drivers/cleanup.py
-index aff51ae..feb7c18 100755
+index aff51aed..feb7c187 100755
 --- a/drivers/cleanup.py
 +++ b/drivers/cleanup.py
 @@ -2767,7 +2767,7 @@ def normalizeType(type):
@@ -200,6 +200,3 @@ index aff51ae..feb7c18 100755
      ]:
          type = SR.TYPE_FILE
      if not type in SR.TYPES:
--- 
-2.46.0
-

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

@@ -1,7 +1,7 @@
 From 5987a43e40444a524768b1434de1a67c6e53000a Mon Sep 17 00:00:00 2001
 From: Samuel Verschelde <[email protected]>
 Date: Thu, 13 Aug 2020 17:10:12 +0200
-Subject: [PATCH 006/178] Re-add the ext4 driver for users who need to
+Subject: [PATCH 006/177] 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 f93b7be..9bc0a9d 100755
+index f93b7be5..9bc0a9d8 100755
 --- a/Makefile
 +++ b/Makefile
 @@ -21,6 +21,7 @@ SM_DRIVERS += CephFS
@@ -34,7 +34,7 @@ index f93b7be..9bc0a9d 100755
  SM_LIBS += SRCommand
 diff --git a/drivers/EXT4SR.py b/drivers/EXT4SR.py
 new file mode 100644
-index 0000000..bd67d00
+index 00000000..bd67d003
 --- /dev/null
 +++ b/drivers/EXT4SR.py
 @@ -0,0 +1,235 @@
@@ -275,7 +275,7 @@ index 0000000..bd67d00
 +    SR.registerSR(EXT4SR)
 \ No newline at end of file
 diff --git a/drivers/cleanup.py b/drivers/cleanup.py
-index feb7c18..12e4428 100755
+index feb7c187..12e44285 100755
 --- a/drivers/cleanup.py
 +++ b/drivers/cleanup.py
 @@ -2767,7 +2767,7 @@ def normalizeType(type):
@@ -287,6 +287,3 @@ index feb7c18..12e4428 100755
      ]:
          type = SR.TYPE_FILE
      if not type in SR.TYPES:
--- 
-2.46.0
-

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

@@ -1,7 +1,7 @@
 From 2c71c3ce33cd02573824a57bd4b3917b45c890b0 Mon Sep 17 00:00:00 2001
 From: Ronan Abhamon <[email protected]>
 Date: Mon, 16 Mar 2020 15:39:44 +0100
-Subject: [PATCH 007/178] feat(drivers): add LinstorSR driver
+Subject: [PATCH 007/177] 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 9bc0a9d..609e182 100755
+index 9bc0a9d8..609e1828 100755
 --- a/Makefile
 +++ b/Makefile
 @@ -8,6 +8,7 @@ SM_DRIVERS += udev
@@ -139,7 +139,7 @@ index 9bc0a9d..609e182 100755
 -
 diff --git a/drivers/LinstorSR.py b/drivers/LinstorSR.py
 new file mode 100755
-index 0000000..8be1836
+index 00000000..8be18367
 --- /dev/null
 +++ b/drivers/LinstorSR.py
 @@ -0,0 +1,2100 @@
@@ -2244,7 +2244,7 @@ index 0000000..8be1836
 +else:
 +    SR.registerSR(LinstorSR)
 diff --git a/drivers/XE_SR_ERRORCODES.xml b/drivers/XE_SR_ERRORCODES.xml
-index 535c9dc..6bbb817 100755
+index 535c9dc3..6bbb8179 100755
 --- a/drivers/XE_SR_ERRORCODES.xml
 +++ b/drivers/XE_SR_ERRORCODES.xml
 @@ -911,4 +911,40 @@
@@ -2289,7 +2289,7 @@ index 535c9dc..6bbb817 100755
 +       </code>
  </SM-errorcodes>
 diff --git a/drivers/cleanup.py b/drivers/cleanup.py
-index 12e4428..af2f316 100755
+index 12e44285..af2f316b 100755
 --- a/drivers/cleanup.py
 +++ b/drivers/cleanup.py
 @@ -47,7 +47,17 @@ import xs_errors
@@ -2709,7 +2709,7 @@ index 12e4428..af2f316 100755
 
 diff --git a/drivers/linstor-manager b/drivers/linstor-manager
 new file mode 100755
-index 0000000..f7ce180
+index 00000000..f7ce1809
 --- /dev/null
 +++ b/drivers/linstor-manager
 @@ -0,0 +1,272 @@
@@ -2987,7 +2987,7 @@ index 0000000..f7ce180
 +    })
 diff --git a/drivers/linstorjournaler.py b/drivers/linstorjournaler.py
 new file mode 100755
-index 0000000..7495330
+index 00000000..74953305
 --- /dev/null
 +++ b/drivers/linstorjournaler.py
 @@ -0,0 +1,155 @@
@@ -3148,7 +3148,7 @@ index 0000000..7495330
 +        return '{}/{}'.format(type, identifier)
 diff --git a/drivers/linstorvhdutil.py b/drivers/linstorvhdutil.py
 new file mode 100644
-index 0000000..f31c752
+index 00000000..f31c7525
 --- /dev/null
 +++ b/drivers/linstorvhdutil.py
 @@ -0,0 +1,186 @@
@@ -3340,7 +3340,7 @@ index 0000000..f31c752
 +        )
 diff --git a/drivers/linstorvolumemanager.py b/drivers/linstorvolumemanager.py
 new file mode 100755
-index 0000000..d400421
+index 00000000..d4004217
 --- /dev/null
 +++ b/drivers/linstorvolumemanager.py
 @@ -0,0 +1,1713 @@
@@ -5058,7 +5058,7 @@ index 0000000..d400421
 +                    return True
 +        return False
 diff --git a/drivers/tapdisk-pause b/drivers/tapdisk-pause
-index 5936869..ed6abed 100755
+index 59368696..ed6abede 100755
 --- a/drivers/tapdisk-pause
 +++ b/drivers/tapdisk-pause
 @@ -29,6 +29,12 @@ import lvhdutil
@@ -5153,7 +5153,7 @@ index 5936869..ed6abed 100755
      def Pause(self):
          util.SMlog("Pause for %s" % self.vdi_uuid)
 diff --git a/drivers/util.py b/drivers/util.py
-index 4f9fa9d..8bd3635 100755
+index 4f9fa9d1..8bd36351 100755
 --- a/drivers/util.py
 +++ b/drivers/util.py
 @@ -653,10 +653,36 @@ def get_this_host():
@@ -5223,7 +5223,7 @@ index 4f9fa9d..8bd3635 100755
          if retries >= maxretry:
 diff --git a/linstor/Makefile b/linstor/Makefile
 new file mode 100644
-index 0000000..c329ca3
+index 00000000..c329ca30
 --- /dev/null
 +++ b/linstor/Makefile
 @@ -0,0 +1,22 @@
@@ -5251,7 +5251,7 @@ index 0000000..c329ca3
 +	rm -f linstor-monitord
 diff --git a/linstor/linstor-monitord.c b/linstor/linstor-monitord.c
 new file mode 100644
-index 0000000..8161813
+index 00000000..8161813d
 --- /dev/null
 +++ b/linstor/linstor-monitord.c
 @@ -0,0 +1,402 @@
@@ -5659,7 +5659,7 @@ index 0000000..8161813
 +}
 diff --git a/systemd/linstor-monitor.service b/systemd/linstor-monitor.service
 new file mode 100644
-index 0000000..5f8f0a7
+index 00000000..5f8f0a76
 --- /dev/null
 +++ b/systemd/linstor-monitor.service
 @@ -0,0 +1,13 @@
@@ -5678,7 +5678,4 @@ index 0000000..5f8f0a7
 +WantedBy=multi-user.target
 diff --git a/tests/mocks/linstor/__init__.py b/tests/mocks/linstor/__init__.py
 new file mode 100644
-index 0000000..e69de29
--- 
-2.46.0
-
+index 00000000..e69de29b