openstack/deb-python-taskflow
Code Issues Proposed changes

Avoid calling callbacks while holding locks

Browse Source 
Instead of calling the callback while holding
a write lock (a recipe for deadlock) call the
callbacks after we pop all the values to avoid
any potential for deadlock.

Change-Id: Idb4275d8f07d60e2ed83c0987b6c7354a09c8a71
This commit is contained in:
Joshua Harlow
2014-03-12 18:24:46 -07:00
parent a6930eb537
commit d440972d10
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
taskflow/engines/worker_based/cache.py
View File

@@ -51,7 +51,8 @@ class Cache(object):
with self._lock.write_lock(): with self._lock.write_lock():
expired_values = [(k, v) for k, v in six.iteritems(self._data) expired_values = [(k, v) for k, v in six.iteritems(self._data)
if v.expired] if v.expired]
for k, v in expired_values: for (k, _v) in expired_values:
if on_expired_callback:
on_expired_callback(v)
self._data.pop(k, None) self._data.pop(k, None)
if on_expired_callback:
for (_k, v) in expired_values:
on_expired_callback(v)