PR fixes + remove HA comment

Signed-off-by: Ronan Abhamon <ronan.abhamon@vates.tech>

Author: Wescoeur

drivers/LinstorSR.py

@@ -34,6 +34,7 @@
 
     LINSTOR_AVAILABLE = False
 
+from concurrent.futures import ThreadPoolExecutor
 from lock import Lock
 import blktap2
 import cleanup
@@ -49,6 +50,7 @@
 import SRCommand
 import subprocess
 import sys
+import threading
 import time
 import traceback
 import util
@@ -1208,26 +1210,25 @@ def _load_vdis_ex(self):
             vdi_uuids.append(vdi_uuid)
 
         # 5. Create VDIs.
-        import threading
-
         all_executor_load = []
 
         self._executor_data = threading.local()
         def init_executor_thread():
             class Load(object):
+                def __init__(self):
+                    self._session = None
+
                 def cleanup(self):
                     if self._session:
-                        self._session.xenapi._session.logout()
-
-                _session = None
+                        self._session.xenapi.session.logout()
 
             load = Load()
 
             all_executor_load.append(load)
 
             session = XenAPI.xapi_local()
             session.xenapi.login_with_password('root', '', '', 'SM')
-            load.session = session
+            load._session = session
             self._executor_data.session = session
 
             linstor = LinstorVolumeManager(
@@ -1251,7 +1252,6 @@ def load_vdi(vdi_uuid):
 
             return vdi
 
-        from concurrent.futures import ThreadPoolExecutor
         try:
             with ThreadPoolExecutor() as executor:
                 self.vdis = {vdi.uuid: vdi for vdi in executor.map(load_vdi, vdi_uuids)}
@@ -1262,7 +1262,7 @@ def load_vdi(vdi_uuid):
                 except Exception as e:
                     util.SMlog(f"Failed to clean load executor: {e}")
             all_executor_load.clear()
-            self._executor_data = None
+            del self._executor_data
 
         # 6. Update CBT status of disks either just added
         # or already in XAPI.

drivers/cleanup.py

@@ -23,6 +23,7 @@
 import os
 import os.path
 import sys
+import threading
 import time
 import signal
 import subprocess
@@ -45,6 +46,8 @@
 import lock
 import blktap2
 import xs_errors
+
+from concurrent.futures import ThreadPoolExecutor
 from refcounter import RefCounter
 from ipc import IPCFlag
 from lvmanager import LVActivator
@@ -3516,26 +3519,25 @@ def handle_fail(vdi_uuid, e):
             except Exception as e:
                 all_vdi_info[vdi_uuid] = handle_fail(vdi_uuid, e)
 
-        import threading
-
         all_executor_load = []
 
         executor_data = threading.local()
         def init_executor_thread():
             class Load(object):
+                def __init__(self):
+                    self._session = None
+
                 def cleanup(self):
                     if self._session:
-                        self._session.xenapi._session.logout()
-
-                _session = None
+                        self._session.xenapi.session.logout()
 
             load = Load()
 
             all_executor_load.append(load)
 
             session = XenAPI.xapi_local()
             session.xenapi.login_with_password('root', '', '', 'SM')
-            load.session = session
+            load._session = session
             executor_data.session = session
 
             linstor = LinstorVolumeManager(
@@ -3556,7 +3558,6 @@ def load_info(vdi_uuid):
             except Exception as e:
                 all_vdi_info[vdi_uuid] = handle_fail(vdi_uuid, e)
 
-        from concurrent.futures import ThreadPoolExecutor
         try:
             with ThreadPoolExecutor() as executor:
                 for info in executor.map(load_info, pending_vdi_uuids):

drivers/linstorvolumemanager.py

@@ -84,12 +84,6 @@ def get_all_volume_openers(resource_name, volume):
     volume = str(volume)
     openers = {}
 
-    # Make sure this call never stucks because this function can be called
-    # during HA init and in this case we can wait forever.
-
-    # FIXME: Nov 29 21:54:19 r620-s1 SM: [11123] Got exception in LinstorVDI.load: ['XENAPI_PLUGIN_FAILURE', 'getVHDInfo', 'CommandException', 'Invalid argument'] (unable to get openers: signal only works in main thread)
-
-    # session = util.timeout_call(10, util.get_localAPI_session)
     session = util.get_localAPI_session()
 
     hosts = session.xenapi.host.get_all_records()