Skip to content

Commit 7df6a84

Browse files
committed
Fix flaky hugepages tests by decreasing page count
If requesting an substantial amount of huge page memory (like the tests), it is recommended to to it as early after boot as possible, or by using the kernel cmd line.
1 parent b8e8130 commit 7df6a84

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

test/e2e_node/hugepages_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ func makePodToVerifyHugePages(baseName string, hugePagesLimit resource.Quantity)
8484
return pod
8585
}
8686

87-
// configureHugePages attempts to allocate 100Mi of 2Mi hugepages for testing purposes
87+
// configureHugePages attempts to allocate 10Mi of 2Mi hugepages for testing purposes
8888
func configureHugePages() error {
89-
err := exec.Command("/bin/sh", "-c", "echo 50 > /proc/sys/vm/nr_hugepages").Run()
89+
err := exec.Command("/bin/sh", "-c", "echo 5 > /proc/sys/vm/nr_hugepages").Run()
9090
if err != nil {
9191
return err
9292
}
@@ -99,10 +99,10 @@ func configureHugePages() error {
9999
return err
100100
}
101101
e2elog.Logf("HugePages_Total is set to %v", numHugePages)
102-
if numHugePages == 50 {
102+
if numHugePages == 5 {
103103
return nil
104104
}
105-
return fmt.Errorf("expected hugepages %v, but found %v", 50, numHugePages)
105+
return fmt.Errorf("expected hugepages %v, but found %v", 5, numHugePages)
106106
}
107107

108108
// releaseHugePages releases all pre-allocated hugepages
@@ -154,7 +154,7 @@ func runHugePagesTests(f *framework.Framework) {
154154
Limits: v1.ResourceList{
155155
v1.ResourceName("cpu"): resource.MustParse("10m"),
156156
v1.ResourceName("memory"): resource.MustParse("100Mi"),
157-
v1.ResourceName("hugepages-2Mi"): resource.MustParse("50Mi"),
157+
v1.ResourceName("hugepages-2Mi"): resource.MustParse("6Mi"),
158158
},
159159
},
160160
},
@@ -163,7 +163,7 @@ func runHugePagesTests(f *framework.Framework) {
163163
})
164164
podUID := string(pod.UID)
165165
ginkgo.By("checking if the expected hugetlb settings were applied")
166-
verifyPod := makePodToVerifyHugePages("pod"+podUID, resource.MustParse("50Mi"))
166+
verifyPod := makePodToVerifyHugePages("pod"+podUID, resource.MustParse("6Mi"))
167167
f.PodClient().Create(verifyPod)
168168
err := e2epod.WaitForPodSuccessInNamespace(f.ClientSet, verifyPod.Name, f.Namespace.Name)
169169
framework.ExpectNoError(err)
@@ -194,7 +194,7 @@ var _ = SIGDescribe("HugePages [Serial] [Feature:HugePages][NodeFeature:HugePage
194194
ginkgo.By("by waiting for hugepages resource to become available on the local node")
195195
gomega.Eventually(func() string {
196196
return pollResourceAsString(f, "hugepages-2Mi")
197-
}, 30*time.Second, framework.Poll).Should(gomega.Equal("100Mi"))
197+
}, 30*time.Second, framework.Poll).Should(gomega.Equal("10Mi"))
198198
})
199199

200200
runHugePagesTests(f)

0 commit comments

Comments
 (0)