修改负载机制

Author: hwholiday

etcd/discovery/version_balancer.go

@@ -48,6 +48,7 @@ type rrPicker struct {
 
 func (p *rrPicker) Pick(info balancer.PickInfo) (balancer.PickResult, error) {
 	p.mu.Lock()
+	defer p.mu.Unlock()
 	version := info.Ctx.Value("version")
 	var subConns []balancer.SubConn
 	for conn, node := range p.node {
@@ -62,7 +63,6 @@ func (p *rrPicker) Pick(info balancer.PickInfo) (balancer.PickResult, error) {
 	}
 	index := rand.Intn(len(subConns))
 	sc := subConns[index]
-	p.mu.Unlock()
 	return balancer.PickResult{SubConn: sc}, nil
 }
 

etcd/etcd-grpc/client_test.go

@@ -32,13 +32,12 @@ func TestClient(t *testing.T) {
 	}
 	defer conn.Close()
 	apiClient := api.NewApiClient(conn)
-	for i := 0; i < 100; i++ {
-		ctx := context.WithValue(context.Background(), "version", "v1")
-		_, err := apiClient.ApiTest(ctx, &api.Request{Input: fmt.Sprint(i)})
+	for {
+		ctx := context.WithValue(context.Background(), "version", "v2")
+		_, err := apiClient.ApiTest(ctx, &api.Request{Input: "v1v1v1v1v1"})
 		if err != nil {
 			fmt.Println(err)
 		}
 		time.Sleep(time.Second)
 	}
-	select {}
 }

etcd/etcd-grpc/server.go

@@ -22,8 +22,10 @@ func (a ApiService) ApiTest(ctx context.Context, request *api.Request) (*api.Res
 	return &api.Response{Output: "v1v1v1v1v1v1v1v1v1v1"}, nil
 }
 
+var Addr = "0.0.0.0:8089"
+
 func main() {
-	listener, err := net.Listen("tcp", "0.0.0.0:8089")
+	listener, err := net.Listen("tcp", Addr)
 	if err != nil {
 		log.Fatalf("net.Listen err: %v", err)
 	}
@@ -41,7 +43,7 @@ func main() {
 	}()
 	s, err := register.NewRegister(
 		register.SetName("hwholiday.srv.msg"),
-		register.SetAddress("0.0.0.0:8089"),
+		register.SetAddress(Addr),
 		register.SetVersion("v1"),
 		register.SetSrv(srv),
 		register.SetEtcdConf(clientv3.Config{
@@ -58,12 +60,13 @@ func main() {
 			c <- syscall.SIGQUIT
 		}
 	}()
+	fmt.Println("启动成功 === > ", Addr)
 	signal.Notify(c, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT)
 	for a := range c {
 		switch a {
 		case syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT:
 			fmt.Println("退出")
-			_ = s.Close()
+			fmt.Println(s.Close())
 			return
 		default:
 			return