Decorate blktap2:_get_pool_config() with call_XAPI_until_httpOK

This method gets data, therefore it can be retried.

Signed-off-by: Arnaud Garcia-Fernandez <arnaud.garcia-fernandez@vates.tech>

Author: Ythogtha

drivers/blktap2.py

@@ -30,7 +30,6 @@
 from lock import Lock
 import util
 import xmlrpc.client
-import http.client
 import errno
 import signal
 import subprocess
@@ -1621,8 +1620,9 @@ def _remove_tag(self, vdi_uuid):
         else:
             util.SMlog("_remove_tag: host key %s not found, ignore" % host_key)
 
+    @util.call_XAPI_until_httpOK
     def _get_pool_config(self, pool_name):
-        pool_info = dict()
+        pool_info = {}
         vdi_ref = self.target.vdi.sr.srcmd.params.get('vdi_ref')
         if not vdi_ref:
             # attach_from_config context: HA disks don't need to be in any
@@ -1940,6 +1940,7 @@ def _deactivate_locked(self, sr_uuid, vdi_uuid, caching_params):
             self._detach(sr_uuid, vdi_uuid)
         if self.tap_wanted():
             self._remove_tag(vdi_uuid)
+
         return True
 
     def _resetPhylink(self, sr_uuid, vdi_uuid, path):

drivers/util.py

@@ -784,25 +784,24 @@ def get_localAPI_session():
     return session
 
 
-def call_XAPI_until_httpOK(function):
+def xapi_safe_call(function):
     """
-    Decorator to catch classic XAPI connexion problems and retry forever
-    The method called should be only for XAPI calls
+    Decorator to catch classic XAPI connection problems and retry forever.
+    The method should be only called for XAPI calls.
     eg: blktap2.py#VDI:_remove_tag()
     """
     def wrapper(*args, **kwargs):
-        errmsg = f"{function.__name__}(args={args}, kwargs={kwargs})"
+        call_str = f"{function.__name__}(args={args}, kwargs={kwargs})"
         while True:
             try:
                 return function(*args, **kwargs)
             except xmlrpc.client.ProtocolError as e:
                 # If there's a connection error, keep trying forever.
                 if e.errcode == http.HTTPStatus.INTERNAL_SERVER_ERROR.value:
                     continue
-                SMlog(f"failed XAPI call [{e}]: {errmsg}")
                 raise
             except Exception as e:
-                SMlog(f"failed XAPI call [{e}]: {errmsg}")
+                SMlog(f"Failed XAPI call `{call_str}`: `{e}`")
                 raise
     return wrapper