Harmonizing messages, logs, names, errors...

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

Author: Ythogtha

drivers/XE_SR_ERRORCODES.xml

@@ -521,7 +521,7 @@
 
        <!-- Agent database query errors 150+ -->
         <code>
-                <name>ApiSession</name>
+                <name>APISession</name>
                 <description>Failed to initialize XMLRPC connection</description>
                 <value>150</value>
         </code>

drivers/blktap2.py

@@ -881,7 +881,7 @@ def abort_linstor_gc(drbd_path: str) -> bool:
 
         openers = get_all_volume_openers(volume_name, "0")
 
-        api_session = util.timeout(5, util.ApiSession, "SM-blktap2-abort_linstor_gc")
+        api_session = util.timeout(5, util.ApiSession, "SM-blktap2-abort-linstor-gc")
         try:
             srs = util.get_linstor_srs_uuid(api_session.session)
             pbd_ref = util.find_pbd_ref_from_dconf_value(

drivers/cleanup.py

@@ -303,7 +303,7 @@ def __init__(self, session, srUuid):
         self.session = session
         self._api_session = None
         if self.session is None:
-            self._api_session = util.ApiSession("SM-GC")
+            self._api_session = util.ApiSession("SMGC")
             self.session = self._api_session.session
         self._srRef = self.session.xenapi.SR.get_by_uuid(srUuid)
         self.srRecord = self.session.xenapi.SR.get_record(self._srRef)
@@ -2121,7 +2121,7 @@ def msg_cleared(self, xapi_session, msg_ref):
         return msg is None
 
     def check_no_space_candidates(self):
-        with util.ApiSession("SM-GC-check_no_space") as xapi_session:
+        with util.ApiSession("SMGC-check-no-space") as xapi_session:
             msg_id = self.xapi.srRecord["sm_config"].get(VDI.DB_GC_NO_SPACE)
             if self.no_space_candidates:
                 if msg_id is None or self.msg_cleared(xapi_session, msg_id):
@@ -3928,7 +3928,7 @@ def _abort_gc_from_openers(uuid: str, is_vdi_uuid: bool, openers: "LinstorVolume
                 if node_name == hostname:
                     continue
 
-                with util.timeout(5), util.ApiSession("SM-GC-coalescing") as session:
+                with util.timeout(5), util.ApiSession("SMGC-coalescing") as session:
                     sr_uuid = util.get_sr_uuid_from_vdi_uuid(session, uuid) if is_vdi_uuid else uuid
                     util.SMlog(f"LINSTOR volume is coalescing on `{sr_uuid}`. We're going to interrupt the GC...")
                     return util.strtobool(session.xenapi.host.call_plugin(

drivers/linstorcowutil.py

@@ -678,7 +678,7 @@ def get_local_cowutil(self, vdi_type):
         return instance
 
     def _init_executor_thread(self):
-        api_session = util.ApiSession("SM-linstorvhdutil")
+        api_session = util.ApiSession("SM-linstor-multi-cow-util")
         try:
             linstor = LinstorVolumeManager(
                 self._uri,

drivers/util.py

@@ -775,7 +775,7 @@ def getrootdevID():
 
 
 class ApiSession(contextlib.AbstractContextManager):
-    session=None
+    session = None
 
     def __init__(self, originator="SM"):
         self.originator = originator
@@ -790,7 +790,10 @@ def _login(self):
         try:
             session.xenapi.login_with_password('root', '', '', self.originator)
         except Exception as exc:
-            raise xs_errors.XenError(f"ApiSession [{self.originator}] Unable to open local XAPI session") from exc
+            raise xs_errors.XenError(
+                "APISession",
+                opterr=f"[{self.originator}] Unable to open local XAPI session"
+            ) from exc
         SMlog("ApiSession [{}] login".format(self.originator), priority=LOG_DEBUG)
         return session