lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-10-21 10:37:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into support_ssd_volume

Browse Source
This commit is contained in:
Chris Lu
2020-12-16 08:26:51 -08:00
parent 97dcae827b b789767cd1
commit 23014b6810
7 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
weed/storage/disk_location.go
View File

@@ -101,12 +101,14 @@ func (l *DiskLocation) loadExistingVolume(fileInfo os.FileInfo, needleMapKind Ne
}
// avoid loading one volume more than once
l.volumesLock.RLock()
_, found := l.volumes[vid]
l.volumesLock.RUnlock()
if found {
l.volumesLock.Lock()
if _, found := l.volumes[vid]; found {
l.volumesLock.Unlock()
glog.V(1).Infof("loaded volume, %v", vid)
return true
} else {
l.volumes[vid] = nil
l.volumesLock.Unlock()
}
// load the volume
@@ -115,7 +117,7 @@ func (l *DiskLocation) loadExistingVolume(fileInfo os.FileInfo, needleMapKind Ne
glog.V(0).Infof("new volume %s error %s", volumeName, e)
return false
}
l.SetVolume(vid, v)
size, _, _ := v.FileStat()