Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add backoff package and fix Consul CPU usage #635

Merged
merged 8 commits into from
Apr 2, 2018
Merged

Add backoff package and fix Consul CPU usage #635

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
924501a
Add backoff package
Dec 3, 2017
12eacfb
Merge branch 'master' into n/backoff
Mar 19, 2018
0ad6586
Revert "Add backoff package"
Mar 19, 2018
99319fb
Get rid of external package and update exponential
Mar 19, 2018
8c60620
Add instancer backoff
Mar 19, 2018
10620f3
Fix old exponential name
Mar 19, 2018
9e8371f
Add doc comment
Mar 31, 2018
dc88158
Fixup & respond to review
Apr 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions sd/consul/instancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ package consul
import (
"fmt"
"io"
"time"

consul "github.com/hashicorp/consul/api"

"github.com/go-kit/kit/log"
"github.com/go-kit/kit/sd"
"github.com/go-kit/kit/sd/internal/instance"
"github.com/go-kit/kit/util/conn"
)

const defaultIndex = 0
Expand Down Expand Up @@ -59,6 +61,7 @@ func (s *Instancer) loop(lastIndex uint64) {
var (
instances []string
err error
d time.Duration = time.Millisecond * 10
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

d = 10 * time.Millisecond is preferable here.

)
for {
instances, lastIndex, err = s.getInstances(lastIndex, s.quitc)
Expand All @@ -70,6 +73,8 @@ func (s *Instancer) loop(lastIndex uint64) {
s.cache.Update(sd.Event{Err: err})
default:
s.cache.Update(sd.Event{Instances: instances})
time.Sleep(d)
d = conn.Exponential(d)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for not catching this earlier. We want to implement an upper limit e.g. 30s, and have a successful reconnect reset the d value to its default state.

}
}
}
Expand Down
8 changes: 6 additions & 2 deletions util/conn/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package conn

import (
"errors"
"math/rand"
"net"
"time"

Expand Down Expand Up @@ -103,7 +104,7 @@ func (m *Manager) loop() {
case conn = <-connc:
if conn == nil {
// didn't work
backoff = exponential(backoff) // wait longer
backoff = Exponential(backoff) // wait longer
reconnectc = m.after(backoff) // try again
} else {
// worked!
Expand Down Expand Up @@ -132,12 +133,15 @@ func dial(d Dialer, network, address string, logger log.Logger) net.Conn {
return conn
}

func exponential(d time.Duration) time.Duration {
func Exponential(d time.Duration) time.Duration {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we get some doc string here? :)

d *= 2
jitter := rand.Float64() + 0.5
d = time.Duration(int64(float64(d.Nanoseconds()) * jitter))
if d > time.Minute {
d = time.Minute
}
return d

}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm thinking a 1-line change can be enough, something like this, feel free to make corrections...

func exponential(d time.Duration) time.Duration {
    d *= 2
    if d > time.Minute {
        d = time.Minute
    }
    return d * (rand.Float64() + 0.5)
}


// ErrConnectionUnavailable is returned by the Manager's Write method when the
Expand Down