diff options
| author | Sirushti Murugesan <sirushti.murugesan@hp.com> | 2015-10-08 09:13:04 +0530 |
|---|---|---|
| committer | Sergey Kraynev <skraynev@mirantis.com> | 2015-10-19 03:38:03 -0400 |
| commit | 6d611b7f9758b04cfe67bd9533d59044a7844bc7 (patch) | |
| tree | 32437d16d0f5c5e67044c9f990090f446cd07612 /heat/engine/resource.py | |
| parent | 4348b7ababd1048e17ec354ca38c903c908cd74e (diff) | |
| download | heat-6d611b7f9758b04cfe67bd9533d59044a7844bc7.tar.gz | |
Merge of three backported commits for fixing liberty gate
First patch description:
Use LOG.error when no exception handler is used
There's no need to use LOG.exception here since sys.exc_info()
results in (None, None, None) and thus would effectively just
be LOG.error.
Also, the failure of invoking LOG.exception outside of an
exception handler is due to a bug in Python3[1]. The fix for
that is only available in Python3.5.
[1] http://bugs.python.org/issue17911
Closes-Bug: #1482261
(cherry picked from commit f5c415accfff2ad399194b30b9408a903042f009)
Second patch description:
Add testresources used by oslo.db fixture
If we use oslo.db fixtures, we'll need these 2 packages or
the next version of oslo.db release will break us.
Closes-Bug: #1503501
(cherry picked from commit a7368fb68e8c1cccbb601aa1aad444248c645c25)
Third patch description:
Switch to post-versioning
No longer mention next version on setup.cfg on stable branch.
Change-Id: Ib40c664a4f0e01cd27e1f24cfdbc9de278aece42
Diffstat (limited to 'heat/engine/resource.py')
| -rw-r--r-- | heat/engine/resource.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/heat/engine/resource.py b/heat/engine/resource.py index b7d824c39..589ded58b 100644 --- a/heat/engine/resource.py +++ b/heat/engine/resource.py @@ -1378,8 +1378,12 @@ class Resource(object): if not updated_ok: ex = exception.UpdateInProgress(self.name) - LOG.exception('atomic:%s engine_id:%s/%s' % ( - rs.atomic_key, rs.engine_id, engine_id)) + LOG.error(_LE( + 'Error acquiring lock for resource id:%(resource_id)s with' + 'atomic key:%(atomic_key)s,' + 'engine_id:%(rs_engine_id)s/%(engine_id)s') % { + 'resource_id': rs.id, 'atomic_key': rs.atomic_key, + 'rs_engine_id': rs.engine_id, 'engine_id': engine_id}) raise ex def _release(self, engine_id): |