Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gh-104090: Update Resource Tracker to return exit code based on resource leaked found or not #106807

Conversation

bityob
Copy link
Contributor

@bityob bityob commented Jul 16, 2023

  1. Add tests to catch the resource leak bug in collectedDurations and verified that it fails without the fix
Show output
$ ./python -m unittest test.test_concurrent_futures.FailingInitializerResourcesTest
.
/home/user/cpython/Lib/multiprocessing/resource_tracker.py:228: UserWarning: resource_tracker: There appear to be 3 leaked semaphore objects to clean up at shutdown
  warnings.warn('resource_tracker: There appear to be %d '
FTraceback (most recent call last):
  File "/home/user/cpython/Lib/multiprocessing/util.py", line 300, in _run_finalizers
    finalizer()
  File "/home/user/cpython/Lib/multiprocessing/util.py", line 224, in __call__
    res = self._callback(*self._args, **self._kwargs)
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/user/cpython/Lib/multiprocessing/synchronize.py", line 87, in _cleanup
    sem_unlink(name)
FileNotFoundError: [Errno 2] No such file or directory
.
.
.
======================================================================
FAIL: test_forkserver (test.test_concurrent_futures.FailingInitializerResourcesTest.test_forkserver)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/user/cpython/Lib/test/test_concurrent_futures.py", line 318, in test_forkserver
    self._test(ProcessPoolForkserverFailingInitializerTest)
  File "/home/user/cpython/Lib/test/test_concurrent_futures.py", line 312, in _test
    self.assertEqual(_resource_tracker._exitcode, 0)
AssertionError: 256 != 0

======================================================================
FAIL: test_spawn (test.test_concurrent_futures.FailingInitializerResourcesTest.test_spawn)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/user/cpython/Lib/test/test_concurrent_futures.py", line 315, in test_spawn
    self._test(ProcessPoolSpawnFailingInitializerTest)
  File "/home/user/cpython/Lib/test/test_concurrent_futures.py", line 312, in _test
    self.assertEqual(_resource_tracker._exitcode, 0)
AssertionError: 256 != 0

----------------------------------------------------------------------
Ran 2 tests in 0.727s

FAILED (failures=2)
0.33s
  1. Add returning exit code from resource_tracker.py based on the cleanup result, so we can check what was the result
  2. Add tests for Resource Tracker exit code based on leaked/no leaked resources

@bedevere-bot
Copy link

Most changes to Python require a NEWS entry.

Please add it using the blurb_it web app or the blurb command-line tool.

@iritkatriel iritkatriel requested a review from pitrou July 17, 2023 15:59

# Reset exit code value
_resource_tracker._exitcode = None
exit_code_assert = self.assertNotEqual
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a bit confusing. Also, it will match any non-zero exit code which might not be desired (other problems may return some code not in {0, 1}). How about simply expected_exit_code = 0 if delete_queue else 1?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey,
I fixed the test and fixed the code too.
Since I saved the exit status (which was 256 when the exit code was 1),
so now the code saves the exit code and verifies it to 0/1
Thanks

Comment on lines 300 to 305
runner = unittest.TextTestRunner()
result = runner.run(test_class('test_initializer'))

self.assertEqual(result.testsRun, 1)
self.assertEqual(result.failures, [])
self.assertEqual(result.errors, [])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uhm, why not do the simple thing and add these checks somewhere in FailingInitializerMixin?
It should also avoid running those tests twice (which I assume this does).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The result object exists when we run the test using Test Runner, which is not the case on FailingInitializerMixin.
This is used for safety, ensuring the inner test passed before we check the resource tracker

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but this is needlessly complex (and might interfere with other test options/customizations). Let's do the check at the end of said tests.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pitrou I don't understand how you want those checks to be since we can check it only after a test run with the returned result, which is not the case in regular tests. Anyway, I'm removing those checks since it's not mandatory and just for safety

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I honestly don't understand what the difficulty would be. You can make the resource tracker stop at the end of the test, or at the end of the testcase (in a teardown method for example).

Comment on lines 5564 to 5565
Test the exit code of the resource tracker based on if there were left leaked resources when we stop the process.
If not leaked resources were found, exit code should be 0, otherwise 1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the comment. Nit, but can you please ensure the line length remains reasonable (say < 80 characters) ? This can otherwise be annoying when reading/reviewing code.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I'll fix it. I'm used to 120 chars line length...

@sunmy2019
Copy link
Member

We should get #106795 merged first to pass the test.

Comment on lines 300 to 301
runner = unittest.TextTestRunner()
runner.run(test_class('test_initializer'))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, can you please instead put these checks directly in FailingInitializerMixin?
For example, add a tearDown method:

    def tearDown(self):
        super().tearDown()  # shutdown executor
        if self.mp_context and self.mp_context.get_start_method() in ("spawn", "forkserver"):
            # 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)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pitrou Checking

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't work

$ ./python -m unittest test.test_concurrent_futures.ProcessPoolForkserverFailingInitializerTest -v
test_initializer (test.test_concurrent_futures.ProcessPoolForkserverFailingInitializerTest.test_initializer) ... /home/user/cpython/Lib/multiprocessing/resource_tracker.py:236: UserWarning: resource_tracker: There appear to be 3 leaked semaphore objects to clean up at shutdown
  warnings.warn('resource_tracker: There appear to be %d '
FAIL
Traceback (most recent call last):
  File "/home/user/cpython/Lib/multiprocessing/util.py", line 300, in _run_finalizers
    finalizer()
  File "/home/user/cpython/Lib/multiprocessing/util.py", line 224, in __call__
    res = self._callback(*self._args, **self._kwargs)
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/user/cpython/Lib/multiprocessing/synchronize.py", line 87, in _cleanup
    sem_unlink(name)
FileNotFoundError: [Errno 2] No such file or directory
Traceback (most recent call last):
  File "/home/user/cpython/Lib/multiprocessing/util.py", line 300, in _run_finalizers
    finalizer()
  File "/home/user/cpython/Lib/multiprocessing/util.py", line 224, in __call__
    res = self._callback(*self._args, **self._kwargs)
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/user/cpython/Lib/multiprocessing/synchronize.py", line 87, in _cleanup
    sem_unlink(name)
FileNotFoundError: [Errno 2] No such file or directory
Traceback (most recent call last):
  File "/home/user/cpython/Lib/multiprocessing/util.py", line 300, in _run_finalizers
    finalizer()
  File "/home/user/cpython/Lib/multiprocessing/util.py", line 224, in __call__
    res = self._callback(*self._args, **self._kwargs)
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/user/cpython/Lib/multiprocessing/synchronize.py", line 87, in _cleanup
    sem_unlink(name)
FileNotFoundError: [Errno 2] No such file or directory

======================================================================
FAIL: test_initializer (test.test_concurrent_futures.ProcessPoolForkserverFailingInitializerTest.test_initializer)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/user/cpython/Lib/test/test_concurrent_futures.py", line 298, in tearDown
    self.assertEqual(_resource_tracker._exitcode, 0)
AssertionError: 1 != 0

----------------------------------------------------------------------
Ran 1 test in 0.269s

FAILED (failures=1)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, too bad :-(

@bityob bityob requested a review from pitrou July 23, 2023 14:47
@bityob
Copy link
Contributor Author

bityob commented Aug 3, 2023

@pitrou
Hey,
Can you review again?
Thanks

@pitrou
Copy link
Member

pitrou commented Aug 31, 2023

@bityob Sorry for the delay. There were some recent changes in git main that are causing conflicts. Could you merge from main and fix the conflicts? Thank you!

bityob added 3 commits August 31, 2023 20:32
…est_concurrent_futures.py) to new location (Lib/test/test_concurrent_futures/test_init.py)
…_futures-v2' of github.com:bityob/cpython into pythongh-104090-fix-leaked-semaphors-on-test_concurrent_futures-v2
@bityob
Copy link
Contributor Author

bityob commented Aug 31, 2023

@bityob Sorry for the delay. There were some recent changes in git main that are causing conflicts. Could you merge from main and fix the conflicts? Thank you!

Hey @pitrou, Thank you!

I merged the main branch and resolved all conflicts.

Please review again

@pitrou pitrou changed the title gh-104090: Updated Resource Tracker to return exit code based on resource leaked found or not gh-104090: Update Resource Tracker to return exit code based on resource leaked found or not Sep 19, 2023
Copy link
Member

@pitrou pitrou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @bityob for the update. LGTM now, let's wait for CI.

@pitrou
Copy link
Member

pitrou commented Sep 19, 2023

Unfortunately there are CI failures which look related. Can you take a look?

@bityob
Copy link
Contributor Author

bityob commented Sep 21, 2023

Unfortunately there are CI failures which look related. Can you take a look?

Yes, thanks. I'll check

@bityob bityob requested a review from gpshead as a code owner February 5, 2024 14:24
@encukou
Copy link
Member

encukou commented Feb 5, 2024

I'd love to be able to tell whether ResourceTracker was successful, but testing it on the “live” global _resource_tracker interferes with other tests (or regrtest).
I'm planning to send a PR based on this one, which will test a fresh ResourceTracker instance.

encukou added a commit to encukou/cpython that referenced this pull request Feb 13, 2024
…urceTracker instance

Add a new 'dummy' resource, which has no side-effects when
cleaned up.
The ResourceTracker test then registers this 'dummy', and either
unregisters it or not.
@encukou
Copy link
Member

encukou commented Feb 13, 2024

My continuation of this PR is here: #115410

encukou added a commit that referenced this pull request Feb 21, 2024
This builds on #106807, which adds
a return code to ResourceTracker, to make future debugging easier.
Testing this “in situ” proved difficult, since the global ResourceTracker is
involved in test infrastructure. So, the tests here create a new instance and
feed it fake data.

---------

Co-authored-by: Yonatan Bitton <[email protected]>
Co-authored-by: Yonatan Bitton <[email protected]>
Co-authored-by: Antoine Pitrou <[email protected]>
@encukou
Copy link
Member

encukou commented Feb 21, 2024

I've merged the continuation PR.
Thanks for doing the hard part!

@encukou encukou closed this Feb 21, 2024
auto-merge was automatically disabled February 21, 2024 12:56

Pull request was closed

woodruffw pushed a commit to woodruffw-forks/cpython that referenced this pull request Mar 4, 2024
…thonGH-115410)

This builds on python#106807, which adds
a return code to ResourceTracker, to make future debugging easier.
Testing this “in situ” proved difficult, since the global ResourceTracker is
involved in test infrastructure. So, the tests here create a new instance and
feed it fake data.

---------

Co-authored-by: Yonatan Bitton <[email protected]>
Co-authored-by: Yonatan Bitton <[email protected]>
Co-authored-by: Antoine Pitrou <[email protected]>
diegorusso pushed a commit to diegorusso/cpython that referenced this pull request Apr 17, 2024
…thonGH-115410)

This builds on python#106807, which adds
a return code to ResourceTracker, to make future debugging easier.
Testing this “in situ” proved difficult, since the global ResourceTracker is
involved in test infrastructure. So, the tests here create a new instance and
feed it fake data.

---------

Co-authored-by: Yonatan Bitton <[email protected]>
Co-authored-by: Yonatan Bitton <[email protected]>
Co-authored-by: Antoine Pitrou <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants