fix: load balance logic

Author: coderi421

gmicro/app/app.go

@@ -198,9 +198,11 @@ func (a *App) buildInstance() (*registry.ServiceInstance, error) {
 	//if a.opts.registrar == nil {
 	//	a.opts.registrar = a.opts.defaultRegistrar()
 	//}
+	//这的地方的 Metadata 有一个功能是 加权负载均衡用的
 	return &registry.ServiceInstance{
 		ID:        a.opts.id,
 		Name:      a.opts.name,
 		Endpoints: endpoints,
+		//Metadata: map[string]string{"weight": "20"},
 	}, nil
 }

gmicro/server/rpcserver/resolver/direct/builder.go

@@ -16,7 +16,7 @@ func init() {
 NewBuilder creates a directBuilder which is used to factory direct resolvers.
 example:
 
-	direct://<authority>/127.0.0.1:9000
+	direct://<authority>/127.0.0.1:9000,127.0.0.2:9000
 
 到达这样一个目的
 */

gmicro/server/rpcserver/selector/node/ewma/node.go

@@ -166,7 +166,7 @@ func (n *Node) Pick() selector.DoneFunc {
 					success = 0
 				}
 			} else if errors.Is(context.DeadlineExceeded, di.Err) || errors.Is(context.Canceled, di.Err) ||
-				errors.FromGrpcErrorCode(di.Err) == int(codes.Unavailable) || errors.FromGrpcErrorCode(di.Err) == int(codes.DeadlineExceeded) {
+				errors.FromGrpcErrorCode(di.Err) == codes.Unavailable || errors.FromGrpcErrorCode(di.Err) == codes.DeadlineExceeded {
 				success = 0
 			}
 		}

gmicro/server/rpcserver/selector/wrr/wrr_test.go

@@ -0,0 +1,67 @@
+package wrr
+
+//
+//import (
+//	"context"
+//	"reflect"
+//	"testing"
+//
+//	"github.com/CoderI421/gframework/gmicro/server/rpcserver/registry"
+//	"github.com/CoderI421/gframework/gmicro/server/rpcserver/selector"
+//	"github.com/CoderI421/gframework/gmicro/server/rpcserver/selector/filter"
+//)
+//
+//func TestWrr(t *testing.T) {
+//	wrr := New()
+//	var nodes []selector.Node
+//	nodes = append(nodes, selector.NewNode(
+//		"http",
+//		"127.0.0.1:8080",
+//		&registry.ServiceInstance{
+//			ID:       "127.0.0.1:8080",
+//			Version:  "v2.0.0",
+//			Metadata: map[string]string{"weight": "10"},
+//		}))
+//	nodes = append(nodes, selector.NewNode(
+//		"http",
+//		"127.0.0.1:9090",
+//		&registry.ServiceInstance{
+//			ID:       "127.0.0.1:9090",
+//			Version:  "v2.0.0",
+//			Metadata: map[string]string{"weight": "20"},
+//		}))
+//	wrr.Apply(nodes)
+//	var count1, count2 int
+//	for i := 0; i < 90; i++ {
+//		n, done, err := wrr.Select(context.Background(), selector.WithNodeFilter(filter.Version("v2.0.0")))
+//		if err != nil {
+//			t.Errorf("expect no error, got %v", err)
+//		}
+//		if done == nil {
+//			t.Errorf("expect done callback, got nil")
+//		}
+//		if n == nil {
+//			t.Errorf("expect node, got nil")
+//		}
+//		done(context.Background(), selector.DoneInfo{})
+//		if n.Address() == "127.0.0.1:8080" {
+//			count1++
+//		} else if n.Address() == "127.0.0.1:9090" {
+//			count2++
+//		}
+//	}
+//	if !reflect.DeepEqual(count1, 30) {
+//		t.Errorf("expect 30, got %d", count1)
+//	}
+//	if !reflect.DeepEqual(count2, 60) {
+//		t.Errorf("expect 60, got %d", count2)
+//	}
+//}
+//
+//func TestEmpty(t *testing.T) {
+//	b := &Balancer{}
+//	_, _, err := b.Pick(context.Background(), []selector.WeightedNode{})
+//	if err == nil {
+//		t.Errorf("expect no error, got %v", err)
+//	}
+//}

pkg/errors/errors.go

@@ -159,7 +159,7 @@ func FromGrpcError(e error) error {
 	}
 }
 
-func FromGrpcErrorCode(e error) int {
+func FromGrpcErrorCode(e error) gCode.Code {
 	if e == nil {
 		return 100002
 	}
@@ -169,7 +169,7 @@ func FromGrpcErrorCode(e error) int {
 		return 100002
 	}
 
-	return int(st.Code())
+	return st.Code()
 }
 
 func ToGrpcError(e error) error {