openstack/deb-python-cassandra-driver
Code Issues Proposed changes

exec concurrent gen: reacquire lock no matter what

Browse Source 
resolves a (non-impactful) RuntimeError emitted if a generator is
collected without having been consumed
This commit is contained in:
Adam Holmberg
2015-08-07 16:37:39 -05:00
parent 88c380a7b3
commit 9d0a17c7fa
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cassandra/concurrent.py
View File

@@ -166,10 +166,12 @@ class ConcurrentExecutorGenResults(_ConcurrentExecutor):
self._condition.wait() self._condition.wait()
while self._results_queue and self._results_queue[0][0] == self._current: while self._results_queue and self._results_queue[0][0] == self._current:
_, res = heappop(self._results_queue) _, res = heappop(self._results_queue)
try:
self._condition.release() self._condition.release()
if self._fail_fast and not res[0]: if self._fail_fast and not res[0]:
self._raise(res[1]) self._raise(res[1])
yield res yield res
finally:
self._condition.acquire() self._condition.acquire()
self._current += 1 self._current += 1