Merge "Add urllib3's SSLError to expected Watcher exc"

This commit is contained in:
Zuul 2020-12-03 10:08:40 +00:00 committed by Gerrit Code Review
commit 06ad286e15
1 changed files with 3 additions and 1 deletions

View File

@ -19,6 +19,7 @@ import os
import ssl import ssl
import time import time
from urllib import parse from urllib import parse
import urllib3
from oslo_log import log as logging from oslo_log import log as logging
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
@ -396,7 +397,8 @@ class K8sClient(object):
m = line_dict.get('object', {}).get('metadata', {}) m = line_dict.get('object', {}).get('metadata', {})
resource_version = m.get('resourceVersion', None) resource_version = m.get('resourceVersion', None)
except (requests.ReadTimeout, requests.ConnectionError, except (requests.ReadTimeout, requests.ConnectionError,
ssl.SSLError, requests.exceptions.ChunkedEncodingError): ssl.SSLError, requests.exceptions.ChunkedEncodingError,
urllib3.exceptions.SSLError):
t = utils.exponential_backoff(attempt) t = utils.exponential_backoff(attempt)
log = LOG.debug log = LOG.debug
if attempt > 0: if attempt > 0: