Skip to content

Commit 75a487f

Browse files
committed
loqrecovery: rm unused argument
Epic: none Release note: none
1 parent 5775bac commit 75a487f

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

pkg/kv/kvserver/loqrecovery/collect.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ func CollectStoresReplicaInfo(
158158
return loqrecoverypb.ClusterReplicaInfo{}, CollectionStats{}, errors.New("can't collect info from stored that belong to different clusters")
159159
}
160160
nodes[ident.NodeID] = struct{}{}
161-
if err := visitStoreReplicas(ctx, reader, ident.StoreID, ident.NodeID, version,
161+
if err := visitStoreReplicas(ctx, reader, ident.StoreID, ident.NodeID,
162162
func(info loqrecoverypb.ReplicaInfo) error {
163163
replicas = append(replicas, info)
164164
return nil
@@ -181,7 +181,6 @@ func visitStoreReplicas(
181181
reader storage.Reader,
182182
storeID roachpb.StoreID,
183183
nodeID roachpb.NodeID,
184-
targetVersion clusterversion.ClusterVersion,
185184
send func(info loqrecoverypb.ReplicaInfo) error,
186185
) error {
187186
if err := kvstorage.IterateRangeDescriptorsFromDisk(ctx, reader, func(desc roachpb.RangeDescriptor) error {

pkg/kv/kvserver/loqrecovery/server.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ func (s Server) ServeLocalReplicas(
121121
_ *serverpb.RecoveryCollectLocalReplicaInfoRequest,
122122
stream serverpb.Admin_RecoveryCollectLocalReplicaInfoServer,
123123
) error {
124-
v := s.settings.Version.ActiveVersion(ctx)
125124
var stores []*kvserver.Store
126125
if err := s.stores.VisitStores(func(s *kvserver.Store) error {
127126
stores = append(stores, s)
@@ -137,7 +136,7 @@ func (s Server) ServeLocalReplicas(
137136
g.Go(func() error {
138137
reader := s.TODOEngine().NewSnapshot()
139138
defer reader.Close()
140-
return visitStoreReplicas(ctx, reader, s.StoreID(), s.NodeID(), v,
139+
return visitStoreReplicas(ctx, reader, s.StoreID(), s.NodeID(),
141140
func(info loqrecoverypb.ReplicaInfo) error {
142141
return syncStream.Send(&serverpb.RecoveryCollectLocalReplicaInfoResponse{ReplicaInfo: &info})
143142
})

0 commit comments

Comments
 (0)