acid-ant/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#1605] policer: Do not mutate slice under iteration

Browse source 
Nothing wrong with it, besides being difficult to read.

Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
This commit is contained in:
Evgenii Stratonikov 2025-01-20 16:09:35 +03:00 • committed by Evgenii Stratonikov
parent 0bcbeb26b2
commit 951a7ee1c7
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkg/services/policer/check.go
View file

@ -110,6 +110,7 @@ func (p *Policer) processRepNodes(ctx context.Context, requirements *placementRe
// Number of copies that are stored on maintenance nodes. // Number of copies that are stored on maintenance nodes.
var uncheckedCopies int var uncheckedCopies int
var candidates []netmap.NodeInfo
for i := 0; shortage > 0 && i < len(nodes); i++ { for i := 0; shortage > 0 && i < len(nodes); i++ {
select { select {
case <-ctx.Done(): case <-ctx.Done():
@ -125,8 +126,8 @@ func (p *Policer) processRepNodes(ctx context.Context, requirements *placementRe
if st == nodeDoesNotHoldObject { if st == nodeDoesNotHoldObject {
// 1. This is the first time the node is encountered (`!st.Processed()`). // 1. This is the first time the node is encountered (`!st.Processed()`).
// 2. The node does not hold object (`st == nodeDoesNotHoldObject`). // 2. The node does not hold object (`st == nodeDoesNotHoldObject`).
// So we leave the node in the list and skip its removal // So we need to try to put an object to it.
// at the end of the loop body. candidates = append(candidates, nodes[i])
continue continue
} }
} }
@ -152,12 +153,9 @@ func (p *Policer) processRepNodes(ctx context.Context, requirements *placementRe
default: default:
panic("unreachable") panic("unreachable")
} }
nodes = append(nodes[:i], nodes[i+1:]...)
i--
} }
p.handleProcessNodesResult(ctx, addr, requirements, nodes, checkedNodes, shortage, uncheckedCopies) p.handleProcessNodesResult(ctx, addr, requirements, candidates, checkedNodes, shortage, uncheckedCopies)
} }
func (p *Policer) checkStatus(ctx context.Context, addr oid.Address, node netmap.NodeInfo) (nodeProcessStatus, error) { func (p *Policer) checkStatus(ctx context.Context, addr oid.Address, node netmap.NodeInfo) (nodeProcessStatus, error) {