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

fuse mount: dir lookup avoids extra conversion to filer_pb.Entry object

Browse Source
This commit is contained in:
Chris Lu
2021-04-14 22:38:34 -07:00
parent 1adc8f86ea
commit e41766feb6
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
weed/filesys/dir.go
View File

@@ -272,25 +272,25 @@ func (dir *Dir) Lookup(ctx context.Context, req *fuse.LookupRequest, resp *fuse.
glog.Errorf("dir Lookup %s: %v", dirPath, visitErr) glog.Errorf("dir Lookup %s: %v", dirPath, visitErr)
return nil, fuse.EIO return nil, fuse.EIO
} }
cachedEntry, cacheErr := dir.wfs.metaCache.FindEntry(context.Background(), fullFilePath) localEntry, cacheErr := dir.wfs.metaCache.FindEntry(context.Background(), fullFilePath)
if cacheErr == filer_pb.ErrNotFound { if cacheErr == filer_pb.ErrNotFound {
return nil, fuse.ENOENT return nil, fuse.ENOENT
} }
entry := cachedEntry.ToProtoEntry()
if entry == nil { if localEntry == nil {
// glog.V(3).Infof("dir Lookup cache miss %s", fullFilePath) // glog.V(3).Infof("dir Lookup cache miss %s", fullFilePath)
entry, err = filer_pb.GetEntry(dir.wfs, fullFilePath) entry, err := filer_pb.GetEntry(dir.wfs, fullFilePath)
if err != nil { if err != nil {
glog.V(1).Infof("dir GetEntry %s: %v", fullFilePath, err) glog.V(1).Infof("dir GetEntry %s: %v", fullFilePath, err)
return nil, fuse.ENOENT return nil, fuse.ENOENT
} }
localEntry = filer.FromPbEntry(string(dirPath), entry)
} else { } else {
glog.V(4).Infof("dir Lookup cache hit %s", fullFilePath) glog.V(4).Infof("dir Lookup cache hit %s", fullFilePath)
} }
if entry != nil { if localEntry != nil {
if entry.IsDirectory { if localEntry.IsDirectory() {
node = dir.newDirectory(fullFilePath) node = dir.newDirectory(fullFilePath)
} else { } else {
node = dir.newFile(req.Name) node = dir.newFile(req.Name)
@@ -299,13 +299,13 @@ func (dir *Dir) Lookup(ctx context.Context, req *fuse.LookupRequest, resp *fuse.
// resp.EntryValid = time.Second // resp.EntryValid = time.Second
// resp.Attr.Inode = fullFilePath.AsInode() // resp.Attr.Inode = fullFilePath.AsInode()
resp.Attr.Valid = time.Second resp.Attr.Valid = time.Second
resp.Attr.Mtime = time.Unix(entry.Attributes.Mtime, 0) resp.Attr.Mtime = localEntry.Attr.Mtime
resp.Attr.Crtime = time.Unix(entry.Attributes.Crtime, 0) resp.Attr.Crtime = localEntry.Attr.Crtime
resp.Attr.Mode = os.FileMode(entry.Attributes.FileMode) resp.Attr.Mode = localEntry.Attr.Mode
resp.Attr.Gid = entry.Attributes.Gid resp.Attr.Gid = localEntry.Attr.Gid
resp.Attr.Uid = entry.Attributes.Uid resp.Attr.Uid = localEntry.Attr.Uid
if entry.HardLinkCounter > 0 { if localEntry.HardLinkCounter > 0 {
resp.Attr.Nlink = uint32(entry.HardLinkCounter) resp.Attr.Nlink = uint32(localEntry.HardLinkCounter)
} }
return node, nil return node, nil