diff options
| author | Chris Lu <chris.lu@gmail.com> | 2019-05-19 21:38:18 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2019-05-19 21:38:18 -0700 |
| commit | ae499fd5aabcba3e66025ab1389cc863ca16ba9c (patch) | |
| tree | e69dab710ab94941cb0e1dc066e6afbd42a6d69b /weed/server | |
| parent | 693d6c0f1bf430f4f6e2a1146864731c90d1ef28 (diff) | |
| parent | 698dea779c05ab87758e486cc9ea34575c4cc95e (diff) | |
| download | seaweedfs-ae499fd5aabcba3e66025ab1389cc863ca16ba9c.tar.xz seaweedfs-ae499fd5aabcba3e66025ab1389cc863ca16ba9c.zip | |
Merge branch 'master' into erasure_coding
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/volume_grpc_copy.go | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/weed/server/volume_grpc_copy.go b/weed/server/volume_grpc_copy.go index e3ade61a1..6bb61dfba 100644 --- a/weed/server/volume_grpc_copy.go +++ b/weed/server/volume_grpc_copy.go @@ -52,7 +52,7 @@ func (vs *VolumeServer) VolumeCopy(ctx context.Context, req *volume_server_pb.Vo copyFileClient, err := client.CopyFile(ctx, &volume_server_pb.CopyFileRequest{ VolumeId: req.VolumeId, - IsIdxFile: true, + Ext: ".idx", CompactionRevision: volFileInfoResp.CompactionRevision, StopOffset: volFileInfoResp.IdxFileSize, }) @@ -68,7 +68,7 @@ func (vs *VolumeServer) VolumeCopy(ctx context.Context, req *volume_server_pb.Vo copyFileClient, err = client.CopyFile(ctx, &volume_server_pb.CopyFileRequest{ VolumeId: req.VolumeId, - IsDatFile: true, + Ext: ".dat", CompactionRevision: volFileInfoResp.CompactionRevision, StopOffset: volFileInfoResp.DatFileSize, }) @@ -189,12 +189,7 @@ func (vs *VolumeServer) CopyFile(req *volume_server_pb.CopyFileRequest, stream v bytesToRead := int64(req.StopOffset) const BufferSize = 1024 * 1024 * 2 - var fileName = v.FileName() - if req.IsDatFile { - fileName += ".dat" - } else if req.IsIdxFile { - fileName += ".idx" - } + var fileName = v.FileName() + req.Ext file, err := os.Open(fileName) if err != nil { return err |