From 2bae704d3ea88f6ea275d14887d739897488f939 Mon Sep 17 00:00:00 2001
From: Denis Kirillov <d.kirillov@yadro.com>
Date: Tue, 23 Jul 2024 16:47:05 +0300
Subject: [PATCH] [#437] tree: Add cleanOldNodes method

Signed-off-by: Denis Kirillov <d.kirillov@yadro.com>
---
 internal/logs/logs.go    |  6 ++--
 pkg/service/tree/tree.go | 66 +++++++++++++++-------------------------
 2 files changed, 26 insertions(+), 46 deletions(-)

diff --git a/internal/logs/logs.go b/internal/logs/logs.go
index d1257ab..33f0b1a 100644
--- a/internal/logs/logs.go
+++ b/internal/logs/logs.go
@@ -146,10 +146,8 @@ const (
 	BucketTaggingNodeHasMultipleIDs                      = "bucket tagging node has multiple ids"
 	BucketSettingsNodeHasMultipleIDs                     = "bucket settings node has multiple ids"
 	BucketCORSNodeHasMultipleIDs                         = "bucket cors node has multiple ids"
-	FailedToRemoveOldBucketSettingsNode                  = "failed to remove old bucket settings node"
-	FailedToRemoveOldBucketTaggingNode                   = "failed to remove old bucket tagging node"
-	FailedToRemoveOldBucketCORSNode                      = "failed to remove old bucket cors node"
-	FailedToRemoveOldPartNode                            = "failed to remove old part node"
+	SystemNodeHasMultipleIDs                             = "system node has multiple ids"
+	FailedToRemoveOldSystemNode                          = "failed to remove old system node"
 	UnexpectedMultiNodeIDsInSubTreeMultiParts            = "unexpected multi node ids in sub tree multi parts"
 	FoundSeveralSystemNodes                              = "found several system nodes"
 	FailedToParsePartInfo                                = "failed to parse part info"
diff --git a/pkg/service/tree/tree.go b/pkg/service/tree/tree.go
index 745d485..5e19fc6 100644
--- a/pkg/service/tree/tree.go
+++ b/pkg/service/tree/tree.go
@@ -491,15 +491,7 @@ func (c *Tree) PutSettingsNode(ctx context.Context, bktInfo *data.BucketInfo, se
 		return fmt.Errorf("move settings node: %w", err)
 	}
 
-	for _, node := range multiNode.Old() {
-		ind = node.GetLatestNodeIndex()
-		if node.IsSplit() {
-			c.reqLogger(ctx).Error(logs.BucketSettingsNodeHasMultipleIDs, zap.Uint64s("ids", node.ID))
-		}
-		if err = c.service.RemoveNode(ctx, bktInfo, systemTree, node.ID[ind]); err != nil {
-			c.reqLogger(ctx).Warn(logs.FailedToRemoveOldBucketSettingsNode, zap.Uint64("id", node.ID[ind]))
-		}
-	}
+	c.cleanOldNodes(ctx, multiNode.Old(), bktInfo)
 
 	return nil
 }
@@ -544,17 +536,7 @@ func (c *Tree) PutBucketCORS(ctx context.Context, bktInfo *data.BucketInfo, objI
 	objToDelete := make([]oid.ID, 1, len(multiNode.nodes))
 	objToDelete[0] = latest.ObjID
 
-	for _, node := range multiNode.Old() {
-		ind = node.GetLatestNodeIndex()
-		if node.IsSplit() {
-			c.reqLogger(ctx).Error(logs.BucketCORSNodeHasMultipleIDs, zap.Uint64s("ids", node.ID))
-		}
-		if err = c.service.RemoveNode(ctx, bktInfo, systemTree, node.ID[ind]); err != nil {
-			c.reqLogger(ctx).Warn(logs.FailedToRemoveOldBucketCORSNode, zap.Uint64("id", node.ID[ind]))
-		} else {
-			objToDelete = append(objToDelete, node.ObjID)
-		}
-	}
+	objToDelete = append(objToDelete, c.cleanOldNodes(ctx, multiNode.Old(), bktInfo)...)
 
 	return objToDelete, nil
 }
@@ -570,24 +552,32 @@ func (c *Tree) DeleteBucketCORS(ctx context.Context, bktInfo *data.BucketInfo) (
 		return nil, layer.ErrNoNodeToRemove
 	}
 
-	objToDelete := make([]oid.ID, len(multiNode.nodes))
-
-	for i, node := range multiNode.nodes {
-		ind := node.GetLatestNodeIndex()
-		if node.IsSplit() {
-			c.reqLogger(ctx).Error(logs.BucketCORSNodeHasMultipleIDs, zap.Uint64s("ids", node.ID))
-		}
-
-		if err = c.service.RemoveNode(ctx, bktInfo, systemTree, node.ID[ind]); err != nil {
-			return nil, fmt.Errorf("delete cors node '%d': %w", node.ID[ind], err)
-		}
-
-		objToDelete[i] = node.ObjID
+	objToDelete := c.cleanOldNodes(ctx, multiNode.nodes, bktInfo)
+	if len(objToDelete) != len(multiNode.nodes) {
+		return nil, fmt.Errorf("clean old cors nodes: %w", err)
 	}
 
 	return objToDelete, nil
 }
 
+func (c *Tree) cleanOldNodes(ctx context.Context, nodes []*treeNode, bktInfo *data.BucketInfo) []oid.ID {
+	res := make([]oid.ID, 0, len(nodes))
+
+	for _, node := range nodes {
+		ind := node.GetLatestNodeIndex()
+		if node.IsSplit() {
+			c.reqLogger(ctx).Error(logs.SystemNodeHasMultipleIDs, zap.String("FileName", node.Meta[FileNameKey]), zap.Uint64s("ids", node.ID))
+		}
+		if err := c.service.RemoveNode(ctx, bktInfo, systemTree, node.ID[ind]); err != nil {
+			c.reqLogger(ctx).Warn(logs.FailedToRemoveOldSystemNode, zap.String("FileName", node.Meta[FileNameKey]), zap.Uint64("id", node.ID[ind]))
+		} else {
+			res = append(res, node.ObjID)
+		}
+	}
+
+	return res
+}
+
 func (c *Tree) GetObjectTagging(ctx context.Context, bktInfo *data.BucketInfo, objVersion *data.NodeVersion) (map[string]string, error) {
 	tagNode, err := c.getTreeNode(ctx, bktInfo, objVersion.ID, isTagKV)
 	if err != nil {
@@ -689,15 +679,7 @@ func (c *Tree) PutBucketTagging(ctx context.Context, bktInfo *data.BucketInfo, t
 		return fmt.Errorf("move bucket tagging node: %w", err)
 	}
 
-	for _, node := range multiNode.Old() {
-		ind = node.GetLatestNodeIndex()
-		if node.IsSplit() {
-			c.reqLogger(ctx).Error(logs.BucketTaggingNodeHasMultipleIDs, zap.Uint64s("ids", node.ID))
-		}
-		if err = c.service.RemoveNode(ctx, bktInfo, systemTree, node.ID[ind]); err != nil {
-			c.reqLogger(ctx).Warn(logs.FailedToRemoveOldBucketTaggingNode, zap.Uint64("id", node.ID[ind]))
-		}
-	}
+	c.cleanOldNodes(ctx, multiNode.Old(), bktInfo)
 
 	return nil
 }