aboutsummaryrefslogtreecommitdiff
path: root/weed/shell/command_fs_merge_volumes.go
diff options
context:
space:
mode:
authorAleksey Kosov <rusyak777@list.ru>2025-05-22 19:46:49 +0300
committerGitHub <noreply@github.com>2025-05-22 09:46:49 -0700
commit165af32d6b738daa14b84fb6e3c8891f4b46135b (patch)
tree7e6128d2fda753abc031c6461ae9709b284afcdf /weed/shell/command_fs_merge_volumes.go
parent5182d46e22d2458b16f1f2fb0358f6b5f3e18b5d (diff)
downloadseaweedfs-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/shell/command_fs_merge_volumes.go')
-rw-r--r--weed/shell/command_fs_merge_volumes.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/weed/shell/command_fs_merge_volumes.go b/weed/shell/command_fs_merge_volumes.go
index 31d9d6294..f31ec10f4 100644
--- a/weed/shell/command_fs_merge_volumes.go
+++ b/weed/shell/command_fs_merge_volumes.go
@@ -134,7 +134,7 @@ func (c *commandFsMergeVolumes) Do(args []string, commandEnv *CommandEnv, writer
continue
}
- if err = filer_pb.UpdateEntry(filerClient, &filer_pb.UpdateEntryRequest{
+ if err = filer_pb.UpdateEntry(context.Background(), filerClient, &filer_pb.UpdateEntryRequest{
Directory: string(parentPath),
Entry: entry,
}); err != nil {