mkadilov/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#1604] policer: Remove one-line helpers

Browse source 
Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
This commit is contained in:
Evgenii Stratonikov 2025-01-16 15:52:21 +03:00
parent 5a270e2e61
commit 84e1599997
Signed by: fyrchik
SSH key fingerprint: SHA256:m/TTwCzjnRkXgnzEx9X92ccxy1CcVeinOgDb3NPWWmg
3 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -143,10 +143,10 @@ func (p *Policer) processRepNodes(ctx context.Context, requirements *placementRe
if err == nil { if err == nil {
shortage-- shortage--
checkedNodes.submitReplicaHolder(nodes[i]) checkedNodes.set(nodes[i], nodeHoldsObject)
} else { } else {
if client.IsErrObjectNotFound(err) { if client.IsErrObjectNotFound(err) {
checkedNodes.submitReplicaCandidate(nodes[i]) checkedNodes.set(nodes[i], nodeDoesNotHoldObject)
continue continue
} else if client.IsErrNodeUnderMaintenance(err) { } else if client.IsErrNodeUnderMaintenance(err) {
shortage, uncheckedCopies = p.handleMaintenance(ctx, nodes[i], checkedNodes, shortage, uncheckedCopies) shortage, uncheckedCopies = p.handleMaintenance(ctx, nodes[i], checkedNodes, shortage, uncheckedCopies)
@ -174,7 +174,7 @@ func (p *Policer) processRepNodes(ctx context.Context, requirements *placementRe
// However, additional copies should not be removed in this case, // However, additional copies should not be removed in this case,
// because we can remove the only copy this way. // because we can remove the only copy this way.
func (p *Policer) handleMaintenance(ctx context.Context, node netmap.NodeInfo, checkedNodes nodeCache, shortage uint32, uncheckedCopies int) (uint32, int) { func (p *Policer) handleMaintenance(ctx context.Context, node netmap.NodeInfo, checkedNodes nodeCache, shortage uint32, uncheckedCopies int) (uint32, int) {
checkedNodes.submitReplicaHolder(node) checkedNodes.set(node, nodeHoldsObject)
shortage-- shortage--
uncheckedCopies++ uncheckedCopies++

4
pkg/services/policer/check_test.go
View file

@ -16,9 +16,9 @@ func TestNodeCache(t *testing.T) {
cache.SubmitSuccessfulReplication(node) cache.SubmitSuccessfulReplication(node)
require.Equal(t, cache.processStatus(node), nodeHoldsObject) require.Equal(t, cache.processStatus(node), nodeHoldsObject)
cache.submitReplicaCandidate(node) cache.set(node, nodeDoesNotHoldObject)
require.Equal(t, cache.processStatus(node), nodeDoesNotHoldObject) require.Equal(t, cache.processStatus(node), nodeDoesNotHoldObject)
cache.submitReplicaHolder(node) cache.set(node, nodeHoldsObject)
require.Equal(t, cache.processStatus(node), nodeHoldsObject) require.Equal(t, cache.processStatus(node), nodeHoldsObject)
} }

13
pkg/services/policer/nodecache.go
View file

@ -25,17 +25,6 @@ func (n nodeCache) set(node netmap.NodeInfo, val nodeProcessStatus) {
n[node.Hash()] = val n[node.Hash()] = val
} }
// submits storage node as a candidate to store the object replica in case of
// shortage.
func (n nodeCache) submitReplicaCandidate(node netmap.NodeInfo) {
n.set(node, nodeDoesNotHoldObject)
}
// submits storage node as a current object replica holder.
func (n nodeCache) submitReplicaHolder(node netmap.NodeInfo) {
n.set(node, nodeHoldsObject)
}
// processStatus returns current processing status of the storage node. // processStatus returns current processing status of the storage node.
func (n nodeCache) processStatus(node netmap.NodeInfo) nodeProcessStatus { func (n nodeCache) processStatus(node netmap.NodeInfo) nodeProcessStatus {
return n[node.Hash()] return n[node.Hash()]
@ -46,5 +35,5 @@ func (n nodeCache) processStatus(node netmap.NodeInfo) nodeProcessStatus {
// //
// SubmitSuccessfulReplication implements replicator.TaskResult. // SubmitSuccessfulReplication implements replicator.TaskResult.
func (n nodeCache) SubmitSuccessfulReplication(node netmap.NodeInfo) { func (n nodeCache) SubmitSuccessfulReplication(node netmap.NodeInfo) {
n.submitReplicaHolder(node) n.set(node, nodeHoldsObject)
} }