go/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-01-13 20:38:12 +02:00
Code Issues Releases Activity

Revert "s3: fix InvalidRequest copying to a locked bucket from a source with no MD5SUM"

Browse Source 
This reverts commit e5a1bcb1ce.

This causes a lot of integration test failures so may need to be optional.
This commit is contained in:
Nick Craig-Wood 2023-03-21 11:43:35 +00:00
parent 15e633fa8b
commit d481aa8613
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
backend/s3/s3.go
View File

@ -1912,9 +1912,6 @@ size (e.g. from "rclone rcat" or uploaded with "rclone mount" or google
photos or google docs) they will be uploaded as multipart uploads photos or google docs) they will be uploaded as multipart uploads
using this chunk size. using this chunk size.
Files with no source MD5 will also be uploaded with multipart uploads
as will all files if --s3-disable-checksum is set.
Note that "--s3-upload-concurrency" chunks of this size are buffered Note that "--s3-upload-concurrency" chunks of this size are buffered
in memory per transfer. in memory per transfer.
@ -1970,11 +1967,7 @@ The minimum is 0 and the maximum is 5 GiB.`,
Normally rclone will calculate the MD5 checksum of the input before Normally rclone will calculate the MD5 checksum of the input before
uploading it so it can add it to metadata on the object. This is great uploading it so it can add it to metadata on the object. This is great
for data integrity checking but can cause long delays for large files for data integrity checking but can cause long delays for large files
to start uploading. to start uploading.`,
Note that setting this flag forces all uploads to be multipart uploads
as we can't protect the body of the transfer unless we have an MD5.
`,
Default: false, Default: false,
Advanced: true, Advanced: true,
}, { }, {
@ -5507,12 +5500,6 @@ func (o *Object) Update(ctx context.Context, in io.Reader, src fs.ObjectInfo, op
} }
} }
} }
// If source MD5SUM not available then do multipart upload
// otherwise uploads are not hash protected and locked buckets
// will complain #6846
if !multipart && md5sumHex == "" {
multipart = true
}
// Set the content type it it isn't set already // Set the content type it it isn't set already
if req.ContentType == nil { if req.ContentType == nil {