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.

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

kubelet: add RSS memory to the summary API #24015

Merged
merged 1 commit into from
Apr 12, 2016
Merged

kubelet: add RSS memory to the summary API #24015

merged 1 commit into from
Apr 12, 2016

Conversation

yujuhong
Copy link
Contributor

@yujuhong yujuhong commented Apr 8, 2016

No description provided.

@yujuhong yujuhong added the sig/node Categorizes an issue or PR as relevant to SIG Node. label Apr 8, 2016
@k8s-github-robot
Copy link

Labelling this PR as size/XS

@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note-label-needed labels Apr 8, 2016
@k8s-bot
Copy link

k8s-bot commented Apr 8, 2016

GCE e2e build/test passed for commit fe6f960e0e842d0d9402e88fb5ce3151c02bf80f.

@dchen1107
Copy link
Member

LGTM

@dchen1107 dchen1107 added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 8, 2016
@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 8, 2016
@dchen1107 dchen1107 mentioned this pull request Apr 8, 2016
Closed
@dchen1107
Copy link
Member

LGTM

@dchen1107 dchen1107 added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 8, 2016
@dchen1107 dchen1107 added this to the v1.2 milestone Apr 8, 2016
@dchen1107 dchen1107 mentioned this pull request Apr 8, 2016
Merged
@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 8, 2016
@yujuhong yujuhong added release-note Denotes a PR that will be considered when it comes time to generate release notes. lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed release-note-label-needed labels Apr 8, 2016
@yujuhong yujuhong mentioned this pull request Apr 8, 2016
Closed
timstclair
timstclair reviewed Apr 8, 2016
View reviewed changes
pkg/kubelet/api/v1alpha1/stats/types.go
@@ -133,6 +133,9 @@ type MemoryStats struct {
// The amount of working set memory. This includes recently accessed memory,
// dirty memory, and kernel memory. UsageBytes is <= TotalBytes.
WorkingSetBytes *uint64 `json:"workingSetBytes,omitempty"`
// The amount of anonymous and swap cache memory (includes transparent
// hugepages).
RSSBytes *uint64 `json:"rssBytes, omitempty"`
Copy link

Choose a reason for hiding this comment

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

(nit) no space after , (not sure if it matters, but it's always written like this)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

that was not intentional. will fix it.

@yujuhong yujuhong added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Apr 8, 2016
@yujuhong
Copy link
Contributor Author

yujuhong commented Apr 8, 2016

Removed the extra space and reapplied the ligtm label.

@k8s-bot
Copy link

k8s-bot commented Apr 8, 2016

GCE e2e build/test passed for commit 388b4ff.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Apr 10, 2016

GCE e2e build/test passed for commit 388b4ff.

@k8s-bot
Copy link

k8s-bot commented Apr 10, 2016

GCE e2e build/test passed for commit 388b4ff.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Apr 10, 2016

GCE e2e build/test passed for commit 388b4ff.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Apr 10, 2016

GCE e2e build/test passed for commit 388b4ff.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Apr 10, 2016

GCE e2e build/test passed for commit 388b4ff.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Apr 10, 2016

GCE e2e build/test passed for commit 388b4ff.

@yujuhong yujuhong added the priority/backlog Higher priority than priority/awaiting-more-evidence. label Apr 11, 2016
@k8s-github-robot
Copy link

@k8s-bot test this issue: #IGNORE

Tests have been pending for 24 hours

@k8s-bot
Copy link

k8s-bot commented Apr 11, 2016

GCE e2e build/test passed for commit 388b4ff.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Apr 12, 2016

GCE e2e build/test passed for commit 388b4ff.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Apr 12, 2016

GCE e2e build/test passed for commit 388b4ff.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit fda8ec2 into kubernetes:master Apr 12, 2016
@dchen1107
Copy link
Member

cc/ @roberthbailey or @bgrant0607 can one of you add cherrypick-approval label for this pr?

@roberthbailey
Copy link
Contributor

@zmerlynn and I will go through the list of pending cherry picks tomorrow.

@zmerlynn zmerlynn changed the title kubele: add RSS memroy to the summary API kubelet: add RSS memory to the summary API Apr 13, 2016
@zmerlynn zmerlynn added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Apr 13, 2016
@roberthbailey
Copy link
Contributor

@dchen1107 cherry pick approved -- can you or @yujuhong create a cherry pick pull?

@yujuhong yujuhong mentioned this pull request Apr 13, 2016
Merged
roberthbailey added a commit that referenced this pull request Apr 19, 2016
@roberthbailey
Merge pull request #24227 from yujuhong/automated-cherry-pick-of-#24015-
15f1165 
#24003-#24205-upstream-release-1.2

Automated cherry pick of #24015 #24003 #24205
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.2" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

@yujuhong yujuhong deleted the rss_memory branch April 22, 2016 17:35
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@roberthbailey
Merge pull request kubernetes#24227 from yujuhong/automated-cherry-pi…
e5a7ab6 
…ck-of-#24015-kubernetes#24003-kubernetes#24205-upstream-release-1.2

Automated cherry pick of kubernetes#24015 kubernetes#24003 kubernetes#24205
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
@roberthbailey
Merge pull request kubernetes#24227 from yujuhong/automated-cherry-pi…
7e85f8e 
…ck-of-#24015-kubernetes#24003-kubernetes#24205-upstream-release-1.2

Automated cherry pick of kubernetes#24015 kubernetes#24003 kubernetes#24205
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@dchen1107 dchen1107

Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/backlog Higher priority than priority/awaiting-more-evidence. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/node Categorizes an issue or PR as relevant to SIG Node. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.2
Development

Successfully merging this pull request may close these issues.
10 participants
@yujuhong @k8s-github-robot @k8s-bot @dchen1107 @roberthbailey @k8s-cherrypick-bot @timstclair @k8s-teamcity-mesosphere @zmerlynn @googlebot