Skip to content

fix(s3): Don't wait indefinitely for S3 to return - #46317

Merged
solracsf merged 1 commit into
masterfrom
s3InsertTimeout
Jul 9, 2024
Merged

fix(s3): Don't wait indefinitely for S3 to return#46317
solracsf merged 1 commit into
masterfrom
s3InsertTimeout

Conversation

@solracsf

@solracsfsolracsf commented Jul 5, 2024

Copy link
Copy Markdown
Member

Summary

By default, SDK never timeout. Insert some sane defaults.
https://docs.aws.amazon.com/sdk-for-php/v3/developer-guide/guide_configuration.html#config-http

Checklist

@solracsfsolracsf added the 3. to review Waiting for reviews label Jul 5, 2024
@solracsfsolracsf added this to the Nextcloud 30 milestone Jul 5, 2024
@solracsf

solracsf commented Jul 5, 2024

Copy link
Copy Markdown
MemberAuthor

/backport to stable29

@solracsf

solracsf commented Jul 5, 2024

Copy link
Copy Markdown
MemberAuthor

/backport to stable28

@solracsfsolracsf mentioned this pull request Jul 5, 2024
Closed
8 tasks
github-advanced-security[bot]
github-advanced-securityAI found potential problems Jul 5, 2024
View reviewed changes
Comment threadlib/private/Files/ObjectStore/S3ConnectionTrait.php Fixed
Comment threadlib/private/Files/ObjectStore/S3ConnectionTrait.php Fixed
@solracsf
solracsfforce-pushed the s3InsertTimeout branch 4 times, most recently from b284748 to 1ce2838CompareJuly 5, 2024 10:00
juliusknorr
juliusknorr reviewed Jul 5, 2024
View reviewed changes
Comment threadlib/private/Files/ObjectStore/S3ConnectionTrait.php Outdated
@solracsf
solracsf requested a review from juliusknorrJuly 5, 2024 14:10
@solracsf
fix(s3): Don't wait indefinitely for S3 to return
c84e76a
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
fix: lint
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
fix: use AwsException
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
fix: Throw on connection failure
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
fix: Wrap all in try catch block
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
fix: use RequestTimeout error message
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
log: use OCP Server class
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
fix: Handle connect timeout only
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
fix: Handle errors more generically
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
@solracsf

solracsf commented Jul 8, 2024

Copy link
Copy Markdown
MemberAuthor

/backport to stable29

@solracsf

solracsf commented Jul 8, 2024

Copy link
Copy Markdown
MemberAuthor

/backport to stable28

@solracsfsolracsf added feature: object storage 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jul 8, 2024
@solracsf
solracsf merged commit 6b523e8 into masterJul 9, 2024
@solracsf
solracsf deleted the s3InsertTimeout branch July 9, 2024 07:49
This was referenced Jul 9, 2024
Merged
Merged
@github-actions

github-actionsBot commented Jul 20, 2024

Copy link
Copy Markdown
Contributor

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)

@blizzzblizzz mentioned this pull request Jul 24, 2024
Merged
@danxuliudanxuliu mentioned this pull request Jun 15, 2025
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@juliusknorrjuliusknorrjuliusknorr approved these changes
@come-nccome-nccome-nc approved these changes
@icewind1991icewind1991Awaiting requested review from icewind1991

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finishfeature: object storagefeedback-requested

Projects

None yet

Milestone

Nextcloud 30

Development

Successfully merging this pull request may close these issues.

[Bug]: timeout not set in S3Client

4 participants

@solracsf@juliusknorr@github-advanced-security@come-nc