mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-30 04:15:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

[3.6] bpo-30595: Fix multiprocessing.Queue.get(timeout) (#2027) (#2881)

Browse source 
* bpo-30595: Fix multiprocessing.Queue.get(timeout) (#2027)

multiprocessing.Queue.get() with a timeout now polls its reader in
non-blocking mode if it succeeded to aquire the lock but the acquire
took longer than the timeout.

Co-Authored-By: Grzegorz Grzywacz <grzgrzgrz3@gmail.com>
(cherry picked from commit 1b7863c3b6)

* bpo-30595: Increase test_queue_feeder_donot_stop_onexc() timeout (#2148)

_test_multiprocessing.test_queue_feeder_donot_stop_onexc() now uses a
timeout of 1 second on Queue.get(), instead of 0.1 second, for slow
buildbots.
(cherry picked from commit 8f6eeaf21c)
This commit is contained in:
Victor Stinner 2017-07-26 05:38:22 +02:00 • committed by GitHub
parent a6f045224a
commit e42339d3a0
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/multiprocessing/queues.py
View file

@ -101,7 +101,7 @@ class Queue(object):
try:
if block:
timeout = deadline - time.time()
if timeout < 0 or not self._poll(timeout):
if not self._poll(timeout):
raise Empty
elif not self._poll():
raise Empty

3
Misc/NEWS.d/next/Library/2017-07-26-04-46-12.bpo-30595.-zJ7d8.rst Normal file
View file

@ -0,0 +1,3 @@
multiprocessing.Queue.get() with a timeout now polls its reader in non-
blocking mode if it succeeded to aquire the lock but the acquire took longer
than the timeout.