Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Take total_inactive_file into consideration for memory usage #3115

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.

Sign up for GitHub

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

Jump to bottom
Merged
openshift-merge-robot merged 1 commit into from
Jan 16, 2020
Merged

Take total_inactive_file into consideration for memory usage #3115

openshift-merge-robot merged 1 commit into from
Jan 16, 2020

Conversation

@saschagrunert
Copy link
Member

@saschagrunert saschagrunert commented Jan 15, 2020

We should take the total_inactive_file into consideration
when providing the WorkingSetBytes to align with other
container runtimes.

Closes #3106

@openshift-ci-robot openshift-ci-robot added the dco-signoff: yes Indicates the PR's author has DCO signed all their commits. label Jan 15, 2020
@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 15, 2020
@TomSweeneyRedHat
Copy link
Contributor

TomSweeneyRedHat commented Jan 15, 2020

LGTM

@haircommander
Copy link
Member

haircommander commented Jan 15, 2020

LGTM, PTAL @giuseppe

giuseppe
giuseppe reviewed Jan 16, 2020
View reviewed changes
@saschagrunert
Take total_inactive_file into consideration for memory usage
512fdb2 
We should take the `total_inactive_file` into consideration
when providing the `WorkingSetBytes` to align with other
container runtimes.

Signed-off-by: Sascha Grunert <[email protected]>
saschagrunert
saschagrunert commented Jan 16, 2020
View reviewed changes
internal/oci/oci_linux.go
Comment on lines +185 to +187
if isV2, err := cgroups.IsCgroup2UnifiedMode(); err == nil || isV2 {
return 0, nil
}
Copy link
Member Author

@saschagrunert saschagrunert Jan 16, 2020

Choose a reason for hiding this comment

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

@giuseppe is this the right way to use this function? I cannot omit the check for the err because the linter will complain that I not checked that error.

Copy link
Member

@giuseppe giuseppe Jan 16, 2020

Choose a reason for hiding this comment

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

yeah I think it is fine. Thanks for fixing it so quickly!

giuseppe
giuseppe approved these changes Jan 16, 2020
View reviewed changes
Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

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

LGTM

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 16, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe, mrunalp, saschagrunert

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [giuseppe,mrunalp,saschagrunert]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@mrunalp
Copy link
Member

mrunalp commented Jan 16, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 16, 2020
@mrunalp
Copy link
Member

mrunalp commented Jan 16, 2020

We should backport this as well. Thanks!

@saschagrunert
Copy link
Member Author

saschagrunert commented Jan 16, 2020

/retest
/cherrypick release-1.17

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Jan 16, 2020

@saschagrunert: once the present PR merges, I will cherry-pick it on top of release-1.17 in a new PR and assign it to you.

Details

In response to this:

/retest
/cherrypick release-1.17

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

1 similar comment
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Jan 16, 2020

@saschagrunert: once the present PR merges, I will cherry-pick it on top of release-1.17 in a new PR and assign it to you.

Details

In response to this:

/retest
/cherrypick release-1.17

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-merge-robot openshift-merge-robot merged commit d963e0e into cri-o:master Jan 16, 2020
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jan 16, 2020
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Jan 16, 2020

@saschagrunert: failed to push cherry-picked changes in GitHub: pushing failed, output: "To https://github.com/openshift-cherrypick-robot/cri-o\n ! [remote rejected] cherry-pick-3115-to-release-1.17 -> cherry-pick-3115-to-release-1.17 (cannot lock ref 'refs/heads/cherry-pick-3115-to-release-1.17': reference already exists)\nerror: failed to push some refs to 'https://openshift-cherrypick-robot:[email protected]/openshift-cherrypick-robot/cri-o'\n", error: exit status 1

Details

In response to this:

/retest
/cherrypick release-1.17

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Jan 16, 2020

@saschagrunert: new pull request created: #3125

Details

In response to this:

/retest
/cherrypick release-1.17

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@saschagrunert saschagrunert deleted the total-inactive-file branch January 17, 2020 07:52
@kolyshkin kolyshkin mentioned this pull request Aug 12, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mrunalp mrunalp mrunalp approved these changes

@giuseppe giuseppe giuseppe approved these changes

@runcom runcom Awaiting requested review from runcom

@rhatdan rhatdan Awaiting requested review from rhatdan

@sameo sameo Awaiting requested review from sameo

@vrothberg vrothberg Awaiting requested review from vrothberg

Assignees

@mrunalp mrunalp

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

MemoryUsage.WorkingSetBytes should take total_inactive_file into consideration

8 participants

@saschagrunert @TomSweeneyRedHat @haircommander @openshift-ci-robot @mrunalp @openshift-cherrypick-robot @giuseppe @openshift-merge-robot