New version of tree/pool selects tree service connection to make request based on the current net map and container placement policy

Signed-off-by: Marina Biryukova <m.biryukova@yadro.com>

@@ -3,6 +3,7 @@ module git.frostfs.info/TrueCloudLab/frostfs-sdk-go
 go 1.22
 
 require (
+	git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.16.0

@@ -0,0 +1,110 @@
+package network

@@ -725,4 +731,2 @@
 }
 
-// startRebalance runs loop to monitor tree client healthy status.
-func (p *Pool) startRebalance(ctx context.Context) {

@@ -76,0 +81,4 @@
+}
+
+type PlacementPolicySource interface {
+	PlacementPolicy(cnrID cid.ID) (netmap.PlacementPolicy, bool)

@@ -844,1 +774,3 @@
-			if cl, err = p.innerPools[indexI].clients[indexJ].serviceClient(); err == nil {
+			treeCl, ok := p.clientMap[cnrNode.Hash()]
+			if !ok {
+				treeCl, err = p.getNewTreeClient(ctx, cnrNode)

@@ -75,1 +77,4 @@
 	maxRequestAttempts      int
+	netMapSource            NetMapSource
+	placementPolicySource   PlacementPolicySource
+	v2                      bool

@@ -76,0 +84,4 @@
+	NetMapSnapshot(ctx context.Context) (netmap.NetMap, error)
+}
+
+type PlacementPolicySource interface {

@@ -253,3 +288,2 @@
 func (p *Pool) Dial(ctx context.Context) error {
-	inner := make([]*innerPool, len(p.rebalanceParams.nodesGroup))
-	var atLeastOneHealthy bool
+	if !p.v2 {

@@ -334,6 +372,21 @@ func (x *InitParameters) SetMaxRequestAttempts(maxAttempts int) {
 	x.maxRequestAttempts = maxAttempts
 }
 
+// UseV2 sets flag for using net map to prioritize tree services.

@@ -337,0 +383,4 @@
+}
+
+// SetPlacementPolicySource sets implementation of interface to get container placement policy.
+func (x *InitParameters) SetPlacementPolicySource(placementPolicySource PlacementPolicySource) {

@@ -866,10 +930,120 @@ LOOP:
 	return finErr
 }
 
+func (p *Pool) requestWithRetryContainerNodes(ctx context.Context, cid cid.ID, fn func(client *rpcclient.Client) error) error {

@@ -869,0 +966,4 @@
+			if attempts == 0 {
+				break LOOP
+			}
+			attempts--

@@ -869,0 +968,4 @@
+			}
+			attempts--
+
+			treeCl, ok := p.clientMap[cnrNode.Hash()]

@@ -871,2 +1038,4 @@
 }
 
+func shouldRedial(err error) bool {
+	if err == nil || errors.Is(err, ErrNodeAccessDenied) || errors.Is(err, ErrNodeNotFound) || errors.Is(err, errNodeEmptyResult) {

@@ -0,0 +1,110 @@
+package network

@@ -14,6 +14,7 @@ require (
 	github.com/klauspost/reedsolomon v1.12.1
 	github.com/mailru/easyjson v0.7.7
 	github.com/mr-tron/base58 v1.2.0
+	github.com/multiformats/go-multiaddr v0.12.1

@@ -99,1 +107,3 @@
-	startIndicesMtx sync.RWMutex
+	netMapInfoSource NetMapInfoSource
+
+	mutex sync.RWMutex

@@ -251,6 +269,10 @@ func NewPool(options InitParameters) (*Pool, error) {
 //
 // See also InitParameters.SetClientRebalanceInterval.
 func (p *Pool) Dial(ctx context.Context) error {
+	if p.netMapInfoSource != nil {

@@ -869,0 +997,4 @@
+	return cl, ok
+}
+
+func (p *Pool) setClientToMap(hash uint64, cl client) {

@@ -871,2 +1044,4 @@
 }
 
+func shouldRedial(ctx context.Context, err error) bool {
+	if err == nil || errors.Is(err, ErrNodeAccessDenied) || errors.Is(err, ErrNodeNotFound) || errors.Is(err, errNodeEmptyResult) || errors.Is(ctx.Err(), context.Canceled) {

@@ -362,0 +506,4 @@
+	return res
+}
+
+func reorderKeys(nodeKeys []*keys.PrivateKey, cnrNodes [][]netmap.NodeInfo) []*keys.PrivateKey {

@@ -869,0 +969,4 @@
+			if cl, err = treeCl.serviceClient(); err == nil {
+				err = fn(cl)
+			}
+			if shouldRedial(ctx, err) {

@@ -0,0 +1,112 @@
+// NOTE: code is taken from https://git.frostfs.info/TrueCloudLab/frostfs-node/src/branch/master/pkg/network/address.go