github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 02:34:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14792 from saad-ali/fixIssue14787PdCleanup

Browse Source 
E2E PD Test cleanup should be more robust on failure to prevent leaking PDs
This commit is contained in:
Brendan Burns 2015-09-30 11:23:58 -07:00
commit 08bd00d14b
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/e2e/pd.go
View File

@ -84,7 +84,7 @@ var _ = Describe("Pod Disks", func() {
podClient.Delete(host1Pod.Name, api.NewDeleteOptions(0)) podClient.Delete(host1Pod.Name, api.NewDeleteOptions(0))
detachPD(host0Name, diskName) detachPD(host0Name, diskName)
detachPD(host1Name, diskName) detachPD(host1Name, diskName)
deletePD(diskName) deletePDWithRetry(diskName)
}() }()
By("submitting host0Pod to kubernetes") By("submitting host0Pod to kubernetes")
@ -144,7 +144,7 @@ var _ = Describe("Pod Disks", func() {
detachPD(host0Name, diskName) detachPD(host0Name, diskName)
detachPD(host1Name, diskName) detachPD(host1Name, diskName)
deletePD(diskName) deletePDWithRetry(diskName)
}() }()
By("submitting rwPod to ensure PD is formatted") By("submitting rwPod to ensure PD is formatted")
@ -194,7 +194,7 @@ var _ = Describe("Pod Disks", func() {
// Teardown should do nothing unless test failed. // Teardown should do nothing unless test failed.
podClient.Delete(host0Pod.Name, api.NewDeleteOptions(0)) podClient.Delete(host0Pod.Name, api.NewDeleteOptions(0))
detachPD(host0Name, diskName) detachPD(host0Name, diskName)
deletePD(diskName) deletePDWithRetry(diskName)
}() }()
fileAndContentToVerify := make(map[string]string) fileAndContentToVerify := make(map[string]string)
@ -251,8 +251,8 @@ var _ = Describe("Pod Disks", func() {
podClient.Delete(host0Pod.Name, api.NewDeleteOptions(0)) podClient.Delete(host0Pod.Name, api.NewDeleteOptions(0))
detachPD(host0Name, disk1Name) detachPD(host0Name, disk1Name)
detachPD(host0Name, disk2Name) detachPD(host0Name, disk2Name)
deletePD(disk1Name) deletePDWithRetry(disk1Name)
deletePD(disk2Name) deletePDWithRetry(disk2Name)
}() }()
containerName := "mycontainer" containerName := "mycontainer"
@ -351,7 +351,13 @@ func deletePD(pdName string) error {
cmd := exec.Command("gcloud", "compute", "--project="+testContext.CloudConfig.ProjectID, "disks", "delete", "--zone="+zone, pdName) cmd := exec.Command("gcloud", "compute", "--project="+testContext.CloudConfig.ProjectID, "disks", "delete", "--zone="+zone, pdName)
data, err := cmd.CombinedOutput() data, err := cmd.CombinedOutput()
if err != nil { if err != nil {
Logf("Error deleting PD: %s (%v)", string(data), err) dataStr := string(data)
if strings.Contains(dataStr, "was not found") {
Logf("PD deletion implicitly succeeded because PD %q does not exist.", pdName)
return nil
}
Logf("Error deleting PD: %s (%v)", dataStr, err)
} }
return err return err
} else { } else {