diff options
| author | Aleksey Kosov <rusyak777@list.ru> | 2025-05-22 19:46:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-22 09:46:49 -0700 |
| commit | 165af32d6b738daa14b84fb6e3c8891f4b46135b (patch) | |
| tree | 7e6128d2fda753abc031c6461ae9709b284afcdf /weed/mount | |
| parent | 5182d46e22d2458b16f1f2fb0358f6b5f3e18b5d (diff) | |
| download | seaweedfs-165af32d6b738daa14b84fb6e3c8891f4b46135b.tar.xz seaweedfs-165af32d6b738daa14b84fb6e3c8891f4b46135b.zip | |
added context to filer_client method calls (#6808)
Co-authored-by: akosov <a.kosov@kryptonite.ru>
Diffstat (limited to 'weed/mount')
| -rw-r--r-- | weed/mount/meta_cache/meta_cache_init.go | 2 | ||||
| -rw-r--r-- | weed/mount/weedfs_dir_lookup.go | 2 | ||||
| -rw-r--r-- | weed/mount/weedfs_dir_mkrm.go | 4 | ||||
| -rw-r--r-- | weed/mount/weedfs_file_mkrm.go | 4 | ||||
| -rw-r--r-- | weed/mount/weedfs_file_sync.go | 2 | ||||
| -rw-r--r-- | weed/mount/weedfs_link.go | 4 | ||||
| -rw-r--r-- | weed/mount/weedfs_symlink.go | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/weed/mount/meta_cache/meta_cache_init.go b/weed/mount/meta_cache/meta_cache_init.go index 1cab499e0..068daa3f9 100644 --- a/weed/mount/meta_cache/meta_cache_init.go +++ b/weed/mount/meta_cache/meta_cache_init.go @@ -44,7 +44,7 @@ func doEnsureVisited(mc *MetaCache, client filer_pb.FilerClient, path util.FullP glog.V(4).Infof("ReadDirAllEntries %s ...", path) err := util.Retry("ReadDirAllEntries", func() error { - return filer_pb.ReadDirAllEntries(client, path, "", func(pbEntry *filer_pb.Entry, isLast bool) error { + return filer_pb.ReadDirAllEntries(context.Background(), client, path, "", func(pbEntry *filer_pb.Entry, isLast bool) error { entry := filer.FromPbEntry(string(path), pbEntry) if IsHiddenSystemEntry(string(path), entry.Name()) { return nil diff --git a/weed/mount/weedfs_dir_lookup.go b/weed/mount/weedfs_dir_lookup.go index 7fc10ef28..7af989b80 100644 --- a/weed/mount/weedfs_dir_lookup.go +++ b/weed/mount/weedfs_dir_lookup.go @@ -41,7 +41,7 @@ func (wfs *WFS) Lookup(cancel <-chan struct{}, header *fuse.InHeader, name strin if localEntry == nil { // glog.V(3).Infof("dir Lookup cache miss %s", fullFilePath) - entry, err := filer_pb.GetEntry(wfs, fullFilePath) + entry, err := filer_pb.GetEntry(context.Background(), wfs, fullFilePath) if err != nil { glog.V(1).Infof("dir GetEntry %s: %v", fullFilePath, err) return fuse.ENOENT diff --git a/weed/mount/weedfs_dir_mkrm.go b/weed/mount/weedfs_dir_mkrm.go index e69c9796e..503d6a076 100644 --- a/weed/mount/weedfs_dir_mkrm.go +++ b/weed/mount/weedfs_dir_mkrm.go @@ -63,7 +63,7 @@ func (wfs *WFS) Mkdir(cancel <-chan struct{}, in *fuse.MkdirIn, name string, out } glog.V(1).Infof("mkdir: %v", request) - if err := filer_pb.CreateEntry(client, request); err != nil { + if err := filer_pb.CreateEntry(context.Background(), client, request); err != nil { glog.V(0).Infof("mkdir %s: %v", entryFullPath, err) return err } @@ -107,7 +107,7 @@ func (wfs *WFS) Rmdir(cancel <-chan struct{}, header *fuse.InHeader, name string glog.V(3).Infof("remove directory: %v", entryFullPath) ignoreRecursiveErr := true // ignore recursion error since the OS should manage it - err := filer_pb.Remove(wfs, string(dirFullPath), name, true, false, ignoreRecursiveErr, false, []int32{wfs.signature}) + err := filer_pb.Remove(context.Background(), wfs, string(dirFullPath), name, true, false, ignoreRecursiveErr, false, []int32{wfs.signature}) if err != nil { glog.V(0).Infof("remove %s: %v", entryFullPath, err) if strings.Contains(err.Error(), filer.MsgFailDelNonEmptyFolder) { diff --git a/weed/mount/weedfs_file_mkrm.go b/weed/mount/weedfs_file_mkrm.go index e6139e88e..e48d5af40 100644 --- a/weed/mount/weedfs_file_mkrm.go +++ b/weed/mount/weedfs_file_mkrm.go @@ -83,7 +83,7 @@ func (wfs *WFS) Mknod(cancel <-chan struct{}, in *fuse.MknodIn, name string, out } glog.V(1).Infof("mknod: %v", request) - if err := filer_pb.CreateEntry(client, request); err != nil { + if err := filer_pb.CreateEntry(context.Background(), client, request); err != nil { glog.V(0).Infof("mknod %s: %v", entryFullPath, err) return err } @@ -137,7 +137,7 @@ func (wfs *WFS) Unlink(cancel <-chan struct{}, header *fuse.InHeader, name strin // first, ensure the filer store can correctly delete glog.V(3).Infof("remove file: %v", entryFullPath) isDeleteData := entry != nil && entry.HardLinkCounter <= 1 - err := filer_pb.Remove(wfs, string(dirFullPath), name, isDeleteData, false, false, false, []int32{wfs.signature}) + err := filer_pb.Remove(context.Background(), wfs, string(dirFullPath), name, isDeleteData, false, false, false, []int32{wfs.signature}) if err != nil { glog.V(0).Infof("remove %s: %v", entryFullPath, err) return fuse.OK diff --git a/weed/mount/weedfs_file_sync.go b/weed/mount/weedfs_file_sync.go index e13ab198d..541270ff5 100644 --- a/weed/mount/weedfs_file_sync.go +++ b/weed/mount/weedfs_file_sync.go @@ -159,7 +159,7 @@ func (wfs *WFS) doFlush(fh *FileHandle, uid, gid uint32) fuse.Status { wfs.mapPbIdFromLocalToFiler(request.Entry) defer wfs.mapPbIdFromFilerToLocal(request.Entry) - if err := filer_pb.CreateEntry(client, request); err != nil { + if err := filer_pb.CreateEntry(context.Background(), client, request); err != nil { glog.Errorf("fh flush create %s: %v", fileFullPath, err) return fmt.Errorf("fh flush create %s: %v", fileFullPath, err) } diff --git a/weed/mount/weedfs_link.go b/weed/mount/weedfs_link.go index 8c5b67ce2..344b907b4 100644 --- a/weed/mount/weedfs_link.go +++ b/weed/mount/weedfs_link.go @@ -88,12 +88,12 @@ func (wfs *WFS) Link(cancel <-chan struct{}, in *fuse.LinkIn, name string, out * wfs.mapPbIdFromLocalToFiler(request.Entry) defer wfs.mapPbIdFromFilerToLocal(request.Entry) - if err := filer_pb.UpdateEntry(client, updateOldEntryRequest); err != nil { + if err := filer_pb.UpdateEntry(context.Background(), client, updateOldEntryRequest); err != nil { return err } wfs.metaCache.UpdateEntry(context.Background(), filer.FromPbEntry(updateOldEntryRequest.Directory, updateOldEntryRequest.Entry)) - if err := filer_pb.CreateEntry(client, request); err != nil { + if err := filer_pb.CreateEntry(context.Background(), client, request); err != nil { return err } diff --git a/weed/mount/weedfs_symlink.go b/weed/mount/weedfs_symlink.go index 8842ec3e6..80081c31c 100644 --- a/weed/mount/weedfs_symlink.go +++ b/weed/mount/weedfs_symlink.go @@ -53,7 +53,7 @@ func (wfs *WFS) Symlink(cancel <-chan struct{}, header *fuse.InHeader, target st wfs.mapPbIdFromLocalToFiler(request.Entry) defer wfs.mapPbIdFromFilerToLocal(request.Entry) - if err := filer_pb.CreateEntry(client, request); err != nil { + if err := filer_pb.CreateEntry(context.Background(), client, request); err != nil { return fmt.Errorf("symlink %s: %v", entryFullPath, err) } |
