Merge pull request #4681 from viveksb007/main

fixed#4680 wrapping last retryable err with timeout err

Author: k8s-ci-robot

pkg/runtime/retry_utils.go

@@ -1,20 +1,29 @@
 package runtime
 
 import (
-	"k8s.io/apimachinery/pkg/util/wait"
+	"fmt"
 	"time"
+
+	"k8s.io/apimachinery/pkg/util/wait"
 )
 
 // RetryImmediateOnError tries to run fn every interval until it succeeds, a non-retryable error occurs or the timeout is reached.
+// If the timeout is reached while retrying, the returned error wraps both the timeout and the last retryable error.
 func RetryImmediateOnError(interval time.Duration, timeout time.Duration, retryable func(error) bool, fn func() error) error {
-	return wait.PollImmediate(interval, timeout, func() (bool, error) {
+	var lastRetryableErr error
+	err := wait.PollImmediate(interval, timeout, func() (bool, error) {
 		err := fn()
 		if err != nil {
 			if retryable(err) {
+				lastRetryableErr = err
 				return false, nil
 			}
 			return false, err
 		}
 		return true, nil
 	})
+	if wait.Interrupted(err) && lastRetryableErr != nil {
+		return fmt.Errorf("%w: %v", err, lastRetryableErr)
+	}
+	return err
 }

pkg/runtime/retry_utils_test.go

@@ -69,7 +69,7 @@ func Test_RetryImmediateOnError(t *testing.T) {
 			// may race with the next tick, so count can be 3 or 4.
 			wantMinCount: 3,
 			wantMaxCount: 4,
-			wantErr:      errors.New("timed out waiting for the condition"),
+			wantErr:      errors.New("timed out waiting for the condition: retryable"),
 		},
 		{
 			name: "retry 4 times before success",
@@ -95,7 +95,7 @@ func Test_RetryImmediateOnError(t *testing.T) {
 			// may race with the next tick, so count can be 3 or 4.
 			wantMinCount: 3,
 			wantMaxCount: 4,
-			wantErr:      errors.New("timed out waiting for the condition"),
+			wantErr:      errors.New("timed out waiting for the condition: retryable"),
 		},
 	}
 	for _, tt := range tests {