Skip to content

fix(ObjectStore): Make S3 "connect_timeout" option configurable - #53498

Merged
danxuliu merged 1 commit into
masterfrom
fix/noid/make-s3-connect-timeout-option-configurable
Jun 17, 2025
Merged

fix(ObjectStore): Make S3 "connect_timeout" option configurable#53498
danxuliu merged 1 commit into
masterfrom
fix/noid/make-s3-connect-timeout-option-configurable

Conversation

@danxuliu

@danxuliudanxuliu commented Jun 15, 2025

Copy link
Copy Markdown
Member

Follow up to #46317

The hardcoded connection timeout of 5 seconds may not be enough in some cases, so now it is got from the ObjectStore arguments in Nextcloud configuration, falling back to 5 if not set.

The connection timeout is set in seconds, but decimal precision can be used for subsecond accuracy (for example, 4.2 for 4200 milliseconds).

Note that the option is actually http->connect_timeout when passed to the SDK, but it was kept as a flat connect_timeout rather than a nested http->connect_timeout in the ObjectStore arguments for simplicity.

Documentation: nextcloud/documentation#13226

@danxuliu

Copy link
Copy Markdown
MemberAuthor

/backport to stable31

@danxuliu

Copy link
Copy Markdown
MemberAuthor

/backport to stable30

@danxuliu

Copy link
Copy Markdown
MemberAuthor

Failing tests are unrelated and it seems that they were introduced in #53457

@danxuliu
danxuliu marked this pull request as ready for review June 15, 2025 08:15
@danxuliu
danxuliu requested a review from a team as a code ownerJune 15, 2025 08:15
@danxuliu
danxuliu requested review from ArtificialOwl, artonge and provokateurin and removed request for a teamJune 15, 2025 08:15
The hardcoded connection timeout of 5 seconds may not be enough in some
cases, so now it is got from the ObjectStore arguments in Nextcloud
configuration, falling back to 5 if not set.
The connection timeout is set in seconds, but decimal precision can be
used for subsecond accuracy (for example, 4.2 for 4200 milliseconds).
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@danxuliu
danxuliuforce-pushed the fix/noid/make-s3-connect-timeout-option-configurable branch from 2059a7d to d7ae952CompareJune 16, 2025 18:18
@danxuliu

Copy link
Copy Markdown
MemberAuthor

Rebased on latest master to (hopefully) get green CI.

@danxuliu
danxuliu merged commit b69f041 into masterJun 17, 2025
@danxuliu
danxuliu deleted the fix/noid/make-s3-connect-timeout-option-configurable branch June 17, 2025 03:30
@skjnldsvskjnldsv mentioned this pull request Aug 19, 2025
@skjnldsvskjnldsv added this to the Nextcloud 32 milestone Oct 2, 2025
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@danxuliu@ArtificialOwl@provokateurin@skjnldsv