From 07e5793e6d7f29e255ff164acb2ac5272e17a8c3 Mon Sep 17 00:00:00 2001 From: Astone Date: Fri, 9 Feb 2018 14:52:50 +0800 Subject: [PATCH 1/2] remove mvccpb use clientv3 defined event type --- etcdv3/resolver.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/etcdv3/resolver.go b/etcdv3/resolver.go index 6592fbc..01702c2 100644 --- a/etcdv3/resolver.go +++ b/etcdv3/resolver.go @@ -14,7 +14,6 @@ import ( "time" "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/mvcc/mvccpb" "google.golang.org/grpc/resolver" ) @@ -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) From bf7e594068cdd2274c5236b28f1012f71695cd6a Mon Sep 17 00:00:00 2001 From: Astone Date: Fri, 9 Feb 2018 15:01:06 +0800 Subject: [PATCH 2/2] remove unexpected keepalive --- etcdv3/naming.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/etcdv3/naming.go b/etcdv3/naming.go index 4063847..51db1e2 100644 --- a/etcdv3/naming.go +++ b/etcdv3/naming.go @@ -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 }