Merge pull request #105313 from giuseppe/fix-flaky-pagefaults-summary-test

test, cgroupv2: adjust pagefaults test
This commit is contained in:
Kubernetes Prow Robot 2021-10-14 00:13:30 -07:00 committed by GitHub
commit 548e37278c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -115,9 +115,13 @@ var _ = SIGDescribe("Summary API [NodeConformance]", func() {
"UserDefinedMetrics": gomega.BeEmpty(),
})
}
expectedPageFaultsUpperBound := 1000000
expectedMajorPageFaultsUpperBound := 10
if IsCgroup2UnifiedMode() {
expectedMajorPageFaultsUpperBound = 1000
// 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
}
podsContExpectations := sysContExpectations().(*gstruct.FieldsMatcher)
@ -128,7 +132,7 @@ var _ = SIGDescribe("Summary API [NodeConformance]", func() {
"UsageBytes": bounded(10*e2evolume.Kb, memoryLimit),
"WorkingSetBytes": bounded(10*e2evolume.Kb, memoryLimit),
"RSSBytes": bounded(1*e2evolume.Kb, memoryLimit),
"PageFaults": bounded(0, 1000000),
"PageFaults": bounded(0, expectedPageFaultsUpperBound),
"MajorPageFaults": bounded(0, expectedMajorPageFaultsUpperBound),
})
runtimeContExpectations := sysContExpectations().(*gstruct.FieldsMatcher)