aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2020-05-17 20:20:12 -0700
committerChris Lu <chris.lu@gmail.com>2020-05-17 20:20:12 -0700
commit91b91d6cb748d50ca8efef4361bec0e0a7ffa9ae (patch)
treecfe9d06c8e89520a6696690a3fb31acae46c8029
parentd3925d086c9ca3f30b5f4c46a92767fe99522ccb (diff)
downloadseaweedfs-91b91d6cb748d50ca8efef4361bec0e0a7ffa9ae.tar.xz
seaweedfs-91b91d6cb748d50ca8efef4361bec0e0a7ffa9ae.zip
add error to avoid copying not found volume
fix https://github.com/chrislusf/seaweedfs/issues/1317
-rw-r--r--weed/server/volume_grpc_copy.go11
1 files 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
}