fix

Signed-off-by: Kosuke Morimoto <[email protected]>
vdaas · Sep 9, 2024 · cdfdfc3 · cdfdfc3
1 parent e948201
commit cdfdfc3
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/internal/backoff/backoff.go b/internal/backoff/backoff.go
@@ -186,23 +186,25 @@ func (b *backoff) Do(
 					dur *= b.backoffFactor
 					jdur = b.addJitter(dur)
 				}
+				if cnt >= b.maxRetryCount-1 {
+					select {
+					case <-dctx.Done():
+						switch dctx.Err() {
+						case context.DeadlineExceeded:
+							log.Debugf("[backoff]\tfor: "+name+",\tDeadline Exceeded\terror: %v", err.Error())
+							return nil, errors.ErrBackoffTimeout(err)
+						case context.Canceled:
+							log.Debugf("[backoff]\tfor: "+name+",\tCanceled\terror: %v", err.Error())
+							return nil, err
+						default:
+							return nil, errors.Join(dctx.Err(), err)
+						}
+					default:
+					}
+				}
 			}
 		}
 	}
-	select {
-	case <-dctx.Done():
-		switch dctx.Err() {
-		case context.DeadlineExceeded:
-			log.Debugf("[backoff]\tfor: "+name+",\tDeadline Exceeded\terror: %v", err.Error())
-			return nil, errors.ErrBackoffTimeout(err)
-		case context.Canceled:
-			log.Debugf("[backoff]\tfor: "+name+",\tCanceled\terror: %v", err.Error())
-			return nil, err
-		default:
-			return nil, errors.Join(dctx.Err(), err)
-		}
-	default:
-	}
 	return res, err
 }