Merge branch 'main' into feature/agent/rust/handle-rich-error-model

vdaas · Sep 12, 2024 · 06c7a5d · 06c7a5d
2 parents df1dd55 + 0e12419
commit 06c7a5d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/internal/backoff/backoff.go b/internal/backoff/backoff.go
@@ -186,6 +186,22 @@ 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:
+					}
+				}
 			}
 		}
 	}

diff --git a/versions/GO_VERSION b/versions/GO_VERSION
@@ -1 +1 @@
-1.23.0
+1.23.1