fix

Signed-off-by: Kosuke Morimoto <[email protected]>
vdaas · Sep 6, 2024 · 48e0452 · 48e0452
1 parent ac1035b
commit 48e0452
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/internal/backoff/backoff.go b/internal/backoff/backoff.go
@@ -185,19 +185,21 @@ func (b *backoff) Do(
 				} else {
 					dur *= b.backoffFactor
 					jdur = b.addJitter(dur)
-					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
+					if cnt >= b.maxRetryCount {
+						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 nil, errors.Join(dctx.Err(), err)
 						}
-					default:
 					}
 				}
 			}