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

Merge pull request #101280 from huffmanca/address-snapshotting-flakes

Browse Source 
Force NodeUnstageVolume to finish for all distros
This commit is contained in:
Kubernetes Prow Robot 2021-04-22 02:32:31 -07:00 committed by GitHub
commit 82d8d08c78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
test/e2e/storage/testsuites/snapshottable.go
View File

@ -164,40 +164,40 @@ func (s *snapshottableTestSuite) DefineTests(driver storageframework.TestDriver,
// - a pod was created with a PV that's supposed to have data // - a pod was created with a PV that's supposed to have data
// //
// However there's a caching issue that @jinxu97 explained and it's related with the pod & volume // However there's a caching issue that @jinxu97 explained and it's related with the pod & volume
// lifecycle in windows, to understand it we first analyze what the volumemanager does: // lifecycle, to understand it we first analyze what the volumemanager does:
// - when a pod is delete the volumemanager will try to cleanup the volume mounts // - when a pod is delete the volumemanager will try to cleanup the volume mounts
// - NodeUnpublishVolume: unbinds the bind mount from the container // - NodeUnpublishVolume: unbinds the bind mount from the container
// - Linux: the data is flushed to disk // - Linux: the bind mount is removed, which does not flush any cache
// - Windows: we delete a symlink, data's not flushed yet to disk // - Windows: we delete a symlink, data's not flushed yet to disk
// - NodeUnstageVolume: unmount the global mount // - NodeUnstageVolume: unmount the global mount
// - Linux: disk is detached // - Linux: disk is unmounted and all caches flushed.
// - Windows: data is flushed to disk and the disk is detached // - Windows: data is flushed to disk and the disk is detached
// //
// Pod deletion might not guarantee a data flush to disk, however NodeUnstageVolume adds the logic // Pod deletion might not guarantee a data flush to disk, however NodeUnstageVolume adds the logic
// to flush the data to disk (see #81690 for details). // to flush the data to disk (see #81690 for details). We need to wait for NodeUnstageVolume, as
// NodeUnpublishVolume only removes the bind mount, which doesn't force the caches to flush.
// It's possible to create empty snapshots if we don't wait (see #101279 for details).
// //
// In the following code by checking if the PV is not in the node.Status.VolumesInUse field we // In the following code by checking if the PV is not in the node.Status.VolumesInUse field we
// ensure that the volume is not used by the node anymore (an indicator that NodeUnstageVolume has // ensure that the volume is not used by the node anymore (an indicator that NodeUnstageVolume has
// already finished) // already finished)
if framework.NodeOSDistroIs("windows") { nodeName := pod.Spec.NodeName
nodeName := pod.Spec.NodeName gomega.Expect(nodeName).NotTo(gomega.BeEmpty(), "pod.Spec.NodeName must not be empty")
gomega.Expect(nodeName).NotTo(gomega.BeEmpty(), "pod.Spec.NodeName must not be empty")
ginkgo.By(fmt.Sprintf("[init] waiting until the node=%s is not using the volume=%s", nodeName, pv.Name)) ginkgo.By(fmt.Sprintf("[init] waiting until the node=%s is not using the volume=%s", nodeName, pv.Name))
success := storageutils.WaitUntil(framework.Poll, f.Timeouts.PVDelete, func() bool { success := storageutils.WaitUntil(framework.Poll, f.Timeouts.PVDelete, func() bool {
node, err := cs.CoreV1().Nodes().Get(context.TODO(), nodeName, metav1.GetOptions{}) node, err := cs.CoreV1().Nodes().Get(context.TODO(), nodeName, metav1.GetOptions{})
framework.ExpectNoError(err) framework.ExpectNoError(err)
volumesInUse := node.Status.VolumesInUse volumesInUse := node.Status.VolumesInUse
framework.Logf("current volumes in use: %+v", volumesInUse) framework.Logf("current volumes in use: %+v", volumesInUse)
for i := 0; i < len(volumesInUse); i++ { for i := 0; i < len(volumesInUse); i++ {
if strings.HasSuffix(string(volumesInUse[i]), pv.Name) { if strings.HasSuffix(string(volumesInUse[i]), pv.Name) {
return false return false
}
} }
return true }
}) return true
framework.ExpectEqual(success, true) })
} framework.ExpectEqual(success, true)
} }
cleanup := func() { cleanup := func() {