admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-07 19:31:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

avoid sleep to ctx done during retry (#27992) (#28092)

Browse Source 
Signed-off-by: Wei Liu <wei.liu@zilliz.com>
This commit is contained in:
wei liu 2023-11-02 09:02:15 +08:00 committed by GitHub
parent 76b06abc29
commit e2e2487f40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/util/retry/retry.go
View File

@ -53,6 +53,12 @@ func Do(ctx context.Context, fn func() error, opts ...Option) error {
return el
}
deadline, ok := ctx.Deadline()
if ok && time.Until(deadline) < c.sleep {
// to avoid sleep until ctx done
return el
}
select {
case <-time.After(c.sleep):
case <-ctx.Done():

6
pkg/util/retry/retry_test.go
View File

@ -63,6 +63,12 @@ func TestMaxSleepTime(t *testing.T) {
err := Do(ctx, testFn, Attempts(3), MaxSleepTime(200*time.Millisecond))
assert.Error(t, err)
t.Log(err)
ctx, cancel := context.WithTimeout(ctx, 1*time.Second)
defer cancel()
err = Do(ctx, testFn, Attempts(10), MaxSleepTime(200*time.Millisecond))
assert.Error(t, err)
assert.Nil(t, ctx.Err())
}
func TestSleep(t *testing.T) {