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

[7.17] Adjust osprobe assertion for burst cpu (#86990) #86998

Merged
merged 1 commit into from
May 20, 2022

Conversation

rjernst
Copy link
Member

@rjernst rjernst commented May 20, 2022

Backports the following commits to 7.17:

When gathering v1 cgroup cpu stats, the file is expected to have 3
lines. However, if the burst feature of cpu accounting is enabled, it
will actually have 5 lines. This commit adjusts the assertion to allow
for the extra lines. We ignore these lines already in the parsing of the
calling method. Unfortunately this is not currently easy to test, and no
tests exist. Give it is just an assertion that is relaxing, I think it's
ok to fix this issue, and separately work on revamping the OsProbe
tests.
@rjernst rjernst added :Core/Infra/Core Core issues without another label >bug auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport Team:Core/Infra Meta label for core/infra team labels May 20, 2022
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra (Team:Core/Infra)

@elasticsearchmachine elasticsearchmachine merged commit 7f1b183 into elastic:7.17 May 20, 2022
@rjernst rjernst deleted the backport/7.17/pr-86990 branch May 20, 2022 19:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport >bug :Core/Infra/Core Core issues without another label Team:Core/Infra Meta label for core/infra team v7.17.5
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants