github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

fix node e2e localstorage eviction tests

Browse Source
This commit is contained in:
David Ashpole 2019-01-29 11:02:48 -08:00
parent d54716338a
commit 6d07624ae3
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/e2e_node/eviction_test.go
View File

@ -171,7 +171,7 @@ var _ = framework.KubeDescribe("LocalStorageEviction [Slow] [Serial] [Disruptive
expectedStarvedResource := v1.ResourceEphemeralStorage expectedStarvedResource := v1.ResourceEphemeralStorage
Context(fmt.Sprintf(testContextFmt, expectedNodeCondition), func() { Context(fmt.Sprintf(testContextFmt, expectedNodeCondition), func() {
tempSetCurrentKubeletConfig(f, func(initialConfig *kubeletconfig.KubeletConfiguration) { tempSetCurrentKubeletConfig(f, func(initialConfig *kubeletconfig.KubeletConfiguration) {
diskConsumed := resource.MustParse("100Mi") diskConsumed := resource.MustParse("200Mi")
summary := eventuallyGetSummary() summary := eventuallyGetSummary()
availableBytes := *(summary.Node.Fs.AvailableBytes) availableBytes := *(summary.Node.Fs.AvailableBytes)
initialConfig.EvictionHard = map[string]string{string(evictionapi.SignalNodeFsAvailable): fmt.Sprintf("%d", availableBytes-uint64(diskConsumed.Value()))} initialConfig.EvictionHard = map[string]string{string(evictionapi.SignalNodeFsAvailable): fmt.Sprintf("%d", availableBytes-uint64(diskConsumed.Value()))}
@ -200,7 +200,7 @@ var _ = framework.KubeDescribe("LocalStorageSoftEviction [Slow] [Serial] [Disrup
expectedStarvedResource := v1.ResourceEphemeralStorage expectedStarvedResource := v1.ResourceEphemeralStorage
Context(fmt.Sprintf(testContextFmt, expectedNodeCondition), func() { Context(fmt.Sprintf(testContextFmt, expectedNodeCondition), func() {
tempSetCurrentKubeletConfig(f, func(initialConfig *kubeletconfig.KubeletConfiguration) { tempSetCurrentKubeletConfig(f, func(initialConfig *kubeletconfig.KubeletConfiguration) {
diskConsumed := resource.MustParse("100Mi") diskConsumed := resource.MustParse("200Mi")
summary := eventuallyGetSummary() summary := eventuallyGetSummary()
availableBytes := *(summary.Node.Fs.AvailableBytes) availableBytes := *(summary.Node.Fs.AvailableBytes)
if availableBytes <= uint64(diskConsumed.Value()) { if availableBytes <= uint64(diskConsumed.Value()) {
@ -459,10 +459,11 @@ func runEvictionTest(f *framework.Framework, pressureTimeout time.Duration, expe
// Sleep so that pods requesting local storage do not fail to schedule // Sleep so that pods requesting local storage do not fail to schedule
time.Sleep(30 * time.Second) time.Sleep(30 * time.Second)
By("seting up pods to be used by tests") By("seting up pods to be used by tests")
pods := []*v1.Pod{}
for _, spec := range testSpecs { for _, spec := range testSpecs {
By(fmt.Sprintf("creating pod with container: %s", spec.pod.Name)) pods = append(pods, spec.pod)
f.PodClient().CreateSync(spec.pod)
} }
f.PodClient().CreateBatch(pods)
}) })
It("should eventually evict all of the correct pods", func() { It("should eventually evict all of the correct pods", func() {
@ -831,7 +832,7 @@ func diskConsumingPod(name string, diskConsumedMB int, volumeSource *v1.VolumeSo
path = volumeMountPath path = volumeMountPath
} }
// Each iteration writes 1 Mb, so do diskConsumedMB iterations. // Each iteration writes 1 Mb, so do diskConsumedMB iterations.
return podWithCommand(volumeSource, resources, diskConsumedMB, name, fmt.Sprintf("dd if=/dev/urandom of=%s${i} bs=1048576 count=1 2>/dev/null;", filepath.Join(path, "file"))) return podWithCommand(volumeSource, resources, diskConsumedMB, name, fmt.Sprintf("dd if=/dev/urandom of=%s${i} bs=1048576 count=1 2>/dev/null; sleep .1;", filepath.Join(path, "file")))
} }
func pidConsumingPod(name string, numProcesses int) *v1.Pod { func pidConsumingPod(name string, numProcesses int) *v1.Pod {