aboutsummaryrefslogtreecommitdiff
path: root/weed/s3api
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2020-04-29 02:41:47 -0700
committerChris Lu <chris.lu@gmail.com>2020-04-29 02:41:47 -0700
commitd57559d3f7c0978269b8e75f3a38daa36cb9cdcf (patch)
tree0ad47483bdc2e77804b4a7a2908ffcd490fec5dd /weed/s3api
parent5a0986dca093e38e9a74213683801b39736f4362 (diff)
downloadseaweedfs-d57559d3f7c0978269b8e75f3a38daa36cb9cdcf.tar.xz
seaweedfs-d57559d3f7c0978269b8e75f3a38daa36cb9cdcf.zip
chunk rememober encryption or not
Diffstat (limited to 'weed/s3api')
-rw-r--r--weed/s3api/filer_multipart.go11
1 files changed, 6 insertions, 5 deletions
diff --git a/weed/s3api/filer_multipart.go b/weed/s3api/filer_multipart.go
index 85ed99854..64a7331d9 100644
--- a/weed/s3api/filer_multipart.go
+++ b/weed/s3api/filer_multipart.go
@@ -69,11 +69,12 @@ func (s3a *S3ApiServer) completeMultipartUpload(input *s3.CompleteMultipartUploa
if strings.HasSuffix(entry.Name, ".part") && !entry.IsDirectory {
for _, chunk := range entry.Chunks {
p := &filer_pb.FileChunk{
- FileId: chunk.GetFileIdString(),
- Offset: offset,
- Size: chunk.Size,
- Mtime: chunk.Mtime,
- ETag: chunk.ETag,
+ FileId: chunk.GetFileIdString(),
+ Offset: offset,
+ Size: chunk.Size,
+ Mtime: chunk.Mtime,
+ CipherKey: chunk.CipherKey,
+ ETag: chunk.ETag,
}
finalParts = append(finalParts, p)
offset += int64(chunk.Size)