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

refactor

Browse Source
This commit is contained in:
Chris Lu
2020-11-26 17:21:55 -08:00
parent c0fb4a3766
commit 3c229eb677
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
weed/storage/disk_location.go
View File

@@ -52,7 +52,7 @@ func NewDiskLocation(dir string, maxVolumeCount int, minFreeSpacePercent float32
return location return location
} }
func (l *DiskLocation) volumeIdFromFileName(filename string) (needle.VolumeId, string, error) { func volumeIdFromFileName(filename string) (needle.VolumeId, string, error) {
if strings.HasSuffix(filename, ".idx") { if strings.HasSuffix(filename, ".idx") {
base := filename[:len(filename)-len(".idx")] base := filename[:len(filename)-len(".idx")]
collection, volumeId, err := parseCollectionVolumeId(base) collection, volumeId, err := parseCollectionVolumeId(base)
@@ -80,6 +80,8 @@ func (l *DiskLocation) loadExistingVolume(fileInfo os.FileInfo, needleMapKind Ne
return false return false
} }
volumeName := basename[:len(basename)-len(".idx")] volumeName := basename[:len(basename)-len(".idx")]
// check for incomplete volume
noteFile := l.Directory + "/" + volumeName + ".note" noteFile := l.Directory + "/" + volumeName + ".note"
if util.FileExists(noteFile) { if util.FileExists(noteFile) {
note, _ := ioutil.ReadFile(noteFile) note, _ := ioutil.ReadFile(noteFile)
@@ -88,13 +90,15 @@ func (l *DiskLocation) loadExistingVolume(fileInfo os.FileInfo, needleMapKind Ne
removeVolumeFiles(l.IdxDirectory + "/" + volumeName) removeVolumeFiles(l.IdxDirectory + "/" + volumeName)
return false return false
} }
vid, collection, err := l.volumeIdFromFileName(basename)
// parse out collection, volume id
vid, collection, err := volumeIdFromFileName(basename)
if err != nil { if err != nil {
glog.Warningf("get volume id failed, %s, err : %s", volumeName, err) glog.Warningf("get volume id failed, %s, err : %s", volumeName, err)
return false return false
} }
// void loading one volume more than once // avoid loading one volume more than once
l.volumesLock.RLock() l.volumesLock.RLock()
_, found := l.volumes[vid] _, found := l.volumes[vid]
l.volumesLock.RUnlock() l.volumesLock.RUnlock()
@@ -103,6 +107,7 @@ func (l *DiskLocation) loadExistingVolume(fileInfo os.FileInfo, needleMapKind Ne
return true return true
} }
// load the volume
v, e := NewVolume(l.Directory, collection, vid, needleMapKind, nil, nil, 0, 0) v, e := NewVolume(l.Directory, collection, vid, needleMapKind, nil, nil, 0, 0)
if e != nil { if e != nil {
glog.V(0).Infof("new volume %s error %s", volumeName, e) glog.V(0).Infof("new volume %s error %s", volumeName, e)
@@ -301,7 +306,7 @@ func (l *DiskLocation) Close() {
func (l *DiskLocation) LocateVolume(vid needle.VolumeId) (os.FileInfo, bool) { func (l *DiskLocation) LocateVolume(vid needle.VolumeId) (os.FileInfo, bool) {
if fileInfos, err := ioutil.ReadDir(l.Directory); err == nil { if fileInfos, err := ioutil.ReadDir(l.Directory); err == nil {
for _, fileInfo := range fileInfos { for _, fileInfo := range fileInfos {
volId, _, err := l.volumeIdFromFileName(fileInfo.Name()) volId, _, err := volumeIdFromFileName(fileInfo.Name())
if vid == volId && err == nil { if vid == volId && err == nil {
return fileInfo, true return fileInfo, true
} }