mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-04 22:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-33078 - Fix queue size on pickling error (GH-6119) (GH-6178)

Browse source 
(cherry picked from commit e2f33add63)

Co-authored-by: Thomas Moreau <thomas.moreau.2010@gmail.com>
This commit is contained in:
Miss Islington (bot) 2018-03-21 09:21:15 -07:00 • committed by Antoine Pitrou
parent 22136c94b6
commit bb5b529197
3 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/multiprocessing/queues.py
View file

@ -161,7 +161,7 @@ class Queue(object):
target=Queue._feed,
args=(self._buffer, self._notempty, self._send_bytes,
self._wlock, self._writer.close, self._ignore_epipe,
self._on_queue_feeder_error),
self._on_queue_feeder_error, self._sem),
name='QueueFeederThread'
)
self._thread.daemon = True
@ -203,7 +203,7 @@ class Queue(object):
@staticmethod
def _feed(buffer, notempty, send_bytes, writelock, close, ignore_epipe,
onerror):
onerror, queue_sem):
debug('starting thread to feed data to pipe')
nacquire = notempty.acquire
nrelease = notempty.release
@ -255,6 +255,12 @@ class Queue(object):
info('error in queue thread: %s', e)
return
else:
# Since the object has not been sent in the queue, we need
# to decrease the size of the queue. The error acts as
# if the object had been silently removed from the queue
# and this step is necessary to have a properly working
# queue.
queue_sem.release()
onerror(e, obj)
@staticmethod