Merge branch 'master' into CP-52793

Author: MarkSymsCtx

.github/workflows/main.yml

@@ -4,14 +4,12 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python 3
         uses: actions/setup-python@v4
-        with:
-          python-version: '3.6'
 
       - name: Install dependencies
         run: |

Makefile

@@ -59,7 +59,8 @@ SM_LIBS += constants
 SM_LIBS += cbtutil
 SM_LIBS += sr_health_check
 
-UDEV_RULES = 65-multipath 55-xs-mpath-scsidev 57-usb 58-xapi
+
+UDEV_RULES = 65-multipath 55-xs-mpath-scsidev 57-usb 58-xapi 99-purestorage
 MPATH_CONF = multipath.conf
 MPATH_CUSTOM_CONF = custom.conf
 SMLOG_CONF = SMlog
@@ -200,7 +201,6 @@ install: precheck
 	$(MAKE) -C dcopy install DESTDIR=$(SM_STAGING)
 	ln -sf $(SM_DEST)blktap2.py $(SM_STAGING)$(BIN_DEST)/blktap2
 	ln -sf $(SM_DEST)lcache.py $(SM_STAGING)$(BIN_DEST)tapdisk-cache-stats
-	ln -sf /dev/null $(SM_STAGING)$(UDEV_RULES_DIR)/69-dm-lvm-metad.rules
 	install -m 755 scripts/xs-mpath-scsidev.sh $(SM_STAGING)$(UDEV_SCRIPTS_DIR)
 	install -m 755 scripts/make-dummy-sr $(SM_STAGING)$(LIBEXEC)
 	install -m 755 scripts/storage-init $(SM_STAGING)$(LIBEXEC)

dev_requirements.txt

@@ -1,4 +1,4 @@
 coverage
-astroid==2.3.3
-pylint==2.4.4
+astroid
+pylint
 bitarray

drivers/BaseISCSI.py

@@ -441,8 +441,10 @@ def detach(self, sr_uuid, delete=False):
         except:
             pass
         if 'SCSIid' in self.dconf:
-            self.mpathmodule.reset(self.dconf['SCSIid'], explicit_unmap=True)
-            keys.append("mpath-" + self.dconf['SCSIid'])
+            scsi_id = self.dconf['SCSIid']
+            util.SMlog(f"Resetting mpath on {scsi_id}")
+            self.mpathmodule.reset(scsi_id, explicit_unmap=True)
+            keys.append("mpath-" + scsi_id)
 
         # Remove iscsi_sessions and multipathed keys
         if pbdref is not None:

drivers/LUNperVDI.py

@@ -82,6 +82,7 @@ def create(self, sr_uuid, vdi_uuid, size):
         VDIs = util._getVDIs(self.sr)
         self.sr._loadvdis()
         smallest = 0
+        v = None
         for vdi in VDIs:
             if not vdi['managed'] \
                    and int(vdi['virtual_size']) >= int(size) \

drivers/LVHDSR.py

@@ -205,6 +205,7 @@ def load(self, sr_uuid):
             re.compile("^.*[0-9a-f]{8}-(([0-9a-f]{4})-){3}[0-9a-f]{12}.*")
         self.storageVDIs = {}
 
+        vdi = None
         for key in self.lvmCache.lvs.keys():
             # if the lvname has a uuid in it
             type = None
@@ -969,6 +970,7 @@ def _undoCloneOp(self, lvs, origUuid, baseUuid, clonUuid):
         origRefcountNormal = 0
 
         # un-hide the parent
+        vhdInfo = None
         if base.vdiType == vhdutil.VDI_TYPE_VHD:
             self.lvActivator.activate(baseUuid, base.name, False)
             origRefcountNormal = 1

drivers/LVHDoISCSISR.py

@@ -488,6 +488,7 @@ def attach(self, sr_uuid):
     def detach(self, sr_uuid):
         LVHDSR.LVHDSR.detach(self, sr_uuid)
         for i in self.iscsiSRs:
+            util.SMlog(f'Detaching {i}')
             i.detach(sr_uuid)
 
     def scan(self, sr_uuid):

drivers/SR.py

@@ -153,7 +153,8 @@ def __init__(self, srcmd, sr_uuid):
 
     @staticmethod
     def from_uuid(session, sr_uuid):
-        import imp
+        import importlib.machinery
+        import types
 
         _SR = session.xenapi.SR
         sr_ref = _SR.get_by_uuid(sr_uuid)
@@ -169,7 +170,9 @@ def from_uuid(session, sr_uuid):
         driver_real = os.path.realpath(driver_path)
         module_name = os.path.basename(driver_path)
 
-        module = imp.load_source(module_name, driver_real)
+        loader = importlib.machinery.SourceFileLoader(module_name, driver_real)
+        module = types.ModuleType(loader.name)
+        loader.exec_module(module)
         target = driver(sm_type)
         # NB. get the host pbd's device_config
 
@@ -186,6 +189,7 @@ def from_uuid(session, sr_uuid):
         # FIXME
 
         from SRCommand import SRCommand
+        # pylint:  disable=E1101
         cmd = SRCommand(module.DRIVER_INFO)
         cmd.dconf = device_config
         cmd.params = {'session_ref': session._session,

drivers/cleanup.py

@@ -250,13 +250,6 @@ def countBits(bitmap1, bitmap2):
         return count
     countBits = staticmethod(countBits)
 
-    def getThisScript():
-        thisScript = util.get_real_path(__file__)
-        if thisScript.endswith(".pyc"):
-            thisScript = thisScript[:-1]
-        return thisScript
-    getThisScript = staticmethod(getThisScript)
-
 
 ################################################################################
 #
@@ -3489,6 +3482,7 @@ def main():
     background = False
     force = False
     dryRun = False
+    maxAge = 0
     debug_cmd = ""
     vdi_uuid = ""
     shortArgs = "gGc:aqxu:bfdt:v:"

drivers/iscsilib.py

@@ -248,7 +248,7 @@ def get_node_config (portal, targetIQN):
     ini_sec = "root"
     str_fp = io.StringIO("[%s]\n%s" % (ini_sec, stdout))
     parser = RawConfigParser()
-    parser.readfp(str_fp)
+    parser.read_file(str_fp)
     str_fp.close()
     return dict(parser.items(ini_sec))