openstack/python-neutronclient
Code Issues Proposed changes

Merge "Handle keystoneauth exceptions in retry logic"

Browse Source
This commit is contained in:
Jenkins 2016-09-22 00:18:14 +00:00 committed by Gerrit Code Review
commit 791e6c984e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutronclient/v2_0/client.py
View File

@ -22,6 +22,7 @@ import re
import time import time
import debtcollector.renames import debtcollector.renames
from keystoneauth1 import exceptions as ksa_exc
import requests import requests
import six.moves.urllib.parse as urlparse import six.moves.urllib.parse as urlparse
from six import string_types from six import string_types
@ -335,7 +336,7 @@ class ClientBase(object):
try: try:
return self.do_request(method, action, body=body, return self.do_request(method, action, body=body,
headers=headers, params=params) headers=headers, params=params)
except exceptions.ConnectionFailed: except (exceptions.ConnectionFailed, ksa_exc.ConnectionError):
# Exception has already been logged by do_request() # Exception has already been logged by do_request()
if i < self.retries: if i < self.retries:
_logger.debug('Retrying connection to Neutron service') _logger.debug('Retrying connection to Neutron service')