-
Notifications
You must be signed in to change notification settings - Fork 335
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
improve: use ctx and timer instead sleep
- Loading branch information
Showing
12 changed files
with
266 additions
and
142 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package internal | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "time" | ||
| ) | ||
|
|
||
| type OpFn[T any] func() (T, error) | ||
|
|
||
| // Retry the given operation until the returned error is nil or the context is done. | ||
| func Retry[T any](ctx context.Context, op OpFn[T], nextDuration func(error) time.Duration) (T, error) { | ||
| var ( | ||
| timer *time.Timer | ||
| res T | ||
| err error | ||
| ) | ||
|
|
||
| cleanTimer := func() { | ||
| if timer != nil { | ||
| timer.Stop() | ||
| } | ||
| } | ||
| defer cleanTimer() | ||
|
|
||
| for { | ||
| res, err = op() | ||
| if err == nil { | ||
| return res, nil | ||
| } | ||
|
|
||
| duration := nextDuration(err) | ||
| if timer == nil { | ||
| timer = time.NewTimer(duration) | ||
| } else { | ||
| timer.Reset(duration) | ||
| } | ||
|
|
||
| select { | ||
| case <-ctx.Done(): | ||
| return res, errors.Join(ctx.Err(), err) | ||
| case <-timer.C: | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package internal | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestRetryWithCtxBackground(t *testing.T) { | ||
| ctx := context.Background() | ||
| i := 0 | ||
| res, err := Retry(ctx, func() (string, error) { | ||
| if i == 2 { | ||
| return "ok", nil | ||
| } | ||
| i++ | ||
| return "", errors.New("error") | ||
| }, func(_ error) time.Duration { | ||
| return 1 * time.Second | ||
| }) | ||
| require.NoError(t, err) | ||
| require.Equal(t, "ok", res) | ||
| } | ||
|
|
||
| func TestRetryWithCtxTimeout(t *testing.T) { | ||
| ctx, cancelFn := context.WithTimeout(context.Background(), 2*time.Second) | ||
| defer cancelFn() | ||
| retryErr := errors.New("error") | ||
| res, err := Retry(ctx, func() (string, error) { | ||
| return "", retryErr | ||
| }, func(err error) time.Duration { | ||
| require.Equal(t, retryErr, err) | ||
| return 1 * time.Second | ||
| }) | ||
| require.ErrorIs(t, err, context.DeadlineExceeded) | ||
| require.ErrorContains(t, err, retryErr.Error()) | ||
| require.Equal(t, "", res) | ||
| } |
Oops, something went wrong.