重试逻辑补充

Author: libertyzhu

qcloud_cos/cos_client.py

@@ -390,7 +390,7 @@ def send_request(self, method, url, bucket, timeout=30, cos_request=True, ci_req
                     break
                 else:
                     if j < self._retry and client_can_retry(file_position, **kwargs):
-                        if not domain_switched and self._conf._auto_switch_domain_on_retry and self._conf._ip is None:
+                        if not 'x-cos-request-id' in res.headers and not domain_switched and self._conf._auto_switch_domain_on_retry and self._conf._ip is None:
                             url = switch_hostname_for_url(url)
                             domain_switched = True
                         continue
@@ -400,7 +400,7 @@ def send_request(self, method, url, bucket, timeout=30, cos_request=True, ci_req
                 logger.exception('url:%s, retry_time:%d exception:%s' % (url, j, str(e)))
                 if j < self._retry and (isinstance(e, ConnectionError) or isinstance(e, Timeout)):  # 只重试网络错误
                     if client_can_retry(file_position, **kwargs):
-                        if not domain_switched and self._conf._auto_switch_domain_on_retry and self._conf._ip is None:
+                        if not 'x-cos-request-id' in res.headers and not domain_switched and self._conf._auto_switch_domain_on_retry and self._conf._ip is None:
                             url = switch_hostname_for_url(url)
                             domain_switched = True
                         continue