modify retry logic

Author: wallisyan

aliyun-python-sdk-core/alibabacloud/client.py

@@ -34,7 +34,7 @@
     TimeoutConfigReader,  # 获取timeout
     EndpointHandler,  # 获取endpoint
     LogHandler,
-    # RetryHandler,
+    RetryHandler,
     ServerErrorHandler,
     HttpHandler
 ]
@@ -76,18 +76,18 @@ def __init__(self, access_key_id=None, access_key_secret=None, bearer_token=None
         self.https_port = https_port
         self.connection_timeout = connection_timeout
         self.read_timeout = read_timeout
+        self.enable_stream_logger = enable_stream_logger
+        self.profile_name = profile_name
+        self.config_file = config_file
         # self.enable_http_debug = enable_http_debug  # http-debug 只从环境变量获取
         self.http_debug = None
         # proxy provider两个： client  env
         self.http_proxy = http_proxy
         self.https_proxy = https_proxy
         self._proxy = {
-            'http': http_proxy,
-            'https': https_proxy,
+            'http': self.http_proxy,
+            'https': self.https_proxy,
         }
-        self.enable_stream_logger = enable_stream_logger
-        self.profile_name = profile_name
-        self.config_file = config_file
         # retry
         self._auto_retry = auto_retry
         import aliyunsdkcore.retry.retry_policy as retry_policy
@@ -191,17 +191,16 @@ def handle_request(self, api_request, request_handlers=None, context=None):
 
         if not request_handlers:
             request_handlers = self.handlers
-
         for i in range(len(request_handlers)):
             request_handlers[i]().handle_request(context)
 
         for i in reversed(range(len(request_handlers))):
             request_handlers[i]().handle_response(context)
-            # if context.retry_flag:
-            #     time.sleep(context.retry_backoff)
-            #     self.handle_request(api_request,
-            #                         request_handlers=request_handlers[i:],
-            #                         context=context)
+            if context.retry_flag:
+                time.sleep(context.retry_backoff / 1000.0)
+                self.handle_request(api_request,
+                                    request_handlers=request_handlers[i:],
+                                    context=context)
         if context.exception:
             return context.exception
 

aliyun-python-sdk-core/alibabacloud/handlers/http_handler.py

@@ -63,7 +63,6 @@ def do_request(context):
             current_protocol = 'http://' if http_request.protocol.lower() == 'http' else 'https://'
             # TODO : 最终拼接的是啥，还需要调查下
             url = current_protocol + context.endpoint + http_request.url
-
             if http_request.port != 80 or http_request.port != 443:
                 url = current_protocol + context.endpoint + ":" + \
                       str(http_request.port) + http_request.url
@@ -76,9 +75,19 @@ def do_request(context):
 
             # ignore the warning-InsecureRequestWarning
             urllib3.disable_warnings()
+            # TODO fixed the retry flag
+            context.retry_flag = False
+            try:
+                response = s.send(prepped, proxies=http_request.proxy,
+                                  timeout=http_request.timeout,
+                                  allow_redirects=False, verify=None, cert=None)
+            except IOError as e:
+                from aliyunsdkcore.acs_exception.exceptions import ClientException
+                from aliyunsdkcore.acs_exception import error_code
+                exception = ClientException(error_code.SDK_HTTP_ERROR, str(e))
 
-            response = s.send(prepped, proxies=http_request.proxy,
-                              timeout=http_request.timeout,
-                              allow_redirects=False, verify=None, cert=None)
-            context.http_response = response
-
+                context.exception = exception
+                from alibabacloud.request import HTTPResponse
+                context.http_response = HTTPResponse()
+            else:
+                context.http_response = response

aliyun-python-sdk-core/alibabacloud/handlers/retry_handler.py

@@ -31,38 +31,32 @@ class RetryHandler(RequestHandler):
     #     pass
 
     def handle_request(self, context):
-        print(1111111, context.http_request.retries)
         if context.http_request.retries == 0:
             retry_policy_context = RetryPolicyContext(context.api_request, None, 0, None)
             if context.config.retry_policy.should_retry(retry_policy_context) & \
                     RetryCondition.SHOULD_RETRY_WITH_CLIENT_TOKEN:
                 self._add_request_client_token(context.api_request)
 
     def handle_response(self, context):
-        print('context.exception', context.exception)
         api_request = context.api_request
         retry_policy_context = RetryPolicyContext(api_request, context.exception,
                                                   context.http_request.retries,
                                                   context.http_response.status_code)
 
         should_retry = context.config.retry_policy.should_retry(retry_policy_context)
 
-        if should_retry & RetryCondition.SHOULD_RETRY:
-            retry_policy_context.retryable = should_retry
-
-            time_to_sleep = context.config.retry_policy.compute_delay_before_next_retry(retry_policy_context)
-            time.sleep(time_to_sleep / 1000.0)
-            context.http_request.retries += 1
-
-            context.retry_flag = True
-            # context.retry_backoff = context.config.retry_policy.compute_delay_before_next_retry(
-            #     retry_policy_context
-            # )
-        else:
+        # if should_retry & RetryCondition.SHOULD_RETRY:
+        if should_retry & RetryCondition.NO_RETRY:
             context.retry_flag = False
-            # context.retry_backoff = 0
             if context.exception:
                 raise context.exception
+        else:
+            retry_policy_context.retryable = should_retry
+            context.http_request.retries += 1
+            context.retry_flag = True
+            context.retry_backoff = context.config.retry_policy.compute_delay_before_next_retry(
+                retry_policy_context
+            )
 
 
     @staticmethod

aliyun-python-sdk-core/alibabacloud/handlers/server_error_handler.py

@@ -25,35 +25,32 @@ def handle_response(self, context):
 
         response = context.http_response
         request_id = None
+        from alibabacloud.request import HTTPResponse
+        if not isinstance(response, HTTPResponse):
+            try:
+                body_obj = json.loads(response.text.decode('utf-8'))
+                request_id = body_obj.get('RequestId')
+            except (ValueError, TypeError, AttributeError):
+                # in case the response body is not a json string, return the raw
+                # data instead
+                # logger.warning('Failed to parse response as json format. Response:%s', response.text)
+                pass
+            if response.status_code < codes.OK or response.status_code >= codes.MULTIPLE_CHOICES:
 
-        try:
-            body_obj = json.loads(response.text.decode('utf-8'))
-            request_id = body_obj.get('RequestId')
-        except (ValueError, TypeError, AttributeError):
-            # in case the response body is not a json string, return the raw
-            # data instead
-            # logger.warning('Failed to parse response as json format. Response:%s', response.text)
-            pass
-        if response.status_code < codes.OK or response.status_code >= codes.MULTIPLE_CHOICES:
-
-            server_error_code, server_error_message = self._parse_error_info_from_response_body(
-                response.text)
-            if response.status_code == codes.BAD_REQUEST and server_error_code == 'SignatureDoesNotMatch':
-                if http_request.signature == server_error_message.split(':')[1]:
-                    server_error_code = 'InvalidAccessKeySecret'
-                    server_error_message = 'The AccessKeySecret is incorrect. ' \
-                                           'Please check your AccessKeyId and AccessKeySecret.'
-            from aliyunsdkcore.acs_exception.exceptions import ServerException
-            exception = ServerException(
-                server_error_code,
-                server_error_message,
-                http_status=response.status_code,
-                request_id=request_id)
-
-            # logger.error("ServerException occurred. Host:%s SDK-Version:%s ServerException:%s",
-            #              http_request.endpoint, aliyunsdkcore.__version__, str(exception))
-
-            context.exception = exception
+                server_error_code, server_error_message = self._parse_error_info_from_response_body(
+                    response.text)
+                if response.status_code == codes.BAD_REQUEST and server_error_code == 'SignatureDoesNotMatch':
+                    if http_request.signature == server_error_message.split(':')[1]:
+                        server_error_code = 'InvalidAccessKeySecret'
+                        server_error_message = 'The AccessKeySecret is incorrect. ' \
+                                               'Please check your AccessKeyId and AccessKeySecret.'
+                from aliyunsdkcore.acs_exception.exceptions import ServerException
+                exception = ServerException(
+                    server_error_code,
+                    server_error_message,
+                    http_status=response.status_code,
+                    request_id=request_id)
+                context.exception = exception
 
     @staticmethod
     def _parse_error_info_from_response_body(response_body):

aliyun-python-sdk-core/alibabacloud/request.py

@@ -41,3 +41,10 @@ def __init__(self, accept_format=None, method=None, protocol=None, proxy=None,
         self.enable_retry = enable_retry
         self.max_retry_times = max_retry_times
         self.retries = retries
+
+
+class HTTPResponse:
+    def __init__(self, status_code=None, headers=None, content=None):
+        self.status_code = status_code
+        self.headers = headers
+        self.content = content