Skip to content

optimize #19

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

Open
acynothia wants to merge 2 commits into
base: master
Choose a base branch
from
+2 −8
Open

optimize #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07e5793
remove mvccpb
acynothia Feb 9, 2018
bf7e594
remove unexpected keepalive
acynothia Feb 9, 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: 0 additions & 5 deletions etcdv3/naming.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,6 @@ func withAlive(name string, addr string, ttl int64) error {
if err != nil {
return err
}

_, err = cli.KeepAlive(context.Background(), leaseResp.ID)
if err != nil {
return err
}
return nil
}

Expand Down
5 changes: 2 additions & 3 deletions etcdv3/resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
"time"

"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/mvcc/mvccpb"
"google.golang.org/grpc/resolver"
)

Expand Down Expand Up @@ -84,12 +83,12 @@ func (r *etcdResolver) watch(keyPrefix string) {
for _, ev := range n.Events {
addr := strings.TrimPrefix(string(ev.Kv.Key), keyPrefix)
switch ev.Type {
case mvccpb.PUT:
case clientv3.EventTypePut:
if !exist(addrList, addr) {
addrList = append(addrList, resolver.Address{Addr: addr})
r.cc.NewAddress(addrList)
}
case mvccpb.DELETE:
case clientv3.EventTypeDelete:
if s, ok := remove(addrList, addr); ok {
addrList = s
r.cc.NewAddress(addrList)
Expand Down