refactor(linstorjournaler,linstorvolumemanager): rebuild cache on connection error

Signed-off-by: Mathieu Labourier <[email protected]>

Author: Millefeuille42

drivers/linstorjournaler.py

@@ -17,7 +17,8 @@
 
 
 from linstorvolumemanager import \
-  get_controller_uri, LinstorVolumeManager, LinstorVolumeManagerError
+    get_controller_uri, LinstorVolumeManager, LinstorVolumeManagerError, build_controller_uri_cache, \
+    delete_controller_uri_cache
 import linstor
 import re
 import util
@@ -160,8 +161,10 @@ def connect(uri):
 
         try:
             return connect(uri)
-        except (linstor.errors.LinstorNetworkError, LinstorVolumeManagerError):
+        except LinstorVolumeManagerError:
             pass
+        except linstor.errors.LinstorNetworkError:
+            delete_controller_uri_cache()
 
         return util.retry(
             lambda: connect(None),

drivers/linstorvolumemanager.py

@@ -213,6 +213,15 @@ def get_cached_controller_uri():
         ))
     return None
 
+def delete_controller_uri_cache():
+    try:
+        os.remove(CONTROLLER_CACHE_PATH)
+    except Exception as e:
+        util.SMlog('Unable to write controller uri cache file at {}/{} : {}'.format(
+            CONTROLLER_CACHE_DIRECTORY,
+            CONTROLLER_CACHE_FILE,
+            e
+        ))
 
 def write_controller_uri_cache(uri):
     try:
@@ -2664,7 +2673,7 @@ def _get_error_str(cls, result):
 
     @classmethod
     def _create_linstor_instance(
-        cls, uri, keep_uri_unmodified=False, attempt_count=30
+        cls, uri, keep_uri_unmodified=False, keep_cache_on_error=False, attempt_count=30
     ):
         retry = False
 
@@ -2681,8 +2690,11 @@ def connect(uri):
 
         try:
             return connect(uri)
-        except (linstor.errors.LinstorNetworkError, LinstorVolumeManagerError):
+        except LinstorVolumeManagerError:
             pass
+        except linstor.errors.LinstorNetworkError:
+            if not keep_cache_on_error:
+                build_controller_uri_cache()
 
         if not keep_uri_unmodified:
             uri = None