Skip to content

fix(objectstore): Do not apply default timeout to streams#5876

Merged
jjbayer merged 6 commits intomasterfrom
fix/objectstore-timeout
Apr 22, 2026
Merged

fix(objectstore): Do not apply default timeout to streams#5876
jjbayer merged 6 commits intomasterfrom
fix/objectstore-timeout

Conversation

@jjbayer
Copy link
Copy Markdown
Member

@jjbayer jjbayer commented Apr 22, 2026

With #5851 I violated what the comment on the config says:

    /// NOTE: This timeout applies to attachments that are already in-memory. Streaming uploads
    /// might take longer and are restricted independently by [`Upload::timeout`].

This PR fixes the regression and adds a test for it.

@jjbayer jjbayer marked this pull request as ready for review April 22, 2026 12:06
@jjbayer jjbayer requested a review from a team as a code owner April 22, 2026 12:06
Comment thread tests/integration/test_upload.py Outdated
Copy link
Copy Markdown

@cursor cursor Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes and found 2 potential issues.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit 1ce3a83. Configure here.

Comment thread relay-server/src/services/objectstore.rs Outdated
Comment thread tests/integration/test_upload.py
@jjbayer jjbayer enabled auto-merge April 22, 2026 13:17
Comment thread tests/integration/test_upload.py
Copy link
Copy Markdown
Member

@Dav1dde Dav1dde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Duration::MAX is pretty long, is the alternative of just increasing the timeout for everything not an option?

@jjbayer jjbayer added this pull request to the merge queue Apr 22, 2026
@jjbayer
Copy link
Copy Markdown
Member Author

jjbayer commented Apr 22, 2026

Duration::MAX is pretty long, is the alternative of just increasing the timeout for everything not an option?

Makes sense, will follow-up.

Merged via the queue into master with commit ec9b8e4 Apr 22, 2026
30 checks passed
@jjbayer jjbayer deleted the fix/objectstore-timeout branch April 22, 2026 13:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants