diff options
| author | chrislu <chris.lu@gmail.com> | 2024-09-29 20:47:16 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2024-09-29 20:47:16 -0700 |
| commit | 190b2fc27637017cdd075331fd04b8cb0e5879b7 (patch) | |
| tree | 93db54c4ad83af2b09eb7862380b8c634154e203 /weed/shell/command_fs_merge_volumes.go | |
| parent | 8111ec13bd06e4a9142a87640986de8c41d4b75a (diff) | |
| parent | 20929f2a5753a04385be2378e698c8df762b3256 (diff) | |
| download | seaweedfs-origin/mq2.tar.xz seaweedfs-origin/mq2.zip | |
Merge branch 'master' into mq2origin/mq2
Diffstat (limited to 'weed/shell/command_fs_merge_volumes.go')
| -rw-r--r-- | weed/shell/command_fs_merge_volumes.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/weed/shell/command_fs_merge_volumes.go b/weed/shell/command_fs_merge_volumes.go index b77feb8e3..eb401aab1 100644 --- a/weed/shell/command_fs_merge_volumes.go +++ b/weed/shell/command_fs_merge_volumes.go @@ -44,6 +44,10 @@ func (c *commandFsMergeVolumes) Help() string { ` } +func (c *commandFsMergeVolumes) HasTag(CommandTag) bool { + return false +} + func (c *commandFsMergeVolumes) Do(args []string, commandEnv *CommandEnv, writer io.Writer) (err error) { fsMergeVolumesCommand := flag.NewFlagSet(c.Name(), flag.ContinueOnError) @@ -322,7 +326,7 @@ func moveChunk(chunk *filer_pb.FileChunk, toVolumeId needle.VolumeId, masterClie if err != nil { return err } - + _, err, _ = uploader.Upload(reader, &operation.UploadOption{ UploadUrl: uploadURL, Filename: filename, |