diff options
| author | chrislu <chris.lu@gmail.com> | 2022-08-20 18:54:59 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-08-20 18:54:59 -0700 |
| commit | a3553da7f7ce7ecf5e7c5082026218d50b1f7230 (patch) | |
| tree | c2947caa1bb173e633fc9b46bb4766b475eea79b | |
| parent | d49d0a9fc29db0ae3fd667d3f988561ca8e3b635 (diff) | |
| download | seaweedfs-a3553da7f7ce7ecf5e7c5082026218d50b1f7230.tar.xz seaweedfs-a3553da7f7ce7ecf5e7c5082026218d50b1f7230.zip | |
add fileId to UploadWithRetry return result
| -rw-r--r-- | weed/command/filer_copy.go | 4 | ||||
| -rw-r--r-- | weed/operation/upload_content.go | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/weed/command/filer_copy.go b/weed/command/filer_copy.go index e20087ce4..a196d25f3 100644 --- a/weed/command/filer_copy.go +++ b/weed/command/filer_copy.go @@ -585,8 +585,7 @@ func detectMimeType(f *os.File) string { func (worker *FileCopyWorker) saveDataAsChunk(reader io.Reader, name string, offset int64) (chunk *filer_pb.FileChunk, err error) { - var finalFileId string - uploadResult, flushErr, _ := operation.UploadWithRetry( + finalFileId, uploadResult, flushErr, _ := operation.UploadWithRetry( worker, &filer_pb.AssignVolumeRequest{ Count: 1, @@ -604,7 +603,6 @@ func (worker *FileCopyWorker) saveDataAsChunk(reader io.Reader, name string, off PairMap: nil, }, func(host, fileId string) string { - finalFileId = fileId return fmt.Sprintf("http://%s/%s", host, fileId) }, reader, diff --git a/weed/operation/upload_content.go b/weed/operation/upload_content.go index 76f55523a..c5d2ce7c9 100644 --- a/weed/operation/upload_content.go +++ b/weed/operation/upload_content.go @@ -80,10 +80,10 @@ func init() { // UploadWithRetry will retry both assigning volume request and uploading content // The option parameter does not need to specify UploadUrl and Jwt, which will come from assigning volume. -func UploadWithRetry(filerClient filer_pb.FilerClient, assignRequest *filer_pb.AssignVolumeRequest, uploadOption *UploadOption, genFileUrlFn func(host, fileId string) string, reader io.Reader) (uploadResult *UploadResult, err error, data []byte) { +func UploadWithRetry(filerClient filer_pb.FilerClient, assignRequest *filer_pb.AssignVolumeRequest, uploadOption *UploadOption, genFileUrlFn func(host, fileId string) string, reader io.Reader) (fileId string, uploadResult *UploadResult, err error, data []byte) { doUploadFunc := func() error { - var fileId, host string + var host string var auth security.EncodedJwt // grpc assign volume |