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

refactor server code and bugfix #19

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

refactor server code and bugfix #19

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0d09057
Refactor leader-elect related code (#1)
BlueBlue-Lee Nov 30, 2017
6629c0b
Refactor doorman server code and repaire client-connect bug
BlueBlue-Lee Nov 30, 2017
3f85fd6
Bug-fix: doorman client should new client with addrs instead of addr
BlueBlue-Lee Dec 1, 2017
ebb3656
Refactor rate limiter code and add inflight rate limiter (#2)
BlueBlue-Lee Dec 4, 2017
228f749
Election bugfix (#3)
BlueBlue-Lee Dec 4, 2017
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
Prev Previous commit
Election bugfix (#3) 
* Refactor rate limiter code and add inflight rate limiter

* InFlightRateLimiter: take ctx.Done into consideration and bug fix

* etcdElection:  bug fix, client retry should sleep interval
  • Loading branch information
@BlueBlue-Lee
BlueBlue-Lee committed Dec 4, 2017
commit 228f7494c668fced09492663de753f60540f5d7f
15 changes: 8 additions & 7 deletions go/server/election/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,18 +123,19 @@ func (e *etcdElection) campaignAndRenew(ctx context.Context, id string) {
for {
time.Sleep(e.lease / 5)
log.V(2).Infof("Renewing mastership lease at %v as %v", e.lock, id)
_, err := e.client.Set(ctx, e.lock, id, &client.SetOptions{
TTL: e.lease,
PrevExist: client.PrevExist,
PrevValue: id,
})

for retry := 0; retry < 2; retry++ {
var err error
for retry := 0; retry < 3; retry++ {
_, err = e.client.Set(ctx, e.lock, id, &client.SetOptions{
TTL: e.lease,
PrevExist: client.PrevExist,
PrevValue: id,
})

if err != nil {
time.Sleep(e.lease / 5)
} else {
break
}
}

if err != nil {
Expand Down