unistack-org/micro
4
0
Fork 3
Code Issues 20 Pull Requests 1 Actions Packages Projects Releases 281 Wiki Activity

New backoff (#1153)

Browse Source 
* new backoff function

* use backoff from util/backoff

* remove reset atemts

* change comment

* fmt
This commit is contained in:
tpam28 2020-02-02 23:32:55 +03:00 committed by GitHub
parent 079102ea59
commit 449bcb46fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/backoff.go
View File

@ -2,13 +2,13 @@ package client
import (
"context"
"math"
"time"
"github.com/micro/go-micro/v2/util/backoff"
)
type BackoffFunc func(ctx context.Context, req Request, attempts int) (time.Duration, error)
// exponential backoff is a function x^e multiplied by a factor of 0.1 second.
func exponentialBackoff(ctx context.Context, req Request, attempts int) (time.Duration, error) {
return time.Duration(math.Pow(float64(attempts), math.E)) * time.Millisecond * 100, nil
return backoff.Do(attempts), nil
}

12
network/default.go
View File

@ -225,9 +225,6 @@ func (n *network) acceptNetConn(l tunnel.Listener, recv chan *message) {
sleep := backoff.Do(i)
log.Debugf("Network tunnel [%s] accept error: %v, backing off for %v", ControlChannel, err, sleep)
time.Sleep(sleep)
if i > 5 {
i = 0
}
i++
continue
}
@ -255,10 +252,6 @@ func (n *network) acceptCtrlConn(l tunnel.Listener, recv chan *message) {
sleep := backoff.Do(i)
log.Debugf("Network tunnel [%s] accept error: %v, backing off for %v", ControlChannel, err, sleep)
time.Sleep(sleep)
if i > 5 {
// reset the counter
i = 0
}
i++
continue
}
@ -1572,11 +1565,6 @@ func (n *network) connect() {
case <-time.After(time.Second + backoff.Do(attempts)):
// we have to try again
attempts++
// reset attempts 5 == ~2mins
if attempts > 5 {
attempts = 0
}
}
}
}

8
util/backoff/backoff.go
View File

@ -6,9 +6,11 @@ import (
"time"
)
// Do is a function x^e multiplied by a factor of 0.1 second.
// Result is limited to 2 minute.
func Do(attempts int) time.Duration {
if attempts == 0 {
return time.Duration(0)
if attempts > 13 {
return 2 * time.Minute
}
return time.Duration(math.Pow(10, float64(attempts))) * time.Millisecond
return time.Duration(math.Pow(float64(attempts), math.E)) * time.Millisecond * 100
}