Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

@uppy/aws-s3-multipart: fix the chunk size calculation #4508

Merged
merged 8 commits into from
Jun 19, 2023
Merged

@uppy/aws-s3-multipart: fix the chunk size calculation #4508

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f9895e0
@uppy/aws-s3-multipart: fix the chunk size calculation
aduh95 Jun 16, 2023
d640fa4
fix
aduh95 Jun 19, 2023
50e65e1
🙄
aduh95 Jun 19, 2023
bb30ed2
simplify implementation
aduh95 Jun 19, 2023
f8f137c
Create `minPartSize` and `maxMultipartParts` & write comments
Murderlon Jun 19, 2023
e74daaf
`10_000`
Murderlon Jun 19, 2023
7df634e
Make new properties private
Murderlon Jun 19, 2023
f9119b6
Merge branch 'multipart-chunk-size' of https://github.com/aduh95/uppy…
Murderlon Jun 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions packages/@uppy/aws-s3-multipart/src/MultipartUploader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ class MultipartUploader {

#onReject = (err) => (err?.cause === pausingUploadReason ? null : this.#onError(err))

#maxMultipartParts = 10_000

#minPartSize = 5 * MB

constructor (data, options) {
this.options = {
...defaultOptions,
Expand All @@ -64,19 +68,26 @@ class MultipartUploader {
this.#initChunks()
}

// initChunks checks the user preference for using multipart uploads (opts.shouldUseMultipart)
// and calculates the optimal part size. When using multipart part uploads every part except for the last has
// to be at least 5 MB and there can be no more than 10K parts.
// This means we sometimes need to change the preferred part size from the user in order to meet these requirements.
#initChunks () {
const fileSize = this.#data.size
const shouldUseMultipart = typeof this.#shouldUseMultipart === 'function'
? this.#shouldUseMultipart(this.#file)
: Boolean(this.#shouldUseMultipart)

if (shouldUseMultipart) {
const desiredChunkSize = this.options.getChunkSize(this.#data)
// at least 5MB per request, at most 10k requests
const minChunkSize = Math.max(5 * MB, Math.ceil(fileSize / 10000))
const chunkSize = Math.max(desiredChunkSize, minChunkSize)
if (shouldUseMultipart && fileSize > this.#minPartSize) {
// At least 5MB per request:
let chunkSize = Math.max(this.options.getChunkSize(this.#data), this.#minPartSize)
let arraySize = Math.floor(fileSize / chunkSize)

const arraySize = Math.ceil(fileSize / chunkSize)
// At most 10k requests per file:
if (arraySize > this.#maxMultipartParts) {
arraySize = this.#maxMultipartParts
chunkSize = fileSize / this.#maxMultipartParts
}
this.#chunks = Array(arraySize)

for (let i = 0, j = 0; i < fileSize; i += chunkSize, j++) {
Expand Down