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

[17.03.x] Correct CPU usage calculation in presence of offline CPUs and newer Linux #31579 #31802

Merged
merged 1 commit into from Mar 14, 2017

Conversation

@vieux
Collaborator

vieux commented Mar 13, 2017

No description provided.

@vieux vieux added this to the 17.03.1 milestone Mar 13, 2017

@vieux vieux self-assigned this Mar 13, 2017

@tiborvass

This comment has been minimized.

Show comment
Hide comment
@tiborvass

tiborvass Mar 13, 2017

Collaborator

LGTM

Collaborator

tiborvass commented Mar 13, 2017

LGTM

@thaJeztah

LGTM

@tiborvass
# github.com/docker/docker/daemon
23:03:00 ..\..\daemon\stats_collector.go:118: s.getNumberOnlineCPUs undefined (type *statsCollector has no field or method getNumberOnlineCPUs)
23:03:00 ..\..\daemon\stats_collector_windows.go:17: undefined: Collector
Correct CPU usage calculation in presence of offline CPUs and newer L…
…inux

In torvalds/linux@5ca3726 (released in v4.7-rc1) the
content of the `cpuacct.usage_percpu` file in sysfs was changed to include both
online and offline cpus. This broke the arithmetic in the stats helpers used by
`docker stats`, since it was using the length of the PerCPUUsage array as a
proxy for the number of online CPUs.

Add current number of online CPUs to types.StatsJSON and use it in the
calculation.

Keep a fallback to `len(v.CPUStats.CPUUsage.PercpuUsage)` so this code
continues to work when talking to an older daemon. An old client talking to a
new daemon will ignore the new field and behave as before.

Fixes #28941.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
(cherry picked from commit 115f91d)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
@vieux

This comment has been minimized.

Show comment
Hide comment
@vieux

vieux Mar 13, 2017

Collaborator

@tiborvass PTAL

Collaborator

vieux commented Mar 13, 2017

@tiborvass PTAL

@vieux

This comment has been minimized.

Show comment
Hide comment
@vieux

vieux Mar 14, 2017

Collaborator

exp unrelated.

Collaborator

vieux commented Mar 14, 2017

exp unrelated.

@vieux vieux merged commit 9a6c8c9 into moby:17.03.x Mar 14, 2017

3 of 6 checks passed

experimental Jenkins build Docker-PRs-experimental 31671 has failed
Details
powerpc Jenkins build Docker-PRs-powerpc 381 is running
Details
z Jenkins build is being scheduled
Details
dco-signed All commits are signed
janky Jenkins build Docker-PRs 40294 has succeeded
Details
windowsRS1 Jenkins build Docker-PRs-WoW-RS1 11374 has succeeded
Details

@vieux vieux deleted the vieux:fix_stats branch Mar 14, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment