gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct cache: fix racing condition

Browse Source
This commit is contained in:
chrislusf
2016-04-17 12:03:45 -07:00
parent 6dd257a81f
commit adcfaa5735
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
go/storage/needle_read_write.go
View File

@@ -139,12 +139,7 @@ func (n *Needle) Append(w io.Writer, version Version) (size uint32, err error) {
func ReadNeedleBlob(r *os.File, offset int64, size uint32) (dataSlice []byte, block *Block, err error) {
padding := NeedlePaddingSize - ((NeedleHeaderSize + size + NeedleChecksumSize) % NeedlePaddingSize)
readSize := NeedleHeaderSize + size + NeedleChecksumSize + padding
block, isNew := getBytesForFileBlock(r, offset, int(readSize))
dataSlice = block.Bytes[0:int(readSize)]
if isNew {
_, err = r.ReadAt(dataSlice, offset)
}
return dataSlice, block, err
return getBytesForFileBlock(r, offset, int(readSize))
}
func (n *Needle) ReadData(r *os.File, offset int64, size uint32, version Version) (err error) {