Skip to content

Commit

Permalink
Merge pull request #52291 from derekwaynecarr/fix-summary
Browse files Browse the repository at this point in the history
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: #43399 (comment)

**Release note**:
```release-note
NONE
```
  • Loading branch information
Kubernetes Submit Queue committed Sep 12, 2017
2 parents 4775dae + c59715e commit 6b6b1e5
Showing 1 changed file with 4 additions and 16 deletions.
20 changes: 4 additions & 16 deletions test/e2e_node/summary_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,8 @@ var _ = framework.KubeDescribe("Summary API", func() {
"AvailableBytes": BeNil(),
"UsageBytes": bounded(1*framework.Mb, 10*framework.Gb),
"WorkingSetBytes": bounded(1*framework.Mb, 10*framework.Gb),
// today, this returns the value reported
// in /sys/fs/cgroup/memory.stat for rss
// 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),
// this now returns /sys/fs/cgroup/memory.stat total_rss
"RSSBytes": bounded(1*framework.Mb, 1*framework.Gb),
"PageFaults": bounded(1000, 1E9),
"MajorPageFaults": bounded(0, 100000),
}),
Expand Down Expand Up @@ -210,14 +204,8 @@ var _ = framework.KubeDescribe("Summary API", func() {
"AvailableBytes": bounded(100*framework.Mb, 100*framework.Gb),
"UsageBytes": bounded(10*framework.Mb, 10*framework.Gb),
"WorkingSetBytes": bounded(10*framework.Mb, 10*framework.Gb),
// today, this returns the value reported
// in /sys/fs/cgroup/memory.stat for rss
// 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),
// this now returns /sys/fs/cgroup/memory.stat total_rss
"RSSBytes": bounded(1*framework.Kb, 1*framework.Gb),
"PageFaults": bounded(1000, 1E9),
"MajorPageFaults": bounded(0, 100000),
}),
Expand Down

0 comments on commit 6b6b1e5

Please sign in to comment.