Temp commit

binchencoder · binchencoder · commit efc969269c55 · 2022-03-24T12:46:32.000+08:00
diff --git a/client/client.go b/client/client.go
@@ -27,18 +27,10 @@ type ServiceCli interface {
 	// only needs to be called once, on any of those instances.
 	EnableHistogram()
 
-	// EnableResolveFullEps enables to resolve full endpoints.
-	// Deprecated: This method will be removed in future.
-	EnableResolveFullEps()
-
 	// EnableFailFast makes service client doesn't wait for service to become
 	// available in Start().
 	EnableFailFast()
 
-	// DisableResolveFullEps disables resolving full endpoints.
-	// Deprecated: This method will be removed in future.
-	DisableResolveFullEps()
-
 	// AddUnaryInterceptor adds a unary client interceptor to the client.
 	AddUnaryInterceptor(incept grpc.UnaryClientInterceptor)
 
diff --git a/client/locator.go b/client/locator.go
@@ -7,6 +7,7 @@ import (
 	"github.com/binchencoder/letsgo/flags"
 	"github.com/binchencoder/skylb-apiv2/client/option"
 	"github.com/binchencoder/skylb-apiv2/naming"
+	"github.com/binchencoder/skylb-apiv2/resolver"
 
 	"github.com/binchencoder/skylb-apiv2/internal/skylb"
 	pb "github.com/binchencoder/skylb-apiv2/proto"
@@ -23,6 +24,8 @@ var (
 
 func init() {
 	flag.Var(&DebugSvcEndpoints, "debug-svc-endpoint", "The debug service endpoint. If not empty, disable SkyLB resolving for that service.")
+
+	resolver.Register()
 }
 
 // ServiceLocator defines the interface through which the client app locates
diff --git a/internal/rpccli/rpc.go b/internal/rpccli/rpc.go
@@ -51,6 +51,7 @@ func NewGrpcClient(ctx context.Context) (pb.SkylbClient, error) {
 	}
 	glog.Infof("Resolved SkyLB instances %s", addrs)
 
+	// TODO(chenbin) 这里不要随机取
 	switch len(addrs) {
 	case 0:
 		return nil, fmt.Errorf("No SkyLB instances found")
diff --git a/resolver/internal/directbuilder.go b/resolver/internal/directbuilder.go
@@ -3,14 +3,10 @@ package internal
 import (
 	"strings"
 
-	pb "github.com/binchencoder/skylb-apiv2/proto"
 	"google.golang.org/grpc/resolver"
 )
 
-type directBuilder struct {
-	endpoint *pb.InstanceEndpoint
-	spec     *pb.ServiceSpec
-}
+type directBuilder struct{}
 
 // Build
 func (d *directBuilder) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOptions) (
@@ -31,7 +27,7 @@ func (d *directBuilder) Build(target resolver.Target, cc resolver.ClientConn, op
 		return nil, err
 	}
 
-	return &nopResolver{cc: cc}, nil
+	return &skylbResolver{cc: cc}, nil
 }
 
 func (b *directBuilder) Scheme() string {
diff --git a/resolver/internal/resolver.go b/resolver/internal/resolver.go
@@ -37,22 +37,12 @@ var (
 	directResolverBuilder directBuilder
 )
 
-// RegisterResolver registers the skylb schemes to the resolver.
+// RegisterResolver registers the direct and skylb schemes to the resolver.
 func RegisterResolver() {
 	resolver.Register(&directResolverBuilder)
 	resolver.Register(&skylbResolverBuilder)
 }
 
-type skylbResolver struct {
-	cc resolver.ClientConn
-}
-
-func (r *skylbResolver) Close() {
-}
-
-func (r *skylbResolver) ResolveNow(options resolver.ResolveNowOptions) {
-}
-
 type nopResolver struct {
 	cc resolver.ClientConn
 }
diff --git a/resolver/target.go b/resolver/target.go
@@ -9,20 +9,20 @@ import (
 
 // BuildSkyLBTarget returns a string that represents the given endpoints with skylb schema.
 func BuildSkyLBTarget(addrs string) string {
-	if len(addrs) == 0 {
+	addrs = strings.TrimSpace(addrs)
+	if addrs == "" {
 		return addrs
 	}
 
-	addrs = strings.TrimSpace(addrs)
 	return fmt.Sprintf("%s://%s", internal.SkyLBScheme, addrs)
 }
 
 // BuildDirectTarget returns a string that represents the given endpoints with direct schema.
 func BuildDirectTarget(addrs string) string {
-	if len(addrs) == 0 {
+	addrs = strings.TrimSpace(addrs)
+	if addrs == "" {
 		return addrs
 	}
 
-	addrs = strings.TrimSpace(addrs)
 	return fmt.Sprintf("%s://%s", internal.DirectScheme, addrs)
 }

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ func NewGrpcClient(ctx context.Context) (pb.SkylbClient, error) {`
`51`	`51`	`}`
`52`	`52`	`glog.Infof("Resolved SkyLB instances %s", addrs)`
`53`	`53`
	`54`	`+ // TODO(chenbin) 这里不要随机取`
`54`	`55`	`switch len(addrs) {`
`55`	`56`	`case 0:`
`56`	`57`	`return nil, fmt.Errorf("No SkyLB instances found")`
Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,10 @@ package internal`
`3`	`3`	`import (`
`4`	`4`	`"strings"`
`5`	`5`
`6`		`- pb "github.com/binchencoder/skylb-apiv2/proto"`
`7`	`6`	`"google.golang.org/grpc/resolver"`
`8`	`7`	`)`
`9`	`8`
`10`		`-type directBuilder struct {`
`11`		`- endpoint *pb.InstanceEndpoint`
`12`		`- spec *pb.ServiceSpec`
`13`		`-}`
	`9`	`+type directBuilder struct{}`
`14`	`10`
`15`	`11`	`// Build`
`16`	`12`	`func (d *directBuilder) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOptions) (`
`@@ -31,7 +27,7 @@ func (d *directBuilder) Build(target resolver.Target, cc resolver.ClientConn, op`
`31`	`27`	`return nil, err`
`32`	`28`	`}`
`33`	`29`
`34`		`- return &nopResolver{cc: cc}, nil`
	`30`	`+ return &skylbResolver{cc: cc}, nil`
`35`	`31`	`}`
`36`	`32`
`37`	`33`	`func (b *directBuilder) Scheme() string {`
Original file line number	Diff line number	Diff line change
`@@ -9,20 +9,20 @@ import (`
`9`	`9`
`10`	`10`	`// BuildSkyLBTarget returns a string that represents the given endpoints with skylb schema.`
`11`	`11`	`func BuildSkyLBTarget(addrs string) string {`
`12`		`- if len(addrs) == 0 {`
	`12`	`+ addrs = strings.TrimSpace(addrs)`
	`13`	`+ if addrs == "" {`
`13`	`14`	`return addrs`
`14`	`15`	`}`
`15`	`16`
`16`		`- addrs = strings.TrimSpace(addrs)`
`17`	`17`	`return fmt.Sprintf("%s://%s", internal.SkyLBScheme, addrs)`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`// BuildDirectTarget returns a string that represents the given endpoints with direct schema.`
`21`	`21`	`func BuildDirectTarget(addrs string) string {`
`22`		`- if len(addrs) == 0 {`
	`22`	`+ addrs = strings.TrimSpace(addrs)`
	`23`	`+ if addrs == "" {`
`23`	`24`	`return addrs`
`24`	`25`	`}`
`25`	`26`
`26`		`- addrs = strings.TrimSpace(addrs)`
`27`	`27`	`return fmt.Sprintf("%s://%s", internal.DirectScheme, addrs)`
`28`	`28`	`}`