rancher/multus-cni
1
0
Fork 0
forked from github/multus-cni
Code Issues Pull Requests Projects Releases Wiki Activity

Cut the retry interval and timeout by half on pod retrieval

Browse Source 
Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>
This commit is contained in:
Miguel Duarte Barroso
2021-06-24 14:05:33 +02:00
committed by Tomofumi Hayashi
parent 1eeab9b589
commit 26ef3c3eb4
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/multus/multus.go
View File

@@ -549,10 +549,10 @@ func CmdAdd(args *skel.CmdArgs, exec invoke.Exec, kubeClient *k8s.ClientInfo) (c
pod, err = kubeClient.GetPod(string(k8sArgs.K8S_POD_NAMESPACE), string(k8sArgs.K8S_POD_NAME)) pod, err = kubeClient.GetPod(string(k8sArgs.K8S_POD_NAMESPACE), string(k8sArgs.K8S_POD_NAME))
if err != nil { if err != nil {
var waitErr error var waitErr error
// in case of a retriable error, retry 10 times with 0.5 sec interval // in case of a retriable error, retry 10 times with 0.25 sec interval
if isCriticalRequestRetriable(err) { if isCriticalRequestRetriable(err) {
pollDuration := 500 * time.Millisecond pollDuration := 250 * time.Millisecond
pollTimeout := 5 * time.Second pollTimeout := 2500 * time.Millisecond
waitErr = wait.PollImmediate(pollDuration, pollTimeout, func() (bool, error) { waitErr = wait.PollImmediate(pollDuration, pollTimeout, func() (bool, error) {
pod, err = kubeClient.GetPod(string(k8sArgs.K8S_POD_NAMESPACE), string(k8sArgs.K8S_POD_NAME)) pod, err = kubeClient.GetPod(string(k8sArgs.K8S_POD_NAMESPACE), string(k8sArgs.K8S_POD_NAME))
return pod != nil, err return pod != nil, err
@@ -776,10 +776,10 @@ func CmdDel(args *skel.CmdArgs, exec invoke.Exec, kubeClient *k8s.ClientInfo) er
pod, err = kubeClient.GetPod(string(k8sArgs.K8S_POD_NAMESPACE), string(k8sArgs.K8S_POD_NAME)) pod, err = kubeClient.GetPod(string(k8sArgs.K8S_POD_NAMESPACE), string(k8sArgs.K8S_POD_NAME))
if err != nil { if err != nil {
var waitErr error var waitErr error
// in case of a retriable error, retry 10 times with 0.5 sec interval // in case of a retriable error, retry 10 times with 0.25 sec interval
if isCriticalRequestRetriable(err) { if isCriticalRequestRetriable(err) {
pollDuration := 500 * time.Millisecond pollDuration := 250 * time.Millisecond
pollTimeout := 5 * time.Second pollTimeout := 2500 * time.Millisecond
waitErr = wait.PollImmediate(pollDuration, pollTimeout, func() (bool, error) { waitErr = wait.PollImmediate(pollDuration, pollTimeout, func() (bool, error) {
pod, err = kubeClient.GetPod(string(k8sArgs.K8S_POD_NAMESPACE), string(k8sArgs.K8S_POD_NAME)) pod, err = kubeClient.GetPod(string(k8sArgs.K8S_POD_NAMESPACE), string(k8sArgs.K8S_POD_NAME))
return pod != nil, err return pod != nil, err