diff --git a/satellite/overlay/service.go b/satellite/overlay/service.go index 8d935fff4..34f8a4b81 100644 --- a/satellite/overlay/service.go +++ b/satellite/overlay/service.go @@ -60,8 +60,6 @@ type DB interface { // Get looks up the node by nodeID Get(ctx context.Context, nodeID storj.NodeID) (*NodeDossier, error) - // KnownOffline filters a set of nodes to offline nodes - KnownOffline(context.Context, *NodeCriteria, storj.NodeIDList) (storj.NodeIDList, error) // KnownUnreliableOrOffline filters a set of nodes to unhealth or offlines node, independent of new KnownUnreliableOrOffline(context.Context, *NodeCriteria, storj.NodeIDList) (storj.NodeIDList, error) // KnownReliableInExcludedCountries filters healthy nodes that are in excluded countries. @@ -542,15 +540,6 @@ func (service *Service) FindStorageNodesWithPreferences(ctx context.Context, req return nodes, nil } -// KnownOffline filters a set of nodes to offline nodes. -func (service *Service) KnownOffline(ctx context.Context, nodeIds storj.NodeIDList) (offlineNodes storj.NodeIDList, err error) { - defer mon.Task()(&ctx)(&err) - criteria := &NodeCriteria{ - OnlineWindow: service.config.Node.OnlineWindow, - } - return service.db.KnownOffline(ctx, criteria, nodeIds) -} - // KnownUnreliableOrOffline filters a set of nodes to unhealth or offlines node, independent of new. func (service *Service) KnownUnreliableOrOffline(ctx context.Context, nodeIds storj.NodeIDList) (badNodes storj.NodeIDList, err error) { defer mon.Task()(&ctx)(&err) diff --git a/satellite/satellitedb/overlaycache.go b/satellite/satellitedb/overlaycache.go index 81ecedd21..42c9818c5 100644 --- a/satellite/satellitedb/overlaycache.go +++ b/satellite/satellitedb/overlaycache.go @@ -322,54 +322,6 @@ func (cache *overlaycache) getOnlineNodesForAuditRepair(ctx context.Context, nod return nodes, Error.Wrap(rows.Err()) } -// KnownOffline filters a set of nodes to offline nodes. -func (cache *overlaycache) KnownOffline(ctx context.Context, criteria *overlay.NodeCriteria, nodeIDs storj.NodeIDList) (offlineNodes storj.NodeIDList, err error) { - for { - offlineNodes, err = cache.knownOffline(ctx, criteria, nodeIDs) - if err != nil { - if cockroachutil.NeedsRetry(err) { - continue - } - return offlineNodes, err - } - break - } - - return offlineNodes, err -} - -func (cache *overlaycache) knownOffline(ctx context.Context, criteria *overlay.NodeCriteria, nodeIds storj.NodeIDList) (offlineNodes storj.NodeIDList, err error) { - defer mon.Task()(&ctx)(&err) - - if len(nodeIds) == 0 { - return nil, Error.New("no ids provided") - } - - // get offline nodes - var rows tagsql.Rows - rows, err = cache.db.Query(ctx, cache.db.Rebind(` - SELECT id FROM nodes - `+cache.db.impl.AsOfSystemInterval(criteria.AsOfSystemInterval)+` - WHERE id = any($1::bytea[]) - AND last_contact_success < $2 - `), pgutil.NodeIDArray(nodeIds), time.Now().Add(-criteria.OnlineWindow), - ) - if err != nil { - return nil, err - } - defer func() { err = errs.Combine(err, rows.Close()) }() - - for rows.Next() { - var id storj.NodeID - err = rows.Scan(&id) - if err != nil { - return nil, err - } - offlineNodes = append(offlineNodes, id) - } - return offlineNodes, Error.Wrap(rows.Err()) -} - // KnownUnreliableOrOffline filters a set of nodes to unreliable or offlines node, independent of new. func (cache *overlaycache) KnownUnreliableOrOffline(ctx context.Context, criteria *overlay.NodeCriteria, nodeIDs storj.NodeIDList) (badNodes storj.NodeIDList, err error) { for {