refactor DoUntil

flannel-io · Nov 20, 2024 · aaf6cc7 · aaf6cc7
1 parent d47cdcc
commit aaf6cc7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/pkg/retry/retry.go b/pkg/retry/retry.go
@@ -35,7 +35,7 @@ func Do(f func() error) error {
 
 }
 
-func DoUntil(f func() error, ctx context.Context, timeout time.Duration) error {
+func DoUntil(ctx context.Context, f func() error, timeout time.Duration) error {
 	toctx, cancel := context.WithTimeout(ctx, timeout)
 	defer cancel()
 	return retry_v4.Do(f,

diff --git a/pkg/trafficmngr/iptables/iptables_restore.go b/pkg/trafficmngr/iptables/iptables_restore.go
@@ -98,17 +98,16 @@ func (iptr *ipTablesRestore) ApplyWithoutFlush(ctx context.Context, rules IPTabl
 
 	log.V(6).Infof("trying to run iptables-restore with payload %s", payload)
 
-	err := retry.DoUntil(func() error {
-		stdout, stderr, err := iptr.runWithOutput([]string{"--noflush"}, bytes.NewBuffer([]byte(payload)))
-		if err != nil {
-			log.Errorf("iptables-restore finished with error: %v", err)
-			log.Errorf("stdout: %s", stdout)
-			log.Errorf("stderr: %s", stderr)
-
-		}
-		return err
-	},
-		ctx,
+	err := retry.DoUntil(ctx,
+		func() error {
+			stdout, stderr, err := iptr.runWithOutput([]string{"--noflush"}, bytes.NewBuffer([]byte(payload)))
+			if err != nil {
+				log.Errorf("iptables-restore finished with error: %v", err)
+				log.Errorf("stdout: %s", stdout)
+				log.Errorf("stderr: %s", stderr)
+			}
+			return err
+		},
 		iptRestoreTimeout*time.Second)
 
 	if err != nil {