From e862b2529a82c7f2a7cc8c37e1610c1e807ac40f Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Fri, 1 Oct 2021 12:10:11 -0700 Subject: refactor --- weed/shell/command_ec_decode.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'weed/shell/command_ec_decode.go') diff --git a/weed/shell/command_ec_decode.go b/weed/shell/command_ec_decode.go index 3483156cb..cfa24cc31 100644 --- a/weed/shell/command_ec_decode.go +++ b/weed/shell/command_ec_decode.go @@ -208,16 +208,16 @@ func collectEcShards(commandEnv *CommandEnv, nodeToEcIndexBits map[pb.ServerAddr } -func LookupVolumeIds(commandEnv *CommandEnv, volumeIds []string) (err error, volumeIdLocations []*master_pb.LookupVolumeResponse_VolumeIdLocation) { +func lookupVolumeIds(commandEnv *CommandEnv, volumeIds []string) (volumeIdLocations []*master_pb.LookupVolumeResponse_VolumeIdLocation, err error) { var resp *master_pb.LookupVolumeResponse err = commandEnv.MasterClient.WithClient(func(client master_pb.SeaweedClient) error { resp, err = client.LookupVolume(context.Background(), &master_pb.LookupVolumeRequest{VolumeOrFileIds: volumeIds}) return err }) if err != nil { - return err, nil + return nil, err } - return nil, resp.VolumeIdLocations + return resp.VolumeIdLocations, nil } func collectTopologyInfo(commandEnv *CommandEnv) (topoInfo *master_pb.TopologyInfo, volumeSizeLimitMb uint64, err error) { -- cgit v1.2.3