From f23e2a8c7f390e2f5c55ba7cedbb5b1104700836 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 28 Sep 2021 09:58:58 +0200 Subject: [PATCH] test, cgroupv2: adjust pagefaults test on cgroup v2 the reported metric is recursive and it includes all the sub cgroups. Closes: https://github.com/kubernetes/kubernetes/issues/105301 Signed-off-by: Giuseppe Scrivano --- test/e2e_node/summary_test.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/e2e_node/summary_test.go b/test/e2e_node/summary_test.go index a060349637b..8a652e0fe23 100644 --- a/test/e2e_node/summary_test.go +++ b/test/e2e_node/summary_test.go @@ -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)