From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Tue, 19 Apr 2022 15:29:57 +0000 (-0700) Subject: gh-91231: multiprocessing BaseManager waits 1.0 second (GH-91701) X-Git-Tag: v3.9.13~102 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b6072e7f5ee5d4263a4c84a74b5ca36ef220ed6;p=thirdparty%2FPython%2Fcpython.git gh-91231: multiprocessing BaseManager waits 1.0 second (GH-91701) Shutting down a multiprocessing BaseManager now waits for 1 second until the process completes, rather than 0.1 second, after the process is terminated. (cherry picked from commit a885f10325eb2fc27cd50ace5614666ea688ab66) Co-authored-by: Victor Stinner --- diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py index dfa566c6fc38..1f9295619f67 100644 --- a/Lib/multiprocessing/managers.py +++ b/Lib/multiprocessing/managers.py @@ -669,7 +669,7 @@ class BaseManager(object): if hasattr(process, 'terminate'): util.info('trying to `terminate()` manager process') process.terminate() - process.join(timeout=0.1) + process.join(timeout=1.0) if process.is_alive(): util.info('manager still alive after terminate')