From 91b91d6cb748d50ca8efef4361bec0e0a7ffa9ae Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sun, 17 May 2020 20:20:12 -0700 Subject: [PATCH] add error to avoid copying not found volume fix https://github.com/chrislusf/seaweedfs/issues/1317 --- weed/server/volume_grpc_copy.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/weed/server/volume_grpc_copy.go b/weed/server/volume_grpc_copy.go index 7db23fae1..5c7d5572c 100644 --- a/weed/server/volume_grpc_copy.go +++ b/weed/server/volume_grpc_copy.go @@ -82,6 +82,13 @@ func (vs *VolumeServer) VolumeCopy(ctx context.Context, req *volume_server_pb.Vo return nil }) + if err != nil { + return nil, err + } + if volumeFileName == "" { + return nil, fmt.Errorf("not found volume %d file", req.VolumeId) + } + idxFileName = volumeFileName + ".idx" datFileName = volumeFileName + ".dat" @@ -93,10 +100,6 @@ func (vs *VolumeServer) VolumeCopy(ctx context.Context, req *volume_server_pb.Vo } }() - if err != nil && volumeFileName != "" { - return nil, err - } - if err = checkCopyFiles(volFileInfoResp, idxFileName, datFileName); err != nil { // added by panyc16 return nil, err }