diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-07-04 11:34:31 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-04 11:34:31 (GMT) |
| commit | 957656ee1d6fb42664274ef2f440a10d26870e2a (patch) | |
| tree | 2beb2743fafd1e0ba549153e52b6ff0a6d1f8f2c | |
| parent | 070d3d928d20ccb4790dd077f3794af3c2932e5c (diff) | |
| download | cpython-957656ee1d6fb42664274ef2f440a10d26870e2a.zip cpython-957656ee1d6fb42664274ef2f440a10d26870e2a.tar.gz cpython-957656ee1d6fb42664274ef2f440a10d26870e2a.tar.bz2 | |
bpo-37421: Fix multiprocessing get_temp_dir() finalizer (GH-14572)
Fix multiprocessing.util.get_temp_dir() finalizer: clear also the
'tempdir' configuration of the current process, so next call to
get_temp_dir() will create a new temporary directory, rather than
reusing the removed temporary directory.
(cherry picked from commit 9d40554e0da09a44a8547f3f3a2b9dedfeaf7928)
Co-authored-by: Victor Stinner <vstinner@redhat.com>
| -rw-r--r-- | Lib/multiprocessing/util.py | 14 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2019-07-03-12-47-52.bpo-37421.gR5hC8.rst | 4 |
2 files changed, 17 insertions, 1 deletions
diff --git a/Lib/multiprocessing/util.py b/Lib/multiprocessing/util.py index 5674ad7..1938091 100644 --- a/Lib/multiprocessing/util.py +++ b/Lib/multiprocessing/util.py @@ -106,6 +106,15 @@ def log_to_stderr(level=None): # Function returning a temp directory which will be removed on exit # +def _remove_temp_dir(rmtree, tempdir): + rmtree(tempdir) + + current_process = process.current_process() + # current_process() can be None if the finalizer is called + # late during Python finalization + if current_process is not None: + current_process._config['tempdir'] = None + def get_temp_dir(): # get name of a temp directory which will be automatically cleaned up tempdir = process.current_process()._config.get('tempdir') @@ -113,7 +122,10 @@ def get_temp_dir(): import shutil, tempfile tempdir = tempfile.mkdtemp(prefix='pymp-') info('created temp directory %s', tempdir) - Finalize(None, shutil.rmtree, args=[tempdir], exitpriority=-100) + # keep a strong reference to shutil.rmtree(), since the finalizer + # can be called late during Python shutdown + Finalize(None, _remove_temp_dir, args=(shutil.rmtree, tempdir), + exitpriority=-100) process.current_process()._config['tempdir'] = tempdir return tempdir diff --git a/Misc/NEWS.d/next/Library/2019-07-03-12-47-52.bpo-37421.gR5hC8.rst b/Misc/NEWS.d/next/Library/2019-07-03-12-47-52.bpo-37421.gR5hC8.rst new file mode 100644 index 0000000..450d76f --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-07-03-12-47-52.bpo-37421.gR5hC8.rst @@ -0,0 +1,4 @@ +Fix :func:`multiprocessing.util.get_temp_dir` finalizer: clear also the +'tempdir' configuration of the current process, so next call to +``get_temp_dir()`` will create a new temporary directory, rather than +reusing the removed temporary directory. |