Backport of docker: use streaming stats collection to correct CPU stats into release/1.9.x #24238
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hc-github-team-nomad-core
force-pushed
the
backport/docker-stats-cpu-ticks/equally-intense-trout
branch
from
e3dcbb2 to
92a064a
Compare
tgross
approved these changes
Oct 17, 2024
tgross
deleted the
backport/docker-stats-cpu-ticks/equally-intense-trout
branch
|
I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport
This PR is auto-generated from #24229 to be assessed for backporting due to the inclusion of the label backport/1.9.x.
The below text is copied from the body of the original PR.
In #23966 we switched to the official Docker SDK for the
dockerdriver. In the process we refactored code around stats collection to use the "one shot" version of stats. Unfortunately this "one shot" stats collection does not include thePreCPUstats, which are the stats from the previous read. This breaks the calculation we use to determine CPU ticks, because now we're subtracting 0 from the current value to get the delta.Switch back to using the streaming stats collection. Add a test that fully exercises the
TaskStatsAPI.Fixes: #24224
Ref: https://hashicorp.atlassian.net/browse/NET-11348
In addition to new tests here, I've tested manually with the setup described here #24224 (comment) and we get the expected results now.
Overview of commits