Skip to content

Commit 4a95ae9

Browse files
author
HAMON GPT-6 worker
committed
gh-159986: Handle finalizers for all in-process manager servers
1 parent 530ea8a commit 4a95ae9

2 files changed

Lines changed: 23 additions & 5 deletions

File tree

‎Lib/multiprocessing/managers.py‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import array
2121
import collections.abc
2222
import queue
23+
import weakref
2324
import time
2425
import types
2526
import os
@@ -144,6 +145,8 @@ class Server(object):
144145
'''
145146
Server class which runs in a process controlled by a manager object
146147
'''
148+
_local_servers = weakref.WeakValueDictionary()
149+
147150
public = ['shutdown', 'create', 'accept_connection', 'get_methods',
148151
'debug_info', 'number_of_objects', 'dummy', 'incref', 'decref']
149152

@@ -175,6 +178,7 @@ def serve_forever(self):
175178
'''
176179
self.stop_event = threading.Event()
177180
process.current_process()._manager_server = self
181+
self._local_servers[self.address] = self
178182
try:
179183
accepter = threading.Thread(target=self.accepter)
180184
accepter.daemon = True
@@ -192,6 +196,8 @@ def serve_forever(self):
192196
except (KeyboardInterrupt, SystemExit):
193197
pass
194198
finally:
199+
if self._local_servers.get(self.address) is self:
200+
self._local_servers.pop(self.address, None)
195201
if sys.stdout != sys.__stdout__: # what about stderr?
196202
util.debug('resetting stdout, stderr')
197203
sys.stdout = sys.__stdout__
@@ -895,10 +901,8 @@ def _decref(token, serial, authkey, state, tls, idset, _Client):
895901
# tell manager this process no longer cares about referent
896902
try:
897903
util.debug('DECREF %r', token.id)
898-
server = getattr(process.current_process(),
899-
'_manager_server', None)
900-
if (server is not None and server.address == token.address
901-
and server._server_pid == os.getpid()):
904+
server = Server._local_servers.get(token.address)
905+
if (server is not None and server._server_pid == os.getpid()):
902906
# A finalizer may run on this server's accepter thread.
903907
# Do not wait for that same thread to serve an RPC.
904908
server._local_decrefs.put(token.id)

‎Lib/test/_test_multiprocessing.py‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3757,8 +3757,10 @@ def test_proxy_finalizer_does_not_block_local_server(self):
37573757
code = r'''
37583758
import gc
37593759
import os
3760+
import sys
37603761
import threading
37613762
import time
3763+
from multiprocessing import process
37623764
from multiprocessing.managers import BaseManager
37633765
37643766
class Manager(BaseManager):
@@ -3771,6 +3773,17 @@ def get(self):
37713773
Manager.register('Value', Value)
37723774
server = Manager(address=('127.0.0.1', 0), authkey=b'secret').get_server()
37733775
threading.Thread(target=server.serve_forever, daemon=True).start()
3776+
if sys.argv[1] == 'multiple':
3777+
deadline = time.monotonic() + 3
3778+
while getattr(process.current_process(), '_manager_server', None) is not server:
3779+
assert time.monotonic() < deadline
3780+
time.sleep(.001)
3781+
second_server = Manager(address=('127.0.0.1', 0), authkey=b'secret').get_server()
3782+
threading.Thread(target=second_server.serve_forever, daemon=True).start()
3783+
deadline = time.monotonic() + 3
3784+
while getattr(process.current_process(), '_manager_server', None) is not second_server:
3785+
assert time.monotonic() < deadline
3786+
time.sleep(.001)
37743787
manager = Manager(address=server.address, authkey=b'secret')
37753788
manager.connect()
37763789
@@ -3812,7 +3825,8 @@ def request():
38123825
time.sleep(0.01)
38133826
assert not server.id_to_refcount, server.id_to_refcount
38143827
'''
3815-
test.support.script_helper.assert_python_ok('-c', code)
3828+
for variant in ('single', 'multiple'):
3829+
test.support.script_helper.assert_python_ok('-c', code, variant)
38163830

38173831
@warnings_helper.ignore_fork_in_thread_deprecation_warnings()
38183832
@support.skip_if_sanitizer('TSan: leaks threads', thread=True)

0 commit comments

Comments
 (0)