JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Selecting non-reputable nodes should not result in excessive selection (#1680)

Browse Source
This commit is contained in:
Kaloyan Raev 2019-04-23 18:23:51 +03:00 committed by GitHub
parent 4185f2d8ac
commit da0bc5adb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
pkg/overlay/cache.go
View File

@ -217,11 +217,9 @@ func (cache *Cache) FindStorageNodes(ctx context.Context, req FindStorageNodesRe
}
// FindStorageNodesWithPreferences searches the overlay network for nodes that meet the provided criteria
func (cache *Cache) FindStorageNodesWithPreferences(ctx context.Context, req FindStorageNodesRequest, preferences *NodeSelectionConfig) (_ []*pb.Node, err error) {
func (cache *Cache) FindStorageNodesWithPreferences(ctx context.Context, req FindStorageNodesRequest, preferences *NodeSelectionConfig) (nodes []*pb.Node, err error) {
defer mon.Task()(&ctx)(&err)
// TODO: verify logic
// TODO: add sanity limits to requested node count
// TODO: add sanity limits to excluded nodes
reputableNodeCount := req.MinimumRequiredNodes
@ -229,12 +227,41 @@ func (cache *Cache) FindStorageNodesWithPreferences(ctx context.Context, req Fin
reputableNodeCount = req.RequestedCount
}
excluded := req.ExcludedNodes
newNodeCount := 0
if preferences.NewNodePercentage > 0 {
newNodeCount = int(float64(reputableNodeCount) * preferences.NewNodePercentage)
}
var newNodes []*pb.Node
if newNodeCount > 0 {
newNodes, err = cache.db.SelectNewStorageNodes(ctx, newNodeCount, &NewNodeCriteria{
FreeBandwidth: req.FreeBandwidth,
FreeDisk: req.FreeDisk,
AuditThreshold: preferences.NewNodeAuditThreshold,
Excluded: excluded,
MinimumVersion: preferences.MinimumVersion,
})
if err != nil {
return nil, err
}
}
auditCount := preferences.AuditCount
if auditCount < preferences.NewNodeAuditThreshold {
auditCount = preferences.NewNodeAuditThreshold
}
reputableNodes, err := cache.db.SelectStorageNodes(ctx, reputableNodeCount, &NodeCriteria{
// add selected new nodes to the excluded list for reputable node selection
for _, newNode := range newNodes {
excluded = append(excluded, newNode.Id)
}
reputableNodes, err := cache.db.SelectStorageNodes(ctx, reputableNodeCount-len(newNodes), &NodeCriteria{
FreeBandwidth: req.FreeBandwidth,
FreeDisk: req.FreeDisk,
@ -243,7 +270,7 @@ func (cache *Cache) FindStorageNodesWithPreferences(ctx context.Context, req Fin
UptimeCount: preferences.UptimeCount,
UptimeSuccessRatio: preferences.UptimeRatio,
Excluded: req.ExcludedNodes,
Excluded: excluded,
MinimumVersion: preferences.MinimumVersion,
})
@ -251,27 +278,11 @@ func (cache *Cache) FindStorageNodesWithPreferences(ctx context.Context, req Fin
return nil, err
}
newNodeCount := int64(float64(reputableNodeCount) * preferences.NewNodePercentage)
newNodes, err := cache.db.SelectNewStorageNodes(ctx, int(newNodeCount), &NewNodeCriteria{
FreeBandwidth: req.FreeBandwidth,
FreeDisk: req.FreeDisk,
AuditThreshold: preferences.NewNodeAuditThreshold,
Excluded: req.ExcludedNodes,
MinimumVersion: preferences.MinimumVersion,
})
if err != nil {
return nil, err
}
nodes := []*pb.Node{}
nodes = append(nodes, newNodes...)
nodes = append(nodes, reputableNodes...)
if len(reputableNodes) < reputableNodeCount {
return nodes, ErrNotEnoughNodes.New("requested %d found %d", reputableNodeCount, len(reputableNodes))
if len(nodes) < reputableNodeCount {
return nodes, ErrNotEnoughNodes.New("requested %d found %d", reputableNodeCount, len(nodes))
}
return nodes, nil