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

Make releaseMemory private and return byte array instead, fix other platform compilation issues, reduce in-memory chunk size.

Browse Source
This commit is contained in:
j.laycock
2019-10-01 12:21:44 +01:00
parent d5f5acb734
commit eb27c2b037
4 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
weed/storage/volume_super_block.go
View File

@@ -113,13 +113,11 @@ func ReadSuperBlock(dataFile *os.File) (superBlock SuperBlock, err error) {
header := make([]byte, _SuperBlockSize)
mMap, exists := memory_map.FileMemoryMap[dataFile.Name()]
if exists {
mBuffer, e := mMap.ReadMemory(0, _SuperBlockSize)
header, err = mMap.ReadMemory(0, _SuperBlockSize)
if err != nil {
err = fmt.Errorf("cannot read volume %s super block: %v", dataFile.Name(), e)
err = fmt.Errorf("cannot read volume %s super block: %v", dataFile.Name(), err)
return
}
copy(header, mBuffer.Buffer)
mBuffer.ReleaseMemory()
} else {
if _, err = dataFile.Seek(0, 0); err != nil {
err = fmt.Errorf("cannot seek to the beginning of %s: %v", dataFile.Name(), err)