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

rename

Browse source
This commit is contained in:
Chris Lu 2020-11-26 15:19:43 -08:00
parent 983fd90010
commit 6783ae5f8f
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
weed/storage/disk_location.go
View file

@ -52,15 +52,14 @@ func NewDiskLocation(dir string, maxVolumeCount int, minFreeSpacePercent float32
return location return location
} }
func (l *DiskLocation) volumeIdFromPath(dir os.FileInfo) (needle.VolumeId, string, error) { func (l *DiskLocation) volumeIdFromFileName(filename string) (needle.VolumeId, string, error) {
name := dir.Name() if strings.HasSuffix(filename, ".idx") {
if !dir.IsDir() && strings.HasSuffix(name, ".idx") { base := filename[:len(filename)-len(".idx")]
base := name[:len(name)-len(".idx")]
collection, volumeId, err := parseCollectionVolumeId(base) collection, volumeId, err := parseCollectionVolumeId(base)
return volumeId, collection, err return volumeId, collection, err
} }
return 0, "", fmt.Errorf("Path is not a volume: %s", name) return 0, "", fmt.Errorf("file is not a volume: %s", filename)
} }
func parseCollectionVolumeId(base string) (collection string, vid needle.VolumeId, err error) { func parseCollectionVolumeId(base string) (collection string, vid needle.VolumeId, err error) {
@ -73,24 +72,25 @@ 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() basename := fileInfo.Name()
if fileInfo.IsDir() { if fileInfo.IsDir() {
return false return false
} }
if !strings.HasSuffix(name, ".idx") { if !strings.HasSuffix(basename, ".idx") {
return false return false
} }
name = name[:len(name)-len(".idx")] volumeName := basename[:len(basename)-len(".idx")]
noteFile := l.Directory + "/" + name + ".note" noteFile := l.Directory + "/" + volumeName + ".note"
if util.FileExists(noteFile) { if util.FileExists(noteFile) {
note, _ := ioutil.ReadFile(noteFile) note, _ := ioutil.ReadFile(noteFile)
glog.Warningf("volume %s was not completed: %s", name, string(note)) glog.Warningf("volume %s was not completed: %s", volumeName, string(note))
removeVolumeFiles(l.Directory + "/" + name) removeVolumeFiles(l.Directory + "/" + volumeName)
removeVolumeFiles(l.IdxDirectory + "/" + volumeName)
return false return false
} }
vid, collection, err := l.volumeIdFromPath(fileInfo) vid, collection, err := l.volumeIdFromFileName(basename)
if err != nil { if err != nil {
glog.Warningf("get volume id failed, %s, err : %s", name, err) glog.Warningf("get volume id failed, %s, err : %s", volumeName, err)
return false return false
} }
@ -105,7 +105,7 @@ func (l *DiskLocation) loadExistingVolume(fileInfo os.FileInfo, needleMapKind Ne
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", name, e) glog.V(0).Infof("new volume %s error %s", volumeName, e)
return false return false
} }
@ -113,7 +113,7 @@ func (l *DiskLocation) loadExistingVolume(fileInfo os.FileInfo, needleMapKind Ne
size, _, _ := v.FileStat() size, _, _ := v.FileStat()
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+"/"+volumeName+".dat", v.ReplicaPlacement, v.Version(), size, v.Ttl.String())
return true return true
} }
@ -301,7 +301,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.volumeIdFromPath(fileInfo) volId, _, err := l.volumeIdFromFileName(fileInfo.Name())
if vid == volId && err == nil { if vid == volId && err == nil {
return fileInfo, true return fileInfo, true
} }