github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 10:20:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #73446 from cofyc/fix73419

Browse Source 
Fix local pv stress tests
This commit is contained in:
Kubernetes Prow Robot 2019-01-29 10:12:17 -08:00 committed by GitHub
commit 819dcaaa17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/storage/persistent_volumes-local.go
View File

@ -451,9 +451,9 @@ var _ = utils.SIGDescribe("PersistentVolumes-local ", func() {
BeforeEach(func() { BeforeEach(func() {
setupStorageClass(config, &waitMode) setupStorageClass(config, &waitMode)
for _, node := range config.nodes { for i, node := range config.nodes {
By(fmt.Sprintf("Setting up %d local volumes on node %q", volsPerNode, node.Name)) By(fmt.Sprintf("Setting up %d local volumes on node %q", volsPerNode, node.Name))
allLocalVolumes[node.Name] = setupLocalVolumes(config, volType, &node, volsPerNode) allLocalVolumes[node.Name] = setupLocalVolumes(config, volType, &config.nodes[i], volsPerNode)
} }
By(fmt.Sprintf("Create %d PVs", volsPerNode*len(config.nodes))) By(fmt.Sprintf("Create %d PVs", volsPerNode*len(config.nodes)))
var err error var err error
@ -513,14 +513,15 @@ var _ = utils.SIGDescribe("PersistentVolumes-local ", func() {
}) })
AfterEach(func() { AfterEach(func() {
By("Stop and wait for recycle goroutine to finish")
close(stopCh)
wg.Wait()
By("Clean all PVs")
for nodeName, localVolumes := range allLocalVolumes { for nodeName, localVolumes := range allLocalVolumes {
By(fmt.Sprintf("Cleaning up %d local volumes on node %q", len(localVolumes), nodeName)) By(fmt.Sprintf("Cleaning up %d local volumes on node %q", len(localVolumes), nodeName))
cleanupLocalVolumes(config, localVolumes) cleanupLocalVolumes(config, localVolumes)
} }
cleanupStorageClass(config) cleanupStorageClass(config)
By("Wait for recycle goroutine to finish")
close(stopCh)
wg.Wait()
}) })
It("should be able to process many pods and reuse local volumes", func() { It("should be able to process many pods and reuse local volumes", func() {