lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-12-17 17:51:20 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Chris Lu
2019-01-05 15:21:56 -08:00
parent 6740427638
commit fe50224ea0
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
weed/filesys/file.go
View File

@@ -139,8 +139,7 @@ func (file *File) maybeLoadAttributes(ctx context.Context) error {
item := file.wfs.listDirectoryEntriesCache.Get(file.fullpath()) item := file.wfs.listDirectoryEntriesCache.Get(file.fullpath())
if item != nil && !item.Expired() { if item != nil && !item.Expired() {
entry := item.Value().(*filer_pb.Entry) entry := item.Value().(*filer_pb.Entry)
file.entry = entry file.setEntry(entry)
file.entryViewCache = nil
// glog.V(1).Infof("file attr read cached %v attributes", file.Name) // glog.V(1).Infof("file attr read cached %v attributes", file.Name)
} else { } else {
err := file.wfs.withFilerClient(func(client filer_pb.SeaweedFilerClient) error { err := file.wfs.withFilerClient(func(client filer_pb.SeaweedFilerClient) error {
@@ -156,8 +155,7 @@ func (file *File) maybeLoadAttributes(ctx context.Context) error {
return fuse.ENOENT return fuse.ENOENT
} }
file.entry = resp.Entry file.setEntry(resp.Entry)
file.entryViewCache = nil
glog.V(3).Infof("file attr %v %+v: %d", file.fullpath(), file.entry.Attributes, filer2.TotalSize(file.entry.Chunks)) glog.V(3).Infof("file attr %v %+v: %d", file.fullpath(), file.entry.Attributes, filer2.TotalSize(file.entry.Chunks))
@@ -188,3 +186,8 @@ func (file *File) addChunks(chunks []*filer_pb.FileChunk) {
} }
file.entryViewCache = filer2.NonOverlappingVisibleIntervals(file.entry.Chunks) file.entryViewCache = filer2.NonOverlappingVisibleIntervals(file.entry.Chunks)
} }
func (file *File) setEntry(entry *filer_pb.Entry) {
file.entry = entry
file.entryViewCache = filer2.NonOverlappingVisibleIntervals(file.entry.Chunks)
}