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

Merge pull request #48118 from verult/FlakyDetachE2E

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 48118, 48159)

Ensures node becomes schedulable at the end of tests that delete nodes

**What this PR does / why we need it**: Further fixes the flakiness of "Pod Disk should be able to detach from a node which was deleted". When a node becomes ready but not schedulable, it was not included in the final node count.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #48008 

**Special notes for your reviewer**: Updated a similar test, "Pod Disk should be able to detach from a node whose api object was deleted", to use an "Expect" instead of a soft error because the test needs to guarantee that the environment is *completely* reset.

**Release note**:

```release-note-none
```
This commit is contained in:
Kubernetes Submit Queue 2017-06-27 19:32:10 -07:00 committed by GitHub
commit 89383d27af
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/e2e/storage/pd.go
View File

@ -429,8 +429,9 @@ var _ = framework.KubeDescribe("Pod Disks", func() {
podClient.Delete(host0Pod.Name, metav1.NewDeleteOptions(0)) podClient.Delete(host0Pod.Name, metav1.NewDeleteOptions(0))
detachAndDeletePDs(diskName, []types.NodeName{host0Name}) detachAndDeletePDs(diskName, []types.NodeName{host0Name})
framework.WaitForNodeToBeReady(f.ClientSet, string(host0Name), nodeStatusTimeout) framework.WaitForNodeToBeReady(f.ClientSet, string(host0Name), nodeStatusTimeout)
framework.WaitForAllNodesSchedulable(f.ClientSet, nodeStatusTimeout)
nodes = framework.GetReadySchedulableNodesOrDie(f.ClientSet) nodes = framework.GetReadySchedulableNodesOrDie(f.ClientSet)
Expect(len(nodes.Items)).To(Equal(initialGroupSize)) Expect(len(nodes.Items)).To(Equal(initialGroupSize), "Requires node count to return to initial group size.")
}() }()
By("submitting host0Pod to kubernetes") By("submitting host0Pod to kubernetes")
@ -480,7 +481,7 @@ var _ = framework.KubeDescribe("Pod Disks", func() {
originalCount := len(nodes.Items) originalCount := len(nodes.Items)
containerName := "mycontainer" containerName := "mycontainer"
nodeToDelete := &nodes.Items[0] nodeToDelete := &nodes.Items[0]
defer func() error { defer func() {
By("Cleaning up PD-RW test env") By("Cleaning up PD-RW test env")
detachAndDeletePDs(diskName, []types.NodeName{host0Name}) detachAndDeletePDs(diskName, []types.NodeName{host0Name})
nodeToDelete.ObjectMeta.SetResourceVersion("0") nodeToDelete.ObjectMeta.SetResourceVersion("0")
@ -489,11 +490,9 @@ var _ = framework.KubeDescribe("Pod Disks", func() {
framework.ExpectNoError(err, "Unable to re-create the deleted node") framework.ExpectNoError(err, "Unable to re-create the deleted node")
framework.ExpectNoError(framework.WaitForGroupSize(framework.TestContext.CloudConfig.NodeInstanceGroup, int32(initialGroupSize)), "Unable to get the node group back to the original size") framework.ExpectNoError(framework.WaitForGroupSize(framework.TestContext.CloudConfig.NodeInstanceGroup, int32(initialGroupSize)), "Unable to get the node group back to the original size")
framework.WaitForNodeToBeReady(f.ClientSet, nodeToDelete.Name, nodeStatusTimeout) framework.WaitForNodeToBeReady(f.ClientSet, nodeToDelete.Name, nodeStatusTimeout)
framework.WaitForAllNodesSchedulable(f.ClientSet, nodeStatusTimeout)
nodes = framework.GetReadySchedulableNodesOrDie(f.ClientSet) nodes = framework.GetReadySchedulableNodesOrDie(f.ClientSet)
if len(nodes.Items) != originalCount { Expect(len(nodes.Items)).To(Equal(originalCount), "Requires node count to return to original node count.")
return fmt.Errorf("The node count is not back to original count")
}
return nil
}() }()
By("submitting host0Pod to kubernetes") By("submitting host0Pod to kubernetes")