github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-02-21 22:57:15 +00:00
Code Issues Projects Releases Wiki Activity

E2E volume: fix restarting of watch

Browse Source 
Presumably
https://github.com/kubernetes/kubernetes/pull/127260/files#r2405215911
was meant to continue polling after a watch was closed by the apiserver.
This is something that can happen under load.

However, returning the error has the effect that polling stops.
This can be seen as test failures when testing with race
detection enabled:

    persistent_volumes_test.go:1101: Failed to wait for all claims to be bound: watch closed
This commit is contained in:
Patrick Ohly
2025-10-06 17:35:59 +02:00
committed by Sathvik
parent 03a5f06c26
commit 79ed9ffaae
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
test/integration/volume/persistent_volumes_test.go
View File

@@ -1468,19 +1468,30 @@ func waitForAnyPersistentVolumePhase(w watch.Interface, phase v1.PersistentVolum
}
func waitForSomePersistentVolumeClaimPhase(ctx context.Context, testClient clientset.Interface, namespace string, objCount int, watchPVC watch.Interface, phase v1.PersistentVolumeClaimPhase) error {
// The caller doesn't know about new watches, so we have to stop them ourselves.
var newWatchPVC watch.Interface
defer func() {
if newWatchPVC != nil {
newWatchPVC.Stop()
}
}()
return wait.ExponentialBackoffWithContext(ctx, retry.DefaultBackoff, func(ctx context.Context) (bool, error) {
for i := 0; i < objCount; i++ {
waitErr := waitForAnyPersistentVolumeClaimPhase(watchPVC, v1.ClaimBound)
if waitErr != nil {
klog.Errorf("Failed to wait for a claim (%d/%d) to be bound: %v", i+1, objCount, waitErr)
err := waitForAnyPersistentVolumeClaimPhase(watchPVC, v1.ClaimBound)
if err != nil {
klog.Errorf("Failed to wait for a claim (%d/%d) to be bound: %v", i+1, objCount, err)
klog.Info("Recreating a watch for claims and re-checking the count of bound claims")
newWatchPVC, err := testClient.CoreV1().PersistentVolumeClaims(namespace).Watch(ctx, metav1.ListOptions{})
newWatchPVC, err = testClient.CoreV1().PersistentVolumeClaims(namespace).Watch(ctx, metav1.ListOptions{})
if err != nil {
return false, err
}
watchPVC.Stop()
watchPVC = newWatchPVC
return false, waitErr
// The error from waitForAnyPersistentVolumeClaimPhase is assumed to be harmless
// and/or to be fixed by recreating the watch, so here we continue polling
// via ExponentialBackoffWithContext.
return false, nil
}
klog.V(1).Infof("%d claims bound", i+1)
}