python · bityob · Jul 16, 2023 · Jul 16, 2023 · Jul 17, 2023 · Jul 17, 2023
@@ -57,6 +57,7 @@ def __init__(self):
         self._lock = threading.Lock()
         self._fd = None
         self._pid = None
+        self._exitcode = None
 
     def _stop(self):
         with self._lock:
@@ -68,7 +69,7 @@ def _stop(self):
             os.close(self._fd)
             self._fd = None
 
-            os.waitpid(self._pid, 0)
+            _, self._exitcode = os.waitpid(self._pid, 0)
             self._pid = None
 
     def getfd(self):
@@ -191,6 +192,8 @@ def main(fd):
             pass
 
     cache = {rtype: set() for rtype in _CLEANUP_FUNCS.keys()}
+    exit_code = 0
+
     try:
         # keep track of registered/unregistered resources
         with open(fd, 'rb') as f:
@@ -221,6 +224,7 @@ def main(fd):
         for rtype, rtype_cache in cache.items():
             if rtype_cache:
                 try:
+                    exit_code = 1
                     warnings.warn('resource_tracker: There appear to be %d '
                                   'leaked %s objects to clean up at shutdown' %
                                   (len(rtype_cache), rtype))
@@ -237,3 +241,5 @@ def main(fd):
                         warnings.warn('resource_tracker: %r: %s' % (name, e))
                 finally:
                     pass
+
+        sys.exit(exit_code)
@@ -5536,6 +5536,37 @@ def test_too_long_name_resource(self):
         with self.assertRaises(ValueError):
             resource_tracker.register(too_long_name_resource, rtype)
 
+    def _test_resource_tracker_leak_resources(self, context, delete_queue):
+        from multiprocessing.resource_tracker import _resource_tracker
+        _resource_tracker.ensure_running()
+        self.assertTrue(_resource_tracker._check_alive())
+
+        # Reset exit code value
+        _resource_tracker._exitcode = None
+        exit_code_assert = self.assertNotEqual
+
+        mp_context = multiprocessing.get_context(context)
+
+        # Keep it on variable, so it won't be cleared yet
+        q = mp_context.Queue()
+        if delete_queue:
+            del q
+            exit_code_assert = self.assertEqual
+
+        self.assertIsNone(_resource_tracker._exitcode)
+        _resource_tracker._stop()
+
+        exit_code_assert(_resource_tracker._exitcode, 0)
+
+    def test_resource_tracker_exit_code(self):
+        for context in ["spawn", "forkserver"]:
+            for delete_queue in [True, False]:
+                with self.subTest(context=context, delete_queue=delete_queue):
+                    self._test_resource_tracker_leak_resources(
+                        context=context,
+                        delete_queue=delete_queue,
+                    )
+
 
 class TestSimpleQueue(unittest.TestCase):
 

diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py
@@ -290,6 +290,35 @@ def _assert_logged(self, msg):
 create_executor_tests(FailingInitializerMixin)
 
 
+@unittest.skipIf(sys.platform == "win32", "Resource Tracker doesn't run on Windows")
+class FailingInitializerResourcesTest(unittest.TestCase):
+    """
+    Source: https://github.com/python/cpython/issues/104090
+    """
+
+    def _test(self, test_class):
+        runner = unittest.TextTestRunner()
+        result = runner.run(test_class('test_initializer'))
+
+        self.assertEqual(result.testsRun, 1)
+        self.assertEqual(result.failures, [])
+        self.assertEqual(result.errors, [])
+
+        # GH-104090:
+        # Stop resource tracker manually now, so we can verify there are not leaked resources by checking
+        # the process exit code
+        from multiprocessing.resource_tracker import _resource_tracker
+        _resource_tracker._stop()
+
+        self.assertEqual(_resource_tracker._exitcode, 0)
+
+    def test_spawn(self):
+        self._test(ProcessPoolSpawnFailingInitializerTest)
+
+    def test_forkserver(self):
+        self._test(ProcessPoolForkserverFailingInitializerTest)
+
+
 class ExecutorShutdownTest:
     def test_run_after_shutdown(self):
         self.executor.shutdown()

diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-07-16-15-02-47.gh-issue-104090.oMjNa9.rst b/Misc/NEWS.d/next/Core and Builtins/2023-07-16-15-02-47.gh-issue-104090.oMjNa9.rst
@@ -0,0 +1,2 @@
+Updated Resource Tracker to return exit code based on resource leaked found
+or not
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Updated Resource Tracker to return exit code based on resource leaked found
		or not
sunmy2019 marked this conversation as resolved. Show resolved Hide resolved