Browse Source

weed/server: remove unneeded err from streamReadOneVolume() signature (#5143)

pull/5144/head
Lars Lehtonen 1 year ago
committed by GitHub
parent
commit
edc0532b1d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      weed/server/volume_grpc_read_all.go

8
weed/server/volume_grpc_read_all.go

@ -10,14 +10,14 @@ import (
func (vs *VolumeServer) ReadAllNeedles(req *volume_server_pb.ReadAllNeedlesRequest, stream volume_server_pb.VolumeServer_ReadAllNeedlesServer) (err error) { func (vs *VolumeServer) ReadAllNeedles(req *volume_server_pb.ReadAllNeedlesRequest, stream volume_server_pb.VolumeServer_ReadAllNeedlesServer) (err error) {
for _, vid := range req.VolumeIds { for _, vid := range req.VolumeIds {
if err := vs.streamReadOneVolume(needle.VolumeId(vid), stream, err); err != nil {
if err := vs.streamReadOneVolume(needle.VolumeId(vid), stream); err != nil {
return err return err
} }
} }
return nil return nil
} }
func (vs *VolumeServer) streamReadOneVolume(vid needle.VolumeId, stream volume_server_pb.VolumeServer_ReadAllNeedlesServer, err error) error {
func (vs *VolumeServer) streamReadOneVolume(vid needle.VolumeId, stream volume_server_pb.VolumeServer_ReadAllNeedlesServer) error {
v := vs.store.GetVolume(vid) v := vs.store.GetVolume(vid)
if v == nil { if v == nil {
return fmt.Errorf("not found volume id %d", vid) return fmt.Errorf("not found volume id %d", vid)
@ -30,7 +30,5 @@ func (vs *VolumeServer) streamReadOneVolume(vid needle.VolumeId, stream volume_s
offset := int64(v.SuperBlock.BlockSize()) offset := int64(v.SuperBlock.BlockSize())
err = storage.ScanVolumeFileFrom(v.Version(), v.DataBackend, offset, scanner)
return err
return storage.ScanVolumeFileFrom(v.Version(), v.DataBackend, offset, scanner)
} }
Loading…
Cancel
Save