gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

just refactoring

Browse source
This commit is contained in:
Chris Lu 2020-11-26 15:08:05 -08:00
parent b11449f955
commit 97f706f35b
1 changed files with 47 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
weed/storage/disk_location.go
View file

@ -74,8 +74,13 @@ func parseCollectionVolumeId(base string) (collection string, vid needle.VolumeI
func (l *DiskLocation) loadExistingVolume(fileInfo os.FileInfo, needleMapKind NeedleMapType) bool { func (l *DiskLocation) loadExistingVolume(fileInfo os.FileInfo, needleMapKind NeedleMapType) bool {
name := fileInfo.Name() name := fileInfo.Name()
if !fileInfo.IsDir() && strings.HasSuffix(name, ".idx") { if fileInfo.IsDir() {
name := name[:len(name)-len(".idx")] return false
}
if !strings.HasSuffix(name, ".idx") {
return false
}
name = name[:len(name)-len(".idx")]
noteFile := l.Directory + "/" + name + ".note" noteFile := l.Directory + "/" + name + ".note"
if util.FileExists(noteFile) { if util.FileExists(noteFile) {
note, _ := ioutil.ReadFile(noteFile) note, _ := ioutil.ReadFile(noteFile)
@ -110,17 +115,15 @@ func (l *DiskLocation) loadExistingVolume(fileInfo os.FileInfo, needleMapKind Ne
glog.V(0).Infof("data file %s, replicaPlacement=%s v=%d size=%d ttl=%s", glog.V(0).Infof("data file %s, replicaPlacement=%s v=%d size=%d ttl=%s",
l.Directory+"/"+name+".dat", v.ReplicaPlacement, v.Version(), size, v.Ttl.String()) l.Directory+"/"+name+".dat", v.ReplicaPlacement, v.Version(), size, v.Ttl.String())
return true return true
}
return false
} }
func (l *DiskLocation) concurrentLoadingVolumes(needleMapKind NeedleMapType, concurrency int) { func (l *DiskLocation) concurrentLoadingVolumes(needleMapKind NeedleMapType, concurrency int) {
task_queue := make(chan os.FileInfo, 10*concurrency) task_queue := make(chan os.FileInfo, 10*concurrency)
go func() { go func() {
if dirs, err := ioutil.ReadDir(l.Directory); err == nil { if fileInfos, err := ioutil.ReadDir(l.Directory); err == nil {
for _, dir := range dirs { for _, fi := range fileInfos {
task_queue <- dir task_queue <- fi
} }
} }
close(task_queue) close(task_queue)
@ -131,8 +134,8 @@ func (l *DiskLocation) concurrentLoadingVolumes(needleMapKind NeedleMapType, con
wg.Add(1) wg.Add(1)
go func() { go func() {
defer wg.Done() defer wg.Done()
for dir := range task_queue { for fi := range task_queue {
_ = l.loadExistingVolume(dir, needleMapKind) _ = l.loadExistingVolume(fi, needleMapKind)
} }
}() }()
} }