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

[docker_daemon] Report as many cgroup metrics as possible #3134

Merged

Conversation

olivielpeau
Copy link
Member

What does this PR do?

If one cgroup stat file is missing, still try to report the metrics
from the other files. This allows collecting most cgroup metrics on
vanilla Debian 8 systems (where by default the memory cgroup metrics
are not available).

Also, remove the retry logic as it seems to have been made at a time
when find_cgroup_filename_pattern was used. Since we're trying
all the stat files now it is as if we were retrying len(CGROUP_METRICS)
times.

Testing Guidelines

Tested this with a containerized agent running on a debian 8 (jessie) VM.

Additional Notes

Addresses #2251 (comment)

If one cgroup stat file is missing, still try to report the metrics
from the other files.

Also, remove the retry logic as it seems to have been made at a time
when `find_cgroup_filename_pattern` was used. Since we're trying
all the stat files now we are in fact retrying `len(CGROUP_METRICS)`
times
Copy link
Member

@hkaj hkaj left a comment

Choose a reason for hiding this comment

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

LGTM

@olivielpeau olivielpeau merged commit 00c5883 into master Jan 20, 2017
@olivielpeau olivielpeau deleted the olivielpeau/docker-check-cgroup-file-granular-failure branch January 20, 2017 00:57
@olivielpeau olivielpeau added this to the 5.12.0 milestone Jan 20, 2017
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.

None yet

2 participants