openstack
/
nova
Code Issues Proposed changes

Merge "Fix bad log message with glance client timeout"

This commit is contained in:
Jenkins 2014-07-04 08:42:39 +00:00 committed by Gerrit Code Review
parent a919f8ffa1 a12c7a5dae
commit 7a78f39726
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nova/image/glance.py
View File

@ -227,18 +227,21 @@ class GlanceClientWrapper(object):
except retry_excs as e:
host = self.host
port = self.port
extra = "retrying"
if attempt < num_attempts:
extra = "retrying"
else:
extra = 'done trying'
error_msg = (_("Error contacting glance server "
"'%(host)s:%(port)s' for '%(method)s', "
"%(extra)s.") %
{'host': host, 'port': port,
'method': method, 'extra': extra})
LOG.exception(error_msg)
if attempt == num_attempts:
extra = 'done trying'
LOG.exception(error_msg)
raise exception.GlanceConnectionFailed(
host=host, port=port, reason=str(e))
LOG.exception(error_msg)
time.sleep(1)