TrueCloudLab
/
frostfs-node
19
1
Fork 21
Code Issues 86 Pull Requests 7 Actions Releases Activity

[#1680] replicator: Work with `netmap.NodeInfo` in `TaskResult` 

Make `replicator.TaskResult` to accept `netmap.NodeInfo` type instead of
uint64 in order to clarify the meaning and prevent passing the random
numbers.

Signed-off-by: Leonard Lyubich <ctulhurider@gmail.com>
remotes/fyrchik/neofs-adm-fix-commands
Leonard Lyubich 2022-10-07 13:26:08 +04:00 committed by fyrchik
parent e6f8904040
commit df5d7bf729
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/services/control/server/evacuate.go
View File

@ -13,6 +13,7 @@ import (
"github.com/nspcc-dev/neofs-node/pkg/services/control" "github.com/nspcc-dev/neofs-node/pkg/services/control"
"github.com/nspcc-dev/neofs-node/pkg/services/object_manager/placement" "github.com/nspcc-dev/neofs-node/pkg/services/object_manager/placement"
"github.com/nspcc-dev/neofs-node/pkg/services/replicator" "github.com/nspcc-dev/neofs-node/pkg/services/replicator"
"github.com/nspcc-dev/neofs-sdk-go/netmap"
objectSDK "github.com/nspcc-dev/neofs-sdk-go/object" objectSDK "github.com/nspcc-dev/neofs-sdk-go/object"
oid "github.com/nspcc-dev/neofs-sdk-go/object/id" oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
@ -104,6 +105,6 @@ type replicatorResult struct {
} }
// SubmitSuccessfulReplication implements the replicator.TaskResult interface. // SubmitSuccessfulReplication implements the replicator.TaskResult interface.
func (r *replicatorResult) SubmitSuccessfulReplication(_ uint64) { func (r *replicatorResult) SubmitSuccessfulReplication(_ netmap.NodeInfo) {
r.count++ r.count++
} }

16
pkg/services/policer/check.go
View File

@ -21,15 +21,19 @@ func newNodeCache() *nodeCache {
return (*nodeCache)(&m) return (*nodeCache)(&m)
} }
func (n *nodeCache) set(node netmap.NodeInfo, val bool) {
(*n)[node.Hash()] = val
}
// submits storage node as a candidate to store the object replica in case of // submits storage node as a candidate to store the object replica in case of
// shortage. // shortage.
func (n *nodeCache) submitReplicaCandidate(node netmap.NodeInfo) { func (n *nodeCache) submitReplicaCandidate(node netmap.NodeInfo) {
(*n)[node.Hash()] = false n.set(node, false)
} }
// submits storage node as a current object replica holder. // submits storage node as a current object replica holder.
func (n *nodeCache) submitReplicaHolder(node netmap.NodeInfo) { func (n *nodeCache) submitReplicaHolder(node netmap.NodeInfo) {
(*n)[node.Hash()] = true n.set(node, true)
} }
// processStatus returns current processing status of the storage node // processStatus returns current processing status of the storage node
@ -50,8 +54,12 @@ func (n *nodeCache) processStatus(node netmap.NodeInfo) int8 {
return 1 return 1
} }
func (n *nodeCache) SubmitSuccessfulReplication(id uint64) { // SubmitSuccessfulReplication marks given storage node as a current object
(*n)[id] = true // replica holder.
//
// SubmitSuccessfulReplication implements replicator.TaskResult.
func (n *nodeCache) SubmitSuccessfulReplication(node netmap.NodeInfo) {
n.submitReplicaHolder(node)
} }
func (p *Policer) processObject(ctx context.Context, addr oid.Address) { func (p *Policer) processObject(ctx context.Context, addr oid.Address) {

2
pkg/services/policer/check_test.go
View File

@ -13,7 +13,7 @@ func TestNodeCache(t *testing.T) {
require.Negative(t, cache.processStatus(node)) require.Negative(t, cache.processStatus(node))
cache.SubmitSuccessfulReplication(node.Hash()) cache.SubmitSuccessfulReplication(node)
require.Zero(t, cache.processStatus(node)) require.Zero(t, cache.processStatus(node))
cache.submitReplicaCandidate(node) cache.submitReplicaCandidate(node)

10
pkg/services/replicator/process.go
View File

@ -6,15 +6,15 @@ import (
"github.com/nspcc-dev/neofs-node/pkg/local_object_storage/engine" "github.com/nspcc-dev/neofs-node/pkg/local_object_storage/engine"
putsvc "github.com/nspcc-dev/neofs-node/pkg/services/object/put" putsvc "github.com/nspcc-dev/neofs-node/pkg/services/object/put"
"github.com/nspcc-dev/neofs-sdk-go/netmap"
"go.uber.org/zap" "go.uber.org/zap"
) )
// TaskResult is a replication result interface. // TaskResult is a replication result interface.
type TaskResult interface { type TaskResult interface {
// SubmitSuccessfulReplication must save successful // SubmitSuccessfulReplication submits the successful object replication
// replication result. ID is a netmap identification // to the given node.
// of a node that accepted the replica. SubmitSuccessfulReplication(netmap.NodeInfo)
SubmitSuccessfulReplication(id uint64)
} }
// HandleTask executes replication task inside invoking goroutine. // HandleTask executes replication task inside invoking goroutine.
@ -68,7 +68,7 @@ func (p *Replicator) HandleTask(ctx context.Context, task Task, res TaskResult)
task.quantity-- task.quantity--
res.SubmitSuccessfulReplication(task.nodes[i].Hash()) res.SubmitSuccessfulReplication(task.nodes[i])
} }
} }
} }