diff options
| author | Chris Lu <chris.lu@gmail.com> | 2019-11-08 22:54:41 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2019-11-08 22:54:41 -0800 |
| commit | c5c1d83d91e5de51dd51b96cf338b00f38532d6c (patch) | |
| tree | 692fed158b681b636fcb76ddf4702fb11d712835 /weed/server/volume_grpc_erasure_coding.go | |
| parent | db30a460503d3a0c81ae78e621d5acf61585c473 (diff) | |
| parent | c34ffed43f9e6afde139c78a723fc56d843e03d4 (diff) | |
| download | seaweedfs-c5c1d83d91e5de51dd51b96cf338b00f38532d6c.tar.xz seaweedfs-c5c1d83d91e5de51dd51b96cf338b00f38532d6c.zip | |
Merge branch 'master' into refactoring_dat_backend
Diffstat (limited to 'weed/server/volume_grpc_erasure_coding.go')
| -rw-r--r-- | weed/server/volume_grpc_erasure_coding.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/weed/server/volume_grpc_erasure_coding.go b/weed/server/volume_grpc_erasure_coding.go index 8140a06f6..242480197 100644 --- a/weed/server/volume_grpc_erasure_coding.go +++ b/weed/server/volume_grpc_erasure_coding.go @@ -252,9 +252,14 @@ func (vs *VolumeServer) VolumeEcShardRead(req *volume_server_pb.VolumeEcShardRea startOffset, bytesToRead := req.Offset, req.Size for bytesToRead > 0 { - bytesread, err := ecShard.ReadAt(buffer, startOffset) + // min of bytesToRead and bufSize + bufferSize := bufSize + if bufferSize > bytesToRead { + bufferSize = bytesToRead + } + bytesread, err := ecShard.ReadAt(buffer[0:bufferSize], startOffset) - // println(fileName, "read", bytesread, "bytes, with target", bytesToRead) + // println("read", ecShard.FileName(), "startOffset", startOffset, bytesread, "bytes, with target", bufferSize) if bytesread > 0 { if int64(bytesread) > bytesToRead { @@ -268,6 +273,7 @@ func (vs *VolumeServer) VolumeEcShardRead(req *volume_server_pb.VolumeEcShardRea return err } + startOffset += int64(bytesread) bytesToRead -= int64(bytesread) } |