diff options
| author | Zuul <zuul@review.opendev.org> | 2019-07-01 20:27:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-07-01 20:27:48 +0000 |
| commit | be3c01a9e4dde5ee32ae0a2e68cc31723464f46c (patch) | |
| tree | 8d2dfab307a7a350a6b459021cb9ab74e8270131 | |
| parent | d3bdeb26155c2d3b53850b790d3800a2dd78cada (diff) | |
| parent | 0cad3089d3e84e8e3436e171d00c8cce8717fd6d (diff) | |
| download | nova-be3c01a9e4dde5ee32ae0a2e68cc31723464f46c.tar.gz | |
Merge "Stop logging traceback when skipping quiesce" into stable/queens
| -rw-r--r-- | nova/compute/api.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index cc11af5b09..6bd6a78cd0 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -2985,10 +2985,15 @@ class API(base.Base): if strutils.bool_from_string(instance.system_metadata.get( 'image_os_require_quiesce')): raise - else: + + if isinstance(err, exception.NovaException): LOG.info('Skipping quiescing instance: %(reason)s.', - {'reason': err}, + {'reason': err.format_message()}, instance=instance) + else: + LOG.info('Skipping quiescing instance because the ' + 'operation is not supported by the underlying ' + 'compute driver.', instance=instance) # NOTE(tasker): discovered that an uncaught exception could occur # after the instance has been frozen. catch and thaw. except Exception as ex: |