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

Use docker stats instead of libcontainer #400

Merged
merged 3 commits into from
May 10, 2016
Merged

Conversation

samuelkarp
Copy link
Contributor

(Same as #397, but against the right branch...)

Fixes #387

This PR switches our implementation to rely on Docker's stats API rather than libcontainer to parse cgroup location and reading the cgroup files directly.

I re-enabled the old integ tests for telemetry and they seem to be passing (though TestStatsEngineWithNewContainers seems a touch flaky). However, much more testing is warranted before this is safe to merge, especially across different Docker versions.

  • Unit tests pass
  • Integ tests pass
  • Functional tests pass
  • Tested with Docker 1.11.1
  • Tested with Docker 1.11.0
  • Tested with Docker 1.10.x
  • Tested with Docker 1.9.x
  • Tested with Docker 1.8.x
  • Tested with Docker 1.7.x
  • Tested with Docker 1.6.x
  • Tested with Docker 1.5.x

r? @aaithal @juanrhenals @richardpen

@aaithal
Copy link
Contributor

aaithal commented May 10, 2016

:shipit:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants