From f0517062fc8e736b06129e583f4ec233ee132c9f Mon Sep 17 00:00:00 2001 From: dougbtv Date: Mon, 10 Feb 2020 13:44:12 -0500 Subject: [PATCH] [bugfix] Fixes unnecessary wait when readinessindicatorfile is not present --- multus/multus.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/multus/multus.go b/multus/multus.go index 64b403110..e76bb8ef0 100644 --- a/multus/multus.go +++ b/multus/multus.go @@ -371,15 +371,15 @@ func cmdAdd(args *skel.CmdArgs, exec invoke.Exec, kubeClient k8s.KubeClient) (cn return nil, logging.Errorf("Multus: error getting k8s args: %v", err) } - wait.ExponentialBackoff(defaultReadinessBackoff, func() (bool, error) { - _, err := os.Stat(n.ReadinessIndicatorFile) - switch { - case err == nil: - return true, nil - default: - return false, nil + if n.ReadinessIndicatorFile != "" { + err := wait.ExponentialBackoff(defaultReadinessBackoff, func() (bool, error) { + _, err := os.Stat(n.ReadinessIndicatorFile) + return err == nil, nil + }) + if err != nil { + return nil, cmdErr(k8sArgs, "ExponentialBackoff error waiting for ReadinessIndicatorFile: %v", err) } - }) + } if n.ClusterNetwork != "" { err = k8s.GetDefaultNetworks(k8sArgs, n, kubeClient)