new:dev:SDK-386_improvement: Changing retry conditions for 503 response

qds_sdk/connection.py

@@ -188,15 +188,15 @@ def _handle_error(response):
         elif code == 422:
             sys.stderr.write(response.text + "\n")
             raise ResourceInvalid(response)
-        elif code in (502, 503, 504):
+        elif code in (502, 504):
             sys.stderr.write(response.text + "\n")
             raise RetryWithDelay(response)
         elif code == 449:
             sys.stderr.write(response.text + "\n")
-            raise RetryWithDelay(response, "Data requested is unavailable. Retrying...")
-        elif code == 429:
+            raise RetryWithDelay(response, Connection.get_error_message(code))
+        elif code in (429, 503):
             sys.stderr.write(response.text + "\n")
-            raise ApiThrottledRetry(response, "Too many requests. Retrying...")
+            raise ApiThrottledRetry(response, Connection.get_error_message(code))
         elif 401 <= code < 500:
             sys.stderr.write(response.text + "\n")
             raise ClientError(response)
@@ -214,3 +214,13 @@ def _validate_json(response):
         except Exception as e:
             sys.stderr.write("Error: {0}\nInvalid Response from Server, please contact Qubole Support".format(str(e)))
             raise ServerError(response)
+
+    def get_error_message(code):
+        if code == 429:
+            return "Too many requests. Retrying..."
+        elif code == 449:
+            return "Data requested is unavailable. Retrying..."
+        elif code == 503:
+            return "Service Unavailable. Retrying..."
+        else:
+            return ''

qds_sdk/exception.py

@@ -88,6 +88,7 @@ class MethodNotAllowed(ClientError):
 
 
 class ApiThrottledRetry(ClientError):
-    """An error raised when upstream requests are throttled."""
+    """An error raised when upstream requests are throttled or Service Unavailable."""
     # 429 Too Many Requests
+    # 503 Service Unavailable
     pass