diff options
| author | Chris Yeoh <cyeoh@au1.ibm.com> | 2014-06-24 16:50:32 +0930 |
|---|---|---|
| committer | Chris Yeoh <cyeoh@au1.ibm.com> | 2014-07-02 15:48:39 +0930 |
| commit | a12c7a5daebaadabaeb81a586884e1090c9c37de (patch) | |
| tree | 6657c3161ec1833fabf47e60a62fd349b65ac6a6 /nova/image | |
| parent | 685c6cb78b3440b03b5946f79af32dadcab829ad (diff) | |
| download | nova-a12c7a5daebaadabaeb81a586884e1090c9c37de.tar.gz | |
Fix bad log message with glance client timeout
Fixes bad log message where when a glance call finally timeouts instead
of a log message saying that it has given up it instead says it is
retrying
Co-Authored-By: qinchenchong@gmail.com
Change-Id: I325918f2d7fa971d4239343131b0f95dae293281
Closes-Bug: 1292993
Diffstat (limited to 'nova/image')
| -rw-r--r-- | nova/image/glance.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/nova/image/glance.py b/nova/image/glance.py index af5e08014a..de81d3d51d 100644 --- a/nova/image/glance.py +++ b/nova/image/glance.py @@ -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) |