vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Loop bug fix

Browse source
This commit is contained in:
Andrey Kostov 2014-12-20 00:18:27 +02:00
parent a952c77b4a
commit 576495ec3e
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
storagedriver/s3/s3.go
View file

@ -228,11 +228,12 @@ func (d *Driver) WriteStream(path string, offset int64, reader io.Reader) (total
for int64(bytesRead) < total { for int64(bytesRead) < total {
//The loop should very rarely enter a second iteration //The loop should very rarely enter a second iteration
nn, err := io.ReadFull(current, buf[bytesRead:total]) nn, err := io.ReadFull(current, buf[bytesRead:total])
if err != nil && err != io.ErrUnexpectedEOF && err != io.EOF { bytesRead += nn
if err != nil {
// If you can't read the total contents, this means you lack access to the current file
return err return err
} }
bytesRead += nn
} }
return nil return nil
} }
@ -245,8 +246,12 @@ func (d *Driver) WriteStream(path string, offset int64, reader io.Reader) (total
totalRead += int64(nn) totalRead += int64(nn)
bytesRead += nn bytesRead += nn
if err != nil && err != io.ErrUnexpectedEOF && err != io.EOF { if err != nil {
return err if err != io.ErrUnexpectedEOF && err != io.EOF {
return err
}
break
} }
} }
@ -304,8 +309,7 @@ func (d *Driver) WriteStream(path string, offset int64, reader io.Reader) (total
for from+int64(bytesRead) < to { for from+int64(bytesRead) < to {
nn, err := io.ReadFull(bytes.NewReader(zeroBuf), buf[from+int64(bytesRead):to]) nn, err := io.ReadFull(bytes.NewReader(zeroBuf), buf[from+int64(bytesRead):to])
bytesRead += nn bytesRead += nn
if err != nil {
if err != nil && err != io.ErrUnexpectedEOF && err != io.EOF {
return err return err
} }
} }
@ -331,8 +335,7 @@ func (d *Driver) WriteStream(path string, offset int64, reader io.Reader) (total
for from+bytesRead64+int64(bytesRead) < to { for from+bytesRead64+int64(bytesRead) < to {
nn, err := io.ReadFull(bytes.NewReader(zeroBuf), buf[0+bytesRead:(to-from)%chunkSize]) nn, err := io.ReadFull(bytes.NewReader(zeroBuf), buf[0+bytesRead:(to-from)%chunkSize])
bytesRead64 += int64(nn) bytesRead64 += int64(nn)
if err != nil {
if err != nil && err != io.ErrUnexpectedEOF && err != io.EOF {
return err return err
} }
} }