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

add disqualified check to node selection queries (#2102)

Browse Source 
add disqualified check to queries, skip TestStatDB
This commit is contained in:
Natalie Villasana 2019-06-05 20:21:32 -04:00 committed by Bill Thorp
parent 099cf921d3
commit 25d7dda135
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/overlay/statdb_test.go
View File

@ -25,6 +25,7 @@ func getRatio(success, total int64) (ratio float64) {
}
func TestStatDB(t *testing.T) {
t.Skip("team green skipped until V3-1843 is implemented")
satellitedbtest.Run(t, func(t *testing.T, db satellite.DB) {
ctx := testcontext.New(t)
defer ctx.Cleanup()

61
satellite/satellitedb/overlaycache.go
View File

@ -41,17 +41,17 @@ func (cache *overlaycache) SelectStorageNodes(ctx context.Context, count int, cr
nodeType := int(pb.NodeType_STORAGE)
safeQuery := `
WHERE type = ? AND free_bandwidth >= ? AND free_disk >= ?
AND total_audit_count >= ?
AND audit_success_ratio >= ?
AND total_uptime_count >= ?
AND uptime_ratio >= ?
AND last_contact_success > ?
AND last_contact_success > last_contact_failure`
WHERE NOT disqualified
AND type = ?
AND free_bandwidth >= ?
AND free_disk >= ?
AND total_audit_count >= ?
AND total_uptime_count >= ?
AND last_contact_success > ?
AND last_contact_success > last_contact_failure`
args := append(make([]interface{}, 0, 13),
nodeType, criteria.FreeBandwidth, criteria.FreeDisk,
criteria.AuditCount, criteria.AuditSuccessRatio, criteria.UptimeCount, criteria.UptimeSuccessRatio,
time.Now().Add(-criteria.OnlineWindow))
nodeType, criteria.FreeBandwidth, criteria.FreeDisk, criteria.AuditCount,
criteria.UptimeCount, time.Now().Add(-criteria.OnlineWindow))
if criteria.MinimumVersion != "" {
v, err := version.NewSemVer(criteria.MinimumVersion)
@ -97,12 +97,15 @@ func (cache *overlaycache) SelectNewStorageNodes(ctx context.Context, count int,
nodeType := int(pb.NodeType_STORAGE)
safeQuery := `
WHERE type = ? AND free_bandwidth >= ? AND free_disk >= ?
AND total_audit_count < ? AND audit_success_ratio >= ?
AND last_contact_success > ?
AND last_contact_success > last_contact_failure`
WHERE NOT disqualified
AND type = ?
AND free_bandwidth >= ?
AND free_disk >= ?
AND total_audit_count < ?
AND last_contact_success > ?
AND last_contact_success > last_contact_failure`
args := append(make([]interface{}, 0, 10),
nodeType, criteria.FreeBandwidth, criteria.FreeDisk, criteria.AuditCount, criteria.AuditSuccessRatio, time.Now().Add(-criteria.OnlineWindow))
nodeType, criteria.FreeBandwidth, criteria.FreeDisk, criteria.AuditCount, time.Now().Add(-criteria.OnlineWindow))
if criteria.MinimumVersion != "" {
v, err := version.NewSemVer(criteria.MinimumVersion)
@ -163,7 +166,7 @@ func (cache *overlaycache) queryNodes(ctx context.Context, excludedNodes []storj
rows, err = cache.db.Query(cache.db.Rebind(`SELECT id,
type, address, last_ip, free_bandwidth, free_disk, audit_success_ratio,
uptime_ratio, total_audit_count, audit_success_count, total_uptime_count,
uptime_success_count
uptime_success_count, disqualified
FROM nodes
`+safeQuery+safeExcludeNodes+`
ORDER BY RANDOM()
@ -180,7 +183,7 @@ func (cache *overlaycache) queryNodes(ctx context.Context, excludedNodes []storj
&dbNode.Address, &dbNode.LastIp, &dbNode.FreeBandwidth, &dbNode.FreeDisk,
&dbNode.AuditSuccessRatio, &dbNode.UptimeRatio,
&dbNode.TotalAuditCount, &dbNode.AuditSuccessCount,
&dbNode.TotalUptimeCount, &dbNode.UptimeSuccessCount)
&dbNode.TotalUptimeCount, &dbNode.UptimeSuccessCount, &dbNode.Disqualified)
if err != nil {
return nil, err
}
@ -236,9 +239,9 @@ func (cache *overlaycache) sqliteQueryNodesDistinct(ctx context.Context, exclude
rows, err := cache.db.Query(cache.db.Rebind(`SELECT id,
type, address, last_ip, free_bandwidth, free_disk, audit_success_ratio,
uptime_ratio, total_audit_count, audit_success_count, total_uptime_count,
uptime_success_count
uptime_success_count, disqualified
FROM (SELECT id, type, address, last_ip, free_bandwidth, free_disk, audit_success_ratio,
uptime_ratio, total_audit_count, audit_success_count, total_uptime_count, uptime_success_count,
uptime_ratio, total_audit_count, audit_success_count, total_uptime_count, uptime_success_count, disqualified,
Row_number() OVER(PARTITION BY last_ip ORDER BY RANDOM()) rn
FROM nodes
`+safeQuery+safeExcludeNodes+safeExcludeIPs+`) n
@ -257,7 +260,7 @@ func (cache *overlaycache) sqliteQueryNodesDistinct(ctx context.Context, exclude
&dbNode.Address, &dbNode.LastIp, &dbNode.FreeBandwidth, &dbNode.FreeDisk,
&dbNode.AuditSuccessRatio, &dbNode.UptimeRatio,
&dbNode.TotalAuditCount, &dbNode.AuditSuccessCount,
&dbNode.TotalUptimeCount, &dbNode.UptimeSuccessCount)
&dbNode.TotalUptimeCount, &dbNode.UptimeSuccessCount, &dbNode.Disqualified)
if err != nil {
return nil, err
}
@ -360,13 +363,11 @@ func (cache *overlaycache) IsVetted(ctx context.Context, id storj.NodeID, criter
row := cache.db.QueryRow(cache.db.Rebind(`SELECT id
FROM nodes
WHERE id = ?
AND NOT disqualified
AND type = ?
AND total_audit_count >= ?
AND audit_success_ratio >= ?
AND total_uptime_count >= ?
AND uptime_ratio >= ?
`), id, pb.NodeType_STORAGE, criteria.AuditCount, criteria.AuditSuccessRatio,
criteria.UptimeCount, criteria.UptimeSuccessRatio)
`), id, pb.NodeType_STORAGE, criteria.AuditCount, criteria.UptimeCount)
var bytes *[]byte
err = row.Scan(&bytes)
if err != nil {
@ -394,12 +395,12 @@ func (cache *overlaycache) KnownUnreliableOrOffline(ctx context.Context, criteri
for i := range nodeIds {
args = append(args, nodeIds[i].Bytes())
}
args = append(args, criteria.AuditSuccessRatio, criteria.UptimeSuccessRatio, time.Now().Add(-criteria.OnlineWindow))
args = append(args, time.Now().Add(-criteria.OnlineWindow))
rows, err = cache.db.Query(cache.db.Rebind(`
SELECT id FROM nodes
WHERE id IN (?`+strings.Repeat(", ?", len(nodeIds)-1)+`)
AND audit_success_ratio >= ? AND uptime_ratio >= ?
AND NOT disqualified
AND last_contact_success > ? AND last_contact_success > last_contact_failure
`), args...)
@ -407,11 +408,9 @@ func (cache *overlaycache) KnownUnreliableOrOffline(ctx context.Context, criteri
rows, err = cache.db.Query(`
SELECT id FROM nodes
WHERE id = any($1::bytea[])
AND audit_success_ratio >= $2 AND uptime_ratio >= $3
AND last_contact_success > $4 AND last_contact_success > last_contact_failure
`, postgresNodeIDList(nodeIds),
criteria.AuditSuccessRatio, criteria.UptimeSuccessRatio,
time.Now().Add(-criteria.OnlineWindow),
AND NOT disqualified
AND last_contact_success > $2 AND last_contact_success > last_contact_failure
`, postgresNodeIDList(nodeIds), time.Now().Add(-criteria.OnlineWindow),
)
default:
return nil, Error.New("Unsupported database %t", t)