grpc: fix deprecate grpc.DialContext and grpc.WithBlock

Use `grpc.NewClient` instead of `grpc.DialContext`. According https://github.com/grpc/grpc-go/blob/master/Documentation/anti-patterns.md don't use `WithBlock`. Signed-off-by: Andrey Butusov <[email protected]>
nspcc-dev · Sep 17, 2024 · e0af43c · e0af43c
1 parent 9c03eca
commit e0af43c
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 32 deletions.
diff --git a/cmd/neofs-cli/modules/tree/add.go b/cmd/neofs-cli/modules/tree/add.go
@@ -50,7 +50,7 @@ func add(cmd *cobra.Command, _ []string) {
 	meta, err := parseMeta(cmd)
 	common.ExitOnErr(cmd, "meta data parsing: %w", err)
 
-	cli, err := _client(ctx)
+	cli, err := _client()
 	common.ExitOnErr(cmd, "client: %w", err)
 
 	rawCID := make([]byte, sha256.Size)

diff --git a/cmd/neofs-cli/modules/tree/add_by_path.go b/cmd/neofs-cli/modules/tree/add_by_path.go
@@ -54,7 +54,7 @@ func addByPath(cmd *cobra.Command, _ []string) {
 
 	tid, _ := cmd.Flags().GetString(treeIDFlagKey)
 
-	cli, err := _client(ctx)
+	cli, err := _client()
 	common.ExitOnErr(cmd, "client: %w", err)
 
 	rawCID := make([]byte, sha256.Size)

diff --git a/cmd/neofs-cli/modules/tree/client.go b/cmd/neofs-cli/modules/tree/client.go
@@ -1,9 +1,7 @@
 package tree
 
 import (
-	"context"
 	"strings"
-	"time"
 
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags"
 	"github.com/nspcc-dev/neofs-node/pkg/network"
@@ -15,26 +13,20 @@ import (
 
 // _client returns grpc Tree service client. Should be removed
 // after making Tree API public.
-func _client(ctx context.Context) (tree.TreeServiceClient, error) {
+func _client() (tree.TreeServiceClient, error) {
 	var netAddr network.Address
 	err := netAddr.FromString(viper.GetString(commonflags.RPC))
 	if err != nil {
 		return nil, err
 	}
 
-	opts := make([]grpc.DialOption, 1, 2)
-	opts[0] = grpc.WithBlock()
+	opts := make([]grpc.DialOption, 0, 1)
 
 	if !strings.HasPrefix(netAddr.URIAddr(), "grpcs:") {
 		opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	}
 
-	// a default connection establishing timeout
-	const defaultClientConnectTimeout = time.Second * 2
-
-	ctx, cancel := context.WithTimeout(ctx, defaultClientConnectTimeout)
-	cc, err := grpc.DialContext(ctx, netAddr.URIAddr(), opts...)
-	cancel()
+	cc, err := grpc.NewClient(netAddr.URIAddr(), opts...)
 
 	return tree.NewTreeServiceClient(cc), err
 }
diff --git a/cmd/neofs-cli/modules/tree/get_by_path.go b/cmd/neofs-cli/modules/tree/get_by_path.go
@@ -54,7 +54,7 @@ func getByPath(cmd *cobra.Command, _ []string) {
 
 	tid, _ := cmd.Flags().GetString(treeIDFlagKey)
 
-	cli, err := _client(ctx)
+	cli, err := _client()
 	common.ExitOnErr(cmd, "client: %w", err)
 
 	rawCID := make([]byte, sha256.Size)

diff --git a/cmd/neofs-cli/modules/tree/list.go b/cmd/neofs-cli/modules/tree/list.go
@@ -42,7 +42,7 @@ func list(cmd *cobra.Command, _ []string) {
 	err := cnr.DecodeString(cidString)
 	common.ExitOnErr(cmd, "decode container ID string: %w", err)
 
-	cli, err := _client(ctx)
+	cli, err := _client()
 	common.ExitOnErr(cmd, "client: %w", err)
 
 	rawCID := make([]byte, sha256.Size)

diff --git a/pkg/services/tree/cache.go b/pkg/services/tree/cache.go
@@ -1,7 +1,6 @@
 package tree
 
 import (
-	"context"
 	"errors"
 	"fmt"
 	"strings"
@@ -26,9 +25,8 @@ type cacheItem struct {
 }
 
 const (
-	defaultClientCacheSize      = 10
-	defaultClientConnectTimeout = time.Second * 2
-	defaultReconnectInterval    = time.Second * 15
+	defaultClientCacheSize   = 10
+	defaultReconnectInterval = time.Second * 15
 )
 
 var errRecentlyFailed = errors.New("client has recently failed")
@@ -42,7 +40,7 @@ func (c *clientCache) init() {
 	c.LRU = *l
 }
 
-func (c *clientCache) get(ctx context.Context, netmapAddr string) (TreeServiceClient, error) {
+func (c *clientCache) get(netmapAddr string) (TreeServiceClient, error) {
 	c.Lock()
 	ccInt, ok := c.LRU.Get(netmapAddr)
 	c.Unlock()
@@ -61,7 +59,7 @@ func (c *clientCache) get(ctx context.Context, netmapAddr string) (TreeServiceCl
 		}
 	}
 
-	cc, err := dialTreeService(ctx, netmapAddr)
+	cc, err := dialTreeService(netmapAddr)
 	lastTry := time.Now()
 
 	c.Lock()
@@ -79,23 +77,18 @@ func (c *clientCache) get(ctx context.Context, netmapAddr string) (TreeServiceCl
 	return NewTreeServiceClient(cc), nil
 }
 
-func dialTreeService(ctx context.Context, netmapAddr string) (*grpc.ClientConn, error) {
+func dialTreeService(netmapAddr string) (*grpc.ClientConn, error) {
 	var netAddr network.Address
 	if err := netAddr.FromString(netmapAddr); err != nil {
 		return nil, err
 	}
 
-	opts := make([]grpc.DialOption, 1, 2)
-	opts[0] = grpc.WithBlock()
+	opts := make([]grpc.DialOption, 0, 1)
 
 	// FIXME(@fyrchik): ugly hack #1322
 	if !strings.HasPrefix(netAddr.URIAddr(), "grpcs:") {
 		opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	}
 
-	ctx, cancel := context.WithTimeout(ctx, defaultClientConnectTimeout)
-	cc, err := grpc.DialContext(ctx, netAddr.URIAddr(), opts...)
-	cancel()
-
-	return cc, err
+	return grpc.NewClient(netAddr.URIAddr(), opts...)
 }
diff --git a/pkg/services/tree/redirect.go b/pkg/services/tree/redirect.go
@@ -24,7 +24,7 @@ func (s *Service) forEachNode(ctx context.Context, cntNodes []netmapSDK.NodeInfo
 	for _, n := range cntNodes {
 		var stop bool
 		n.IterateNetworkEndpoints(func(endpoint string) bool {
-			c, err := s.cache.get(ctx, endpoint)
+			c, err := s.cache.get(endpoint)
 			if err != nil {
 				return false
 			}

diff --git a/pkg/services/tree/replicator.go b/pkg/services/tree/replicator.go
@@ -66,7 +66,7 @@ func (s *Service) replicationWorker(ctx context.Context) {
 			task.n.IterateNetworkEndpoints(func(addr string) bool {
 				lastAddr = addr
 
-				c, err := s.cache.get(ctx, addr)
+				c, err := s.cache.get(addr)
 				if err != nil {
 					lastErr = fmt.Errorf("can't create client: %w", err)
 					return false

diff --git a/pkg/services/tree/sync.go b/pkg/services/tree/sync.go
@@ -156,7 +156,7 @@ func (s *Service) synchronizeTree(ctx context.Context, d pilorama.CIDDescriptor,
 				return false
 			}
 
-			cc, err := grpc.DialContext(ctx, a.URIAddr(), grpc.WithTransportCredentials(insecure.NewCredentials()))
+			cc, err := grpc.NewClient(a.URIAddr(), grpc.WithTransportCredentials(insecure.NewCredentials()))
 			if err != nil {
 				// Failed to connect, try the next address.
 				return false