修改负载机制

Author: hwholiday

etcd/discovery/discovery.go

@@ -8,7 +8,6 @@ import (
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"google.golang.org/grpc/resolver"
 	"learning_tools/etcd/register"
-	"log"
 	"sync"
 )
 
@@ -23,8 +22,6 @@ type Discovery struct {
 	opts    *Options
 }
 
-const scheme = "grpclb"
-
 func NewDiscovery(opt ...ClientOptions) resolver.Builder {
 	s := &Discovery{
 		opts: newOptions(opt...),
@@ -82,7 +79,7 @@ func (d *Discovery) GetAddress() []resolver.Address {
 }
 
 func (d *Discovery) Scheme() string {
-	return scheme
+	return "discovery"
 }
 
 //watcher 监听前缀
@@ -101,7 +98,7 @@ func (d *Discovery) watcher() {
 }
 
 func (s *Discovery) ResolveNow(rn resolver.ResolveNowOptions) {
-	log.Println("ResolveNow")
+	//log.Println("ResolveNow")
 }
 
 func (s *Discovery) Close() {

etcd/register/register.go

@@ -10,9 +10,9 @@ import (
 
 type Register struct {
 	etcdCli       *clientv3.Client
-	leaseID       clientv3.LeaseID
 	keepAliveChan <-chan *clientv3.LeaseKeepAliveResponse
 	opts          *Options
+	name          string
 }
 
 func NewRegister(opt ...RegisterOptions) (*Register, error) {
@@ -34,16 +34,15 @@ func NewRegister(opt ...RegisterOptions) (*Register, error) {
 	if err != nil {
 		return s, err
 	}
-	_, err = etcdCli.Put(ctx,
-		fmt.Sprintf("%s/%s", s.opts.Node.Path, s.opts.Node.Id), string(data), clientv3.WithLease(resp.ID))
+	s.name = fmt.Sprintf("%s/%s", s.opts.Node.Path, s.opts.Node.Id)
+	_, err = etcdCli.Put(ctx, s.name, string(data), clientv3.WithLease(resp.ID))
 	if err != nil {
 		return s, err
 	}
 	s.keepAliveChan, err = etcdCli.KeepAlive(context.Background(), resp.ID)
 	if err != nil {
 		return s, err
 	}
-	s.leaseID = resp.ID
 	return s, nil
 }
 
@@ -55,7 +54,7 @@ func (s *Register) ListenKeepAliveChan() (isClose bool) {
 
 // Close 注销服务
 func (s *Register) Close() error {
-	if _, err := s.etcdCli.Revoke(context.Background(), s.leaseID); err != nil {
+	if _, err := s.etcdCli.Delete(context.Background(), s.name); err != nil {
 		return err
 	}
 	return s.etcdCli.Close()