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

* 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)

(cherry picked from commit e42339d3a0)
This commit is contained in:
Victor Stinner 2017-07-26 17:52:36 +02:00 committed by GitHub
parent e5eae474c4
commit ec9a7127b8
2 changed files with 4 additions and 1 deletions

View File

@ -128,7 +128,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

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.