(INF-2871) Fix COmanage API request back-off in scripts.

comanage_utils.py

@@ -2,8 +2,9 @@
 
 import os
 import re
-import sys
 import json
+import time
+import exceptions
 import urllib.error
 import urllib.request
 from ldap3 import Server, Connection, ALL, ALL_ATTRIBUTES, SAFE_SYNC
@@ -26,10 +27,9 @@
 TEST_UNIX_CLUSTER_ID = 10
 TEST_LDAP_TARGET_ID = 9
 
-
-MIN_TIMEOUT = 5
-MAX_TIMEOUT = 625
-TIMEOUTMULTIPLE = 5
+# Value for the base of the exponential backoff
+TIMEOUT_BASE = 5
+MAX_RETRIES = 5
 
 
 GET    = "GET"
@@ -81,22 +81,30 @@ def call_api2(method, target, endpoint, authstr, **kw):
 
 def call_api3(method, target, data, endpoint, authstr, **kw):
     req = mkrequest(method, target, data, endpoint, authstr, **kw)
-    trying = True
-    currentTimeout = MIN_TIMEOUT
-    while trying:
+    retries = 0
+    current_timeout = TIMEOUT_BASE
+    total_timeout = 0
+    payload = None
+    while retries <= MAX_RETRIES:
         try:
-            resp = urllib.request.urlopen(req, timeout=currentTimeout)
+            resp = urllib.request.urlopen(req, timeout=current_timeout)
             payload = resp.read()
-            trying = False
-        except urllib.error.URLError as exception:
-            if currentTimeout < MAX_TIMEOUT:
-                currentTimeout *= TIMEOUTMULTIPLE
-            else:
-                sys.exit(
-                    f"Exception raised after maximum number of retries and/or timeout {MAX_TIMEOUT} seconds reached. "
-                    + f"Exception reason: {exception.reason}.\n Request: {req.full_url}"
+            break
+        # exception catching, mainly for request timeouts and "Service Temporarily Unavailable" (Rate limiting).
+        except urllib.error.HTTPError as exception:
+            if retries >= MAX_RETRIES:
+                raise exceptions.URLRequestError(
+                    "Exception raised after maximum number of retries reached after total backoff of " + 
+                    f"{total_timeout} seconds. Retries: {retries}. "
+                + f"Exception reason: {exception}.\n Request: {req.full_url}"
                 )
 
+            print("waiting for seconds: " + str(current_timeout))
+            time.sleep(current_timeout)
+            total_timeout += current_timeout
+            current_timeout *= TIMEOUT_BASE
+            retries += 1
+
     return json.loads(payload) if payload else None
 
 

exceptions.py

@@ -0,0 +1,11 @@
+""" Exceptions used in configuration script """
+
+
+class Error(Exception):
+    """Base exception class for all exceptions defined"""
+    pass
+
+
+class URLRequestError(Error):
+    """Class for exceptions due to not being able to fulfill a URLRequest"""
+    pass