Skip to content

K
k3s
Commit d3146080 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #46804 from verult/gce-pdflake

Automatic merge from submit-queue (batch tested with PRs 45871, 46498, 46729, 46144, 46804) PD e2e test: Ready node check now uses the most up-to-date node count. Follow-up to PR #46746 <!-- Steps to write your release note: 1. Use the release-note-* labels to set the release note state (if you have access) 2. Enter your extended release note in the below block; leaving it blank means using the PR title as the release note. If no release note is required, just write `NONE`.
parents bdf9dc16 6a073374
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
test/e2e/storage/pd.go
View file @ d3146080
...@@ -43,7 +43,7 @@ import ( ...@@ -43,7 +43,7 @@ import (
const ( const (
gcePDDetachTimeout = 10 * time.Minute gcePDDetachTimeout = 10 * time.Minute
gcePDDetachPollTime = 10 * time.Second gcePDDetachPollTime = 10 * time.Second
nodeStatusTimeout = 3 * time.Minute nodeStatusTimeout = 5 * time.Minute
nodeStatusPollTime = 1 * time.Second nodeStatusPollTime = 1 * time.Second
maxReadRetry = 3 maxReadRetry = 3
) )
...@@ -429,6 +429,7 @@ var _ = framework.KubeDescribe("Pod Disks", func() { ...@@ -429,6 +429,7 @@ 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)
nodes = framework.GetReadySchedulableNodesOrDie(f.ClientSet)
Expect(len(nodes.Items)).To(Equal(initialGroupSize)) Expect(len(nodes.Items)).To(Equal(initialGroupSize))
}() }()
...@@ -488,6 +489,7 @@ var _ = framework.KubeDescribe("Pod Disks", func() { ...@@ -488,6 +489,7 @@ 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)
nodes = framework.GetReadySchedulableNodesOrDie(f.ClientSet)
if len(nodes.Items) != originalCount { if len(nodes.Items) != originalCount {
return fmt.Errorf("The node count is not back to original count") return fmt.Errorf("The node count is not back to original count")
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment