From c98306a09e9528a8dc29560219f9c4b257297de7 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 9 Jun 2021 14:04:04 +0200 Subject: [PATCH] test: adjust summary test for cgroup v2 on cgroup v2 the reported metric is recursive for the entire and it includes all the sub cgroups. Adjust the test accordingly. Closes: https://github.com/kubernetes/kubernetes/issues/99230 Signed-off-by: Giuseppe Scrivano --- test/e2e_node/summary_test.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/e2e_node/summary_test.go b/test/e2e_node/summary_test.go index c592be5debe..5da172d4ed1 100644 --- a/test/e2e_node/summary_test.go +++ b/test/e2e_node/summary_test.go @@ -115,6 +115,11 @@ var _ = SIGDescribe("Summary API [NodeConformance]", func() { "UserDefinedMetrics": gomega.BeEmpty(), }) } + expectedMajorPageFaultsUpperBound := 10 + if IsCgroup2UnifiedMode() { + expectedMajorPageFaultsUpperBound = 1000 + } + podsContExpectations := sysContExpectations().(*gstruct.FieldsMatcher) podsContExpectations.Fields["Memory"] = ptrMatchAllFields(gstruct.Fields{ "Time": recent(maxStatsAge), @@ -124,7 +129,7 @@ var _ = SIGDescribe("Summary API [NodeConformance]", func() { "WorkingSetBytes": bounded(10*e2evolume.Kb, memoryLimit), "RSSBytes": bounded(1*e2evolume.Kb, memoryLimit), "PageFaults": bounded(0, 1000000), - "MajorPageFaults": bounded(0, 10), + "MajorPageFaults": bounded(0, expectedMajorPageFaultsUpperBound), }) runtimeContExpectations := sysContExpectations().(*gstruct.FieldsMatcher) if systemdutil.IsRunningSystemd() && framework.TestContext.ContainerRuntime == "docker" {