aboutsummaryrefslogtreecommitdiff
path: root/weed/command/filer_copy.go
diff options
context:
space:
mode:
authorchrislu <chris.lu@gmail.com>2022-08-20 18:14:57 -0700
committerchrislu <chris.lu@gmail.com>2022-08-20 18:14:57 -0700
commit689b4ecdcc9dc6edeaf557a6988f520e1fe608ac (patch)
tree11f94a2034b6a6f3f60c4cc29b532c6e1c7a9174 /weed/command/filer_copy.go
parente3f40d538d3184d5e84a953146516ddc85f151a5 (diff)
downloadseaweedfs-689b4ecdcc9dc6edeaf557a6988f520e1fe608ac.tar.xz
seaweedfs-689b4ecdcc9dc6edeaf557a6988f520e1fe608ac.zip
remove unused collection and replication from upload result
Diffstat (limited to 'weed/command/filer_copy.go')
-rw-r--r--weed/command/filer_copy.go11
1 files changed, 5 insertions, 6 deletions
diff --git a/weed/command/filer_copy.go b/weed/command/filer_copy.go
index aac43c697..7bfd484f0 100644
--- a/weed/command/filer_copy.go
+++ b/weed/command/filer_copy.go
@@ -583,7 +583,7 @@ func detectMimeType(f *os.File) string {
return mimeType
}
-func (worker *FileCopyWorker) saveDataAsChunk(reader io.Reader, name string, offset int64) (chunk *filer_pb.FileChunk, collection, replication string, err error) {
+func (worker *FileCopyWorker) saveDataAsChunk(reader io.Reader, name string, offset int64) (chunk *filer_pb.FileChunk, err error) {
var fileId, host string
var auth security.EncodedJwt
@@ -611,7 +611,6 @@ func (worker *FileCopyWorker) saveDataAsChunk(reader io.Reader, name string, off
}
fileId, host, auth = resp.FileId, resp.Location.Url, security.EncodedJwt(resp.Auth)
- collection, replication = resp.Collection, resp.Replication
return nil
})
@@ -621,7 +620,7 @@ func (worker *FileCopyWorker) saveDataAsChunk(reader io.Reader, name string, off
return nil
}); flushErr != nil {
- return nil, collection, replication, fmt.Errorf("filerGrpcAddress assign volume: %v", flushErr)
+ return nil, fmt.Errorf("filerGrpcAddress assign volume: %v", flushErr)
}
uploadOption := &operation.UploadOption{
@@ -635,10 +634,10 @@ func (worker *FileCopyWorker) saveDataAsChunk(reader io.Reader, name string, off
}
uploadResult, flushErr, _ := operation.Upload(reader, uploadOption)
if flushErr != nil {
- return nil, collection, replication, fmt.Errorf("upload data: %v", flushErr)
+ return nil, fmt.Errorf("upload data: %v", flushErr)
}
if uploadResult.Error != "" {
- return nil, collection, replication, fmt.Errorf("upload result: %v", uploadResult.Error)
+ return nil, fmt.Errorf("upload result: %v", uploadResult.Error)
}
- return uploadResult.ToPbFileChunk(fileId, offset), collection, replication, nil
+ return uploadResult.ToPbFileChunk(fileId, offset), nil
}