Skip to content

K
k3s
Commit 6b6b1e57 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #52291 from derekwaynecarr/fix-summary

Automatic merge from submit-queue (batch tested with PRs 52007, 52196, 52169, 52263, 52291) Summary tests should expect rss usage now **What this PR does / why we need it**: Fixes summary test to expect rss usage now. Previously, cAdvisor reported rss and not total_rss, but that has now been fixed in most recent version of cAdvisor now in the project. See: https://github.com/kubernetes/kubernetes/pull/43399#issuecomment-287858599 **Release note**: ```release-note NONE ```
parents 4775dae1 c59715e9
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 16 deletions
test/e2e_node/summary_test.go
View file @ 6b6b1e57
...@@ -92,14 +92,8 @@ var _ = framework.KubeDescribe("Summary API", func() { ...@@ -92,14 +92,8 @@ var _ = framework.KubeDescribe("Summary API", func() {
"AvailableBytes": BeNil(), "AvailableBytes": BeNil(),
"UsageBytes": bounded(1*framework.Mb, 10*framework.Gb), "UsageBytes": bounded(1*framework.Mb, 10*framework.Gb),
"WorkingSetBytes": bounded(1*framework.Mb, 10*framework.Gb), "WorkingSetBytes": bounded(1*framework.Mb, 10*framework.Gb),
// today, this returns the value reported // this now returns /sys/fs/cgroup/memory.stat total_rss
// in /sys/fs/cgroup/memory.stat for rss "RSSBytes": bounded(1*framework.Mb, 1*framework.Gb),
// this value should really return /sys/fs/cgroup/memory.stat total_rss
// as we really want the hierarchical value not the usage local to / cgroup.
// for now, i am updating the bounding box to the value as coded, but the
// value reported needs to change.
// rss only makes sense if you are leaf cgroup
"RSSBytes": bounded(0, 1*framework.Gb),
"PageFaults": bounded(1000, 1E9), "PageFaults": bounded(1000, 1E9),
"MajorPageFaults": bounded(0, 100000), "MajorPageFaults": bounded(0, 100000),
}), }),
...@@ -210,14 +204,8 @@ var _ = framework.KubeDescribe("Summary API", func() { ...@@ -210,14 +204,8 @@ var _ = framework.KubeDescribe("Summary API", func() {
"AvailableBytes": bounded(100*framework.Mb, 100*framework.Gb), "AvailableBytes": bounded(100*framework.Mb, 100*framework.Gb),
"UsageBytes": bounded(10*framework.Mb, 10*framework.Gb), "UsageBytes": bounded(10*framework.Mb, 10*framework.Gb),
"WorkingSetBytes": bounded(10*framework.Mb, 10*framework.Gb), "WorkingSetBytes": bounded(10*framework.Mb, 10*framework.Gb),
// today, this returns the value reported // this now returns /sys/fs/cgroup/memory.stat total_rss
// in /sys/fs/cgroup/memory.stat for rss "RSSBytes": bounded(1*framework.Kb, 1*framework.Gb),
// this value should really return /sys/fs/cgroup/memory.stat total_rss
// as we really want the hierarchical value not the usage local to / cgroup.
// for now, i am updating the bounding box to the value as coded, but the
// value reported needs to change.
// rss only makes sense if you are leaf cgroup
"RSSBytes": bounded(0, 1*framework.Gb),
"PageFaults": bounded(1000, 1E9), "PageFaults": bounded(1000, 1E9),
"MajorPageFaults": bounded(0, 100000), "MajorPageFaults": bounded(0, 100000),
}), }),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment