alexvanin/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

cache: catch panic and add more logging for #1896

Browse source
This commit is contained in:
remusb 2017-12-10 14:11:31 +02:00
parent 845b22a628
commit 3d2f3d9a7f
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cache/handle.go vendored
View file

@ -232,6 +232,11 @@ func (r *Handle) getChunk(chunkStart int64) ([]byte, error) {
// first chunk will be aligned with the start // first chunk will be aligned with the start
if offset > 0 { if offset > 0 {
if offset >= len(data) {
fs.Errorf(r, "unexpected conditions during reading. current position: %v, current chunk position: %v, current chunk size: %v, offset: %v, chunk size: %v, file size: %v",
r.offset, chunkStart, len(data), offset, r.cacheFs().chunkSize, r.cachedObject.Size())
return nil, io.ErrUnexpectedEOF
}
data = data[int(offset):] data = data[int(offset):]
} }
@ -256,7 +261,7 @@ func (r *Handle) Read(p []byte) (n int, err error) {
currentOffset := r.offset currentOffset := r.offset
buf, err = r.getChunk(currentOffset) buf, err = r.getChunk(currentOffset)
if err != nil && len(buf) == 0 { if err != nil && len(buf) == 0 {
fs.Errorf(r, "(%v/%v) empty and error (%v) response", currentOffset, r.cachedObject.Size(), err) fs.Errorf(r, "(%v/%v) error (%v) response", currentOffset, r.cachedObject.Size(), err)
return 0, io.EOF return 0, io.EOF
} }
readSize := copy(p, buf) readSize := copy(p, buf)