openstack
/
deb-heat
Code Issues Proposed changes

Don't log locked resource ERROR level 

It's expected that during a convergence traversal, we may encounter a
resource that is still locked by a previous traversal. Don't log an
ERROR-level message about what is a normal condition. Instead, log at
INFO level describing what is happening, with more details at DEBUG
level.

Change-Id: I645c2a173b828d4a983ba874037d059ee645955f
Related-Bug: #1607814
This commit is contained in:
Zane Bitter 2016-09-15 10:16:54 -04:00
parent d899c240e4
commit 7f5bd76f7a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
heat/engine/resource.py
View File

@ -1813,14 +1813,15 @@ class Resource(object):
raise
if not updated_ok:
ex = exception.UpdateInProgress(self.name)
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
LOG.info(_LI('Resource %s is locked for update; deferring'),
six.text_type(self))
LOG.debug(('Resource id:%(resource_id)s with '
'atomic_key:%(atomic_key)s, locked '
'by 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 exception.UpdateInProgress(self.name)
def _release(self, engine_id):
rs = None