From f284f72ffb217b228dba04b867c48e3d70fae85b Mon Sep 17 00:00:00 2001
From: Kornilios Kourtis <kornilios@isovalent.com>
Date: Thu, 15 Aug 2024 11:08:03 +0200
Subject: [PATCH] rthooks: use a generic retry function

Both findMirrorPod and findPod functions do the same retry loop.
Use a helper retry function instead.

Signed-off-by: Kornilios Kourtis <kornilios@isovalent.com>
---
 pkg/rthooks/args.go | 49 ++++++++++++++++++---------------------------
 1 file changed, 20 insertions(+), 29 deletions(-)

diff --git a/pkg/rthooks/args.go b/pkg/rthooks/args.go
index 8adaeb57802..4ae6d49fef1 100644
--- a/pkg/rthooks/args.go
+++ b/pkg/rthooks/args.go
@@ -110,46 +110,37 @@ func (arg *CreateContainerArg) Pod() (*corev1.Pod, error) {
 }
 
 func (arg *CreateContainerArg) findMirrorPod(hash string) (*corev1.Pod, error) {
-	var pod *corev1.Pod
-	var err error
-
-	nretries := 5
-	for i := 0; i < nretries; i++ {
-		pod, err = arg.Watcher.FindMirrorPod(hash)
-		if err == nil {
-			break
-		}
-		time.Sleep(10 * time.Millisecond)
-	}
+	return retry(5, 10*time.Millisecond, func() (*corev1.Pod, error) {
+		return arg.Watcher.FindMirrorPod(hash)
+	})
 
-	if err != nil {
-		err = fmt.Errorf("failed to fetch pod info after %d retries: %w", nretries, err)
-	}
-
-	return pod, err
 }
 
 func (arg *CreateContainerArg) findPod() (*corev1.Pod, error) {
-	var pod *corev1.Pod
 	var err error
-
-	podId, err := arg.PodID()
+	podID, err := arg.PodID()
 	if err != nil {
 		return nil, err
 	}
 
-	nretries := 5
-	for i := 0; i < nretries; i++ {
-		pod, err = arg.Watcher.FindPod(podId)
+	return retry(5, 10*time.Millisecond, func() (*corev1.Pod, error) {
+		return arg.Watcher.FindPod(podID)
+	})
+}
+
+func retry[R any](nretries int, timeout time.Duration, fn func() (R, error)) (R, error) {
+	var err error
+	var ret R
+	for i := 0; ; i++ {
+		ret, err = fn()
 		if err == nil {
-			break
+			return ret, nil
 		}
-		time.Sleep(10 * time.Millisecond)
-	}
 
-	if err != nil {
-		err = fmt.Errorf("failed to fetch pod info after %d retries: %w", nretries, err)
-	}
+		if i >= nretries {
+			return ret, fmt.Errorf("failed to fetch pod info after %d retries: %w", nretries, err)
+		}
 
-	return pod, err
+		time.Sleep(timeout)
+	}
 }