satellite/metabase,cmd/tools/segment-verify: simplify interface

Change-Id: Icdd445b1713bc26cee3b3a125b68b0cde0739837

cmd/tools/segment-verify/process.go

@@ -104,13 +104,21 @@ func (service *Service) VerifyBatches(ctx context.Context, batches []*Batch) err
 func (service *Service) convertAliasToNodeURL(ctx context.Context, alias metabase.NodeAlias) (_ storj.NodeURL, err error) {
 	nodeURL, ok := service.aliasToNodeURL[alias]
 	if !ok {
-		// not in cache, use the slow path
+		nodeID, ok := service.aliasMap.Node(alias)
-		nodeIDs, err := service.metabase.ConvertAliasesToNodes(ctx, []metabase.NodeAlias{alias})
+		if !ok {
-		if err != nil {
+			latest, err := service.metabase.LatestNodesAliasMap(ctx)
-			return storj.NodeURL{}, Error.Wrap(err)
+			if !ok {
+				return storj.NodeURL{}, Error.Wrap(err)
+			}
+			service.aliasMap = latest
+
+			nodeID, ok = service.aliasMap.Node(alias)
+			if !ok {
+				return storj.NodeURL{}, Error.Wrap(err)
+			}
 		}
 
-		info, err := service.overlay.Get(ctx, nodeIDs[0])
+		info, err := service.overlay.Get(ctx, nodeID)
 		if err != nil {
 			return storj.NodeURL{}, Error.Wrap(err)
 		}

cmd/tools/segment-verify/service.go

@@ -29,7 +29,6 @@ var Error = errs.Class("segment-verify")
 // Metabase defines implementation dependencies we need from metabase.
 type Metabase interface {
 	LatestNodesAliasMap(ctx context.Context) (*metabase.NodeAliasMap, error)
-	ConvertAliasesToNodes(ctx context.Context, aliases []metabase.NodeAlias) ([]storj.NodeID, error)
 	GetSegmentByPosition(ctx context.Context, opts metabase.GetSegmentByPosition) (segment metabase.Segment, err error)
 	ListVerifySegments(ctx context.Context, opts metabase.ListVerifySegments) (result metabase.ListVerifySegmentsResult, err error)
 }
@@ -77,6 +76,7 @@ type Service struct {
 	verifier Verifier
 	overlay  Overlay
 
+	aliasMap       *metabase.NodeAliasMap
 	aliasToNodeURL map[metabase.NodeAlias]storj.NodeURL
 	priorityNodes  NodeAliasSet
 	onlineNodes    NodeAliasSet
@@ -132,13 +132,8 @@ func (service *Service) loadOnlineNodes(ctx context.Context) (err error) {
 		return Error.Wrap(err)
 	}
 
-	aliasMap, err := service.metabase.LatestNodesAliasMap(ctx)
-	if err != nil {
-		return Error.Wrap(err)
-	}
-
 	for _, node := range nodes {
-		alias, ok := aliasMap.Alias(node.ID)
+		alias, ok := service.aliasMap.Alias(node.ID)
 		if !ok {
 			// This means the node does not hold any data in metabase.
 			continue
@@ -165,11 +160,6 @@ func (service *Service) loadPriorityNodes(ctx context.Context) (err error) {
 		return Error.New("unable to read priority nodes: %w", err)
 	}
 
-	aliasMap, err := service.metabase.LatestNodesAliasMap(ctx)
-	if err != nil {
-		return Error.Wrap(err)
-	}
-
 	for _, line := range strings.Split(string(data), "\n") {
 		line = strings.TrimSpace(line)
 		if line == "" || strings.HasPrefix(line, "#") {
@@ -181,7 +171,7 @@ func (service *Service) loadPriorityNodes(ctx context.Context) (err error) {
 			return Error.Wrap(err)
 		}
 
-		alias, ok := aliasMap.Alias(nodeID)
+		alias, ok := service.aliasMap.Alias(nodeID)
 		if !ok {
 			service.log.Info("priority node ID not used", zap.Stringer("node id", nodeID), zap.Error(err))
 			continue
@@ -197,6 +187,12 @@ func (service *Service) loadPriorityNodes(ctx context.Context) (err error) {
 func (service *Service) ProcessRange(ctx context.Context, low, high uuid.UUID) (err error) {
 	defer mon.Task()(&ctx)(&err)
 
+	aliasMap, err := service.metabase.LatestNodesAliasMap(ctx)
+	if err != nil {
+		return Error.Wrap(err)
+	}
+	service.aliasMap = aliasMap
+
 	err = service.loadOnlineNodes(ctx)
 	if err != nil {
 		return Error.Wrap(err)

cmd/tools/segment-verify/service_test.go

@@ -274,18 +274,6 @@ func (db *metabaseMock) LatestNodesAliasMap(ctx context.Context) (*metabase.Node
 	return metabase.NewNodeAliasMap(entries), nil
 }
 
-func (db *metabaseMock) ConvertAliasesToNodes(ctx context.Context, aliases []metabase.NodeAlias) ([]storj.NodeID, error) {
-	xs := make([]storj.NodeID, len(aliases))
-	for i, alias := range aliases {
-		id, ok := db.aliasToNodeID[alias]
-		if !ok {
-			return nil, errs.New("alias %v not found", alias)
-		}
-		xs[i] = id
-	}
-	return xs, nil
-}
-
 func (db *metabaseMock) DeleteSegmentByPosition(ctx context.Context, opts metabase.GetSegmentByPosition) error {
 	for i, s := range db.segments {
 		if opts.StreamID == s.StreamID && opts.Position == s.Position {

satellite/metabase/alias.go

@@ -79,17 +79,3 @@ func (db *DB) LatestNodesAliasMap(ctx context.Context) (_ *NodeAliasMap, err err
 	defer mon.Task()(&ctx)(&err)
 	return db.aliasCache.Latest(ctx)
 }
-
-// ConvertNodesToAliases converts nodeIDs to node aliases.
-// Returns an error when an alias is missing.
-func (db *DB) ConvertNodesToAliases(ctx context.Context, nodeIDs []storj.NodeID) (_ []NodeAlias, err error) {
-	defer mon.Task()(&ctx)(&err)
-	return db.aliasCache.Aliases(ctx, nodeIDs)
-}
-
-// ConvertAliasesToNodes converts aliases to node ID-s.
-// Returns an error when a node alias is missing.
-func (db *DB) ConvertAliasesToNodes(ctx context.Context, aliases []NodeAlias) (_ []storj.NodeID, err error) {
-	defer mon.Task()(&ctx)(&err)
-	return db.aliasCache.Nodes(ctx, aliases)
-}