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

fix nill

Browse Source
This commit is contained in:
Chris Lu
2019-12-13 10:35:23 -08:00
parent f59119cd1d
commit deb249736e
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
weed/filesys/dir.go
View File

@@ -41,10 +41,12 @@ func (dir *Dir) Attr(ctx context.Context, attr *fuse.Attr) error {
} }
item := dir.wfs.listDirectoryEntriesCache.Get(dir.Path) item := dir.wfs.listDirectoryEntriesCache.Get(dir.Path)
var entry *filer_pb.Entry
if item != nil && !item.Expired() { if item != nil && !item.Expired() {
entry = item.Value().(*filer_pb.Entry)
}
glog.V(4).Infof("dir Attr cache hit %s", dir.Path) if entry != nil {
entry := item.Value().(*filer_pb.Entry) entry := item.Value().(*filer_pb.Entry)
attr.Mtime = time.Unix(entry.Attributes.Mtime, 0) attr.Mtime = time.Unix(entry.Attributes.Mtime, 0)

5
weed/filesys/file.go
View File

@@ -141,11 +141,14 @@ func (file *File) Fsync(ctx context.Context, req *fuse.FsyncRequest) error {
func (file *File) maybeLoadAttributes(ctx context.Context) error { func (file *File) maybeLoadAttributes(ctx context.Context) error {
if file.entry == nil || !file.isOpen { if file.entry == nil || !file.isOpen {
item := file.wfs.listDirectoryEntriesCache.Get(file.fullpath()) item := file.wfs.listDirectoryEntriesCache.Get(file.fullpath())
var entry *filer_pb.Entry
if item != nil && !item.Expired() { if item != nil && !item.Expired() {
entry = item.Value().(*filer_pb.Entry)
}
if entry != nil {
glog.V(4).Infof("file read attr cache hit %s", file.fullpath()) glog.V(4).Infof("file read attr cache hit %s", file.fullpath())
entry := item.Value().(*filer_pb.Entry)
file.setEntry(entry) file.setEntry(entry)
// 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 {