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

Upgrade psutil to 5.9.0 #11139

Merged
merged 1 commit into from
Jan 28, 2022
Merged

Upgrade psutil to 5.9.0 #11139

merged 1 commit into from
Jan 28, 2022

Conversation

mx-psi
Copy link
Member

@mx-psi mx-psi commented Jan 14, 2022

What does this PR do?

Upgrade psutil to 5.9.0. Validate builds are failing because of the need for DataDog/datadog-agent#10544.

Motivation

Include giampaolo/psutil#1961 fix

Review checklist (to be filled by reviewers)

  • Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
  • PR title must be written as a CHANGELOG entry (see why)
  • Files changes must correspond to the primary purpose of the PR as described in the title (small unrelated changes should have their own PR)
  • PR must have changelog/ and integration/ labels attached

hush-hush
hush-hush previously approved these changes Jan 14, 2022
@mx-psi
Copy link
Member Author

mx-psi commented Jan 14, 2022

Windows E2E tests are failing with

ERROR: Could not install packages due to an EnvironmentError: [Error 5] Access is denied: u'c:\\program files\\datadog\\datadog agent\\embedded2\\lib\\site-packages\\~sutil\\_psutil_windows.pyd'

which seems like a CI issue?

@vickenty
Copy link
Contributor

\\~sutil\\ bit looks fishy, a bad wheel perhaps?

@mx-psi
Copy link
Member Author

mx-psi commented Jan 17, 2022

Windows E2E tests are failing with

ERROR: Could not install packages due to an EnvironmentError: [Error 5] Access is denied: u'c:\\program files\\datadog\\datadog agent\\embedded2\\lib\\site-packages\\~sutil\\_psutil_windows.pyd'

which seems like a CI issue?

I can reproduce if I try to do python.exe -m pip install psutil==5.9.0 on the embedded Python 2 environment with the latest RC. psutil 5.9.0 seems to be detected as installed even if the failure happens.

The error does not happen if I try to install version 5.8.0, and after doing that it seems like I can upgrade to 5.9.0 seamlessly, even if I do 5.7.2 -> 5.8.0 -> 5.7.2 -> 5.9.0.

@mx-psi
Copy link
Member Author

mx-psi commented Jan 17, 2022

I am also able to reproduce it when installing on the embedded Python 2 environment of the Agent from DataDog/datadog-agent#10544 (i.e. using this msi) with the same behavior, so the custom patches are not the issue.

I can't reproduce with a fresh install of Python 2 when doing

C:\Python27\python.exe -m pip install psutil==5.7.2
C:\Python27\python.exe -m pip install psutil==5.9.0

`rg 'psutil==' -l | xargs sd 'psutil==5.7.2' 'psutil==5.9.0'`
@mx-psi mx-psi force-pushed the mx-psi/bump-psutil branch from 7a5e7a6 to bcad082 Compare January 24, 2022 10:30
@mx-psi
Copy link
Member Author

mx-psi commented Jan 24, 2022

I have restored this branch to its original setup and moved testing to #11196. To summarize: the end to end test failure is a limitation of the end to end testing environment, where the dependencies are updated while the Agent is running, and therefore holding some files.

@yzhan289 yzhan289 merged commit b0a422f into master Jan 28, 2022
@yzhan289 yzhan289 deleted the mx-psi/bump-psutil branch January 28, 2022 16:12
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