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

Modify working set memory stats calculation #1380

Merged
merged 1 commit into from
Jul 15, 2016

Conversation

mtaufen
Copy link
Contributor

@mtaufen mtaufen commented Jul 15, 2016

Change working set calculation to usage - total_inactive_file, rather than usage - total_inactive_anon - total_inactive_file. Since writes to tmpfs get tracked as total_inactive_anon when swap is disabled, the old calculation would under-report memory pressure.

See these for context:
kubernetes/kubernetes#28619
kubernetes/kubernetes#28693

cc @vishh @timstclair

Change working set calculation to usage - total_inactive_file, rather than
usage - total_inactive_anon - total_inactive_file. Since writes to tmpfs
get tracked as total_inactive_anon when swap is disabled, the old
calculation would under-report memory pressure.

See this Kubernetes issue for context:
kubernetes/kubernetes#28619
@vishh vishh self-assigned this Jul 15, 2016
@vishh
Copy link
Contributor

vishh commented Jul 15, 2016

LGTM

@k8s-bot
Copy link
Collaborator

k8s-bot commented Jul 15, 2016

Jenkins GCE e2e

Build/test passed for commit 307d1b1.

@vishh vishh merged commit 0f253fe into google:master Jul 15, 2016
k8s-github-robot pushed a commit to kubernetes/kubernetes that referenced this pull request Aug 10, 2016
Automatic merge from submit-queue

Node e2e memory eviction test

This tests memory evictions.
See related issue #28619 and fix to cadvisor google/cadvisor#1380.

cc @vishh @derekwaynecarr @timstclair

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/28693)
<!-- Reviewable:end -->
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.

3 participants