MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-01 02:03:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Send length instead of empty buffer for ReadFile() (#6414)

Browse Source
This commit is contained in:
Krishna Srinivas 2018-09-04 23:22:05 -07:00 committed by Harshavardhana
parent 9e32cc283f
commit 81b7e5c7a8
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/storage-rpc-client.go
View File

@ -227,7 +227,7 @@ func (client *StorageRPCClient) ReadFile(volume string, path string, offset int6
Vol: volume, Vol: volume,
Path: path, Path: path,
Offset: offset, Offset: offset,
Buffer: buffer, Length: int64(len(buffer)),
Verified: true, // mark read as verified by default Verified: true, // mark read as verified by default
} }
if verifier != nil { if verifier != nil {

7
cmd/storage-rpc-server.go
View File

@ -127,7 +127,7 @@ type ReadFileArgs struct {
Vol string Vol string
Path string Path string
Offset int64 Offset int64
Buffer []byte Length int64
Algo BitrotAlgorithm Algo BitrotAlgorithm
ExpectedHash []byte ExpectedHash []byte
Verified bool Verified bool
@ -140,13 +140,14 @@ func (receiver *storageRPCReceiver) ReadFile(args *ReadFileArgs, reply *[]byte)
verifier = NewBitrotVerifier(args.Algo, args.ExpectedHash) verifier = NewBitrotVerifier(args.Algo, args.ExpectedHash)
} }
n, err := receiver.local.ReadFile(args.Vol, args.Path, args.Offset, args.Buffer, verifier) buf := make([]byte, args.Length)
n, err := receiver.local.ReadFile(args.Vol, args.Path, args.Offset, buf, verifier)
// Ignore io.ErrEnexpectedEOF for short reads i.e. less content available than requested. // Ignore io.ErrEnexpectedEOF for short reads i.e. less content available than requested.
if err == io.ErrUnexpectedEOF { if err == io.ErrUnexpectedEOF {
err = nil err = nil
} }
*reply = args.Buffer[0:n] *reply = buf[0:n]
return err return err
} }