Merge pull request #121700 from kannon92/fix-summary-more

missed a few summary upper limits for major page faults
This commit is contained in:
Kubernetes Prow Robot 2023-11-06 20:13:04 +01:00 committed by GitHub
commit 246d363ea4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -120,12 +120,12 @@ var _ = SIGDescribe("Summary API", framework.WithNodeConformance(), func() {
})
}
expectedPageFaultsUpperBound := 1000000
expectedMajorPageFaultsUpperBound := 15
expectedMajorPageFaultsUpperBound := 1e9
if IsCgroup2UnifiedMode() {
// On cgroupv2 these stats are recursive, so make sure they are at least like the value set
// above for the container.
expectedPageFaultsUpperBound = 1e9
expectedMajorPageFaultsUpperBound = 100000
expectedMajorPageFaultsUpperBound = 1e9
}
podsContExpectations := sysContExpectations().(*gstruct.FieldsMatcher)
@ -158,7 +158,7 @@ var _ = SIGDescribe("Summary API", framework.WithNodeConformance(), func() {
"WorkingSetBytes": bounded(100*e2evolume.Kb, memoryLimit),
"RSSBytes": bounded(100*e2evolume.Kb, memoryLimit),
"PageFaults": bounded(1000, 1e9),
"MajorPageFaults": bounded(0, 100000),
"MajorPageFaults": bounded(0, 1e9),
})
systemContainers["misc"] = miscContExpectations
}
@ -281,7 +281,7 @@ var _ = SIGDescribe("Summary API", framework.WithNodeConformance(), func() {
// this now returns /sys/fs/cgroup/memory.stat total_rss
"RSSBytes": bounded(1*e2evolume.Kb, memoryLimit),
"PageFaults": bounded(1000, 1e9),
"MajorPageFaults": bounded(0, 100000),
"MajorPageFaults": bounded(0, 1e9),
}),
"Swap": swapExpectation(memoryLimit),
// TODO(#28407): Handle non-eth0 network interface names.