added balancers.NoDiscovery() balancer + changed balancers.SingleConn() as alias to balancers.NoDiscovery()

Author: asmyasnikov

balancers/balancers.go

@@ -21,12 +21,16 @@ func RandomChoice() *balancerConfig.Config {
 	return &balancerConfig.Config{}
 }
 
-func SingleConn() *balancerConfig.Config {
+func NoDiscovery() *balancerConfig.Config {
 	return &balancerConfig.Config{
-		SingleConn: true,
+		NoDiscovery: true,
 	}
 }
 
+func SingleConn() *balancerConfig.Config {
+	return NoDiscovery()
+}
+
 type filterLocalDC struct{}
 
 func (filterLocalDC) Allow(info balancerConfig.Info, e endpoint.Info) bool {

balancers/config_test.go

@@ -25,19 +25,19 @@ func TestFromConfig(t *testing.T) {
 		{
 			name:   "disable",
 			config: `disable`,
-			res:    balancerConfig.Config{SingleConn: true},
+			res:    balancerConfig.Config{NoDiscovery: true},
 		},
 		{
 			name:   "single",
 			config: `single`,
-			res:    balancerConfig.Config{SingleConn: true},
+			res:    balancerConfig.Config{NoDiscovery: true},
 		},
 		{
 			name: "single/JSON",
 			config: `{
 				"type": "single"
 			}`,
-			res: balancerConfig.Config{SingleConn: true},
+			res: balancerConfig.Config{NoDiscovery: true},
 		},
 		{
 			name:   "round_robin",

config/defaults_test.go

@@ -1,8 +1,10 @@
-package config
+package config_test
 
 import (
 	"context"
 	"fmt"
+	"github.com/ydb-platform/ydb-go-sdk/v3"
+	"github.com/ydb-platform/ydb-go-sdk/v3/config"
 	"net"
 	"sync"
 	"testing"
@@ -145,11 +147,11 @@ func (d *CustomDialer) DialContext(ctx context.Context, addr string) (net.Conn,
 	d.mu.Unlock()
 
 	// Log the dial attempt
-	fmt.Printf("Attempting to dial %s (attempt #%d)\n", addr, attemptCount)
+	fmt.Printf("Attempting to dial '%s' (attempt #%d)\n", addr, attemptCount)
 
 	if exists && delay > 0 {
 		// Simulating connection delay or timeout
-		fmt.Printf("Simulating delay of %v for %s\n", delay, addr)
+		fmt.Printf("Simulating delay of %v for '%s'\n", delay, addr)
 
 		select {
 		case <-time.After(delay):
@@ -286,21 +288,23 @@ func TestGRPCLoadBalancingPolicies(t *testing.T) {
 			t.Logf("Attempting to connect with %s balancing policy", tc.balancingPolicy)
 
 			// Establish connection with our balancing policy
-			conn, err := grpc.DialContext(
-				ctx,
-				"test:///unused",
-				grpc.WithContextDialer(dialer.DialContext),
-				grpc.WithTransportCredentials(insecure.NewCredentials()),
-				grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"loadBalancingPolicy": "%s"}`, tc.balancingPolicy)),
-				grpc.WithBlock(),
+			db, err := ydb.Open(ctx, "test://localhost:12345/local", // Используем схему test: которую мы зарегистрировали для manual resolver
+				//ydb.WithBalancer(balancers.NoDiscovery()),
+				ydb.With(config.WithGrpcOptions(
+					grpc.WithResolvers(r),
+					grpc.WithContextDialer(dialer.DialContext),
+					grpc.WithTransportCredentials(insecure.NewCredentials()),
+					grpc.WithDefaultServiceConfig(fmt.Sprintf(`{"loadBalancingPolicy": "%s"}`, tc.balancingPolicy)),
+					//grpc.WithBlock(),
+				)),
 			)
 
 			dialDuration := time.Since(dialStart)
 
 			if err != nil {
 				t.Fatalf("Failed to dial: %v", err)
 			}
-			defer conn.Close()
+			defer db.Close(ctx)
 
 			// Log all dial attempts
 			t.Logf("Connection established in %v", dialDuration)
@@ -310,7 +314,7 @@ func TestGRPCLoadBalancingPolicies(t *testing.T) {
 			}
 
 			// Create client and make a request
-			client := NewSimpleServiceClient(conn)
+			client := NewSimpleServiceClient(ydb.GRPCConn(db))
 			_, err = client.Ping(context.Background(), &emptypb.Empty{})
 			if err != nil {
 				t.Fatalf("Ping failed: %v", err)

internal/balancer/balancer.go

@@ -257,7 +257,7 @@ func New(ctx context.Context, driverConfig *config.Config, pool *conn.Pool, opts
 		b.balancerConfig = *config
 	}
 
-	if b.balancerConfig.SingleConn {
+	if b.balancerConfig.NoDiscovery {
 		b.applyDiscoveredEndpoints(ctx, []endpoint.Endpoint{
 			endpoint.New(driverConfig.Endpoint()),
 		}, "")

internal/balancer/config/routerconfig.go

@@ -12,13 +12,13 @@ import (
 type Config struct {
 	Filter          Filter
 	AllowFallback   bool
-	SingleConn      bool
+	NoDiscovery     bool
 	DetectNearestDC bool
 }
 
 func (c Config) String() string {
-	if c.SingleConn {
-		return "SingleConn"
+	if c.NoDiscovery {
+		return "NoDiscovery"
 	}
 
 	buffer := xstring.Buffer()