fix: Batch commit file change queries to avoid timeouts #103170
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
Scope: Backend
yuvmen
added
the
Trigger: getsentry tests
wedamija
approved these changes
Nov 11, 2025
src/sentry/utils/committers.py
Outdated
| all_file_changes: list[CommitFileChange] = [] | ||
| commit_ids = [c.id for c in commits] | ||
|
|
||
| for i in range(0, len(commit_ids), COMMIT_BATCH_SIZE): |
Member
There was a problem hiding this comment.
Nit: chunked can batch these into groups for you
Member
There was a problem hiding this comment.
agree - chunked is much cleaner
nora-shap
approved these changes
Nov 12, 2025
github-actions
bot
removed
the
Trigger: getsentry tests
yuvmen
added
the
Trigger: getsentry tests
andrewshie-sentry
pushed a commit
that referenced
this pull request
Nov 13, 2025
Fixes [SENTRY-4596](https://sentry.io/organizations/sentry/issues/6726431295/). The issue was that: Inefficient database query combining multiple `LIKE` conditions with a 200+ item `IN` clause causes PostgreSQL statement timeout, exhausting all task retries. - Introduces `COMMIT_BATCH_SIZE` to limit the number of commits processed in a single query. - Modifies `get_filepath_committers` to batch commit IDs when querying `CommitFileChange` objects, preventing potential query timeouts caused by large `IN` clauses combined with complex `LIKE` conditions. This fix was generated by Seer in Sentry, triggered by Yuval Mandelboum. 👁️ Run ID: 2555348 Co-authored-by: seer-by-sentry[bot] <157164994+seer-by-sentry[bot]@users.noreply.github.com> Co-authored-by: getsantry[bot] <66042841+getsantry[bot]@users.noreply.github.com> Co-authored-by: Yuval Mandelboum <yuval.mandelboum@sentry.io>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes SENTRY-4596. The issue was that: Inefficient database query combining multiple
LIKEconditions with a 200+ itemINclause causes PostgreSQL statement timeout, exhausting all task retries.COMMIT_BATCH_SIZEto limit the number of commits processed in a single query.get_filepath_committersto batch commit IDs when queryingCommitFileChangeobjects, preventing potential query timeouts caused by largeINclauses combined with complexLIKEconditions.This fix was generated by Seer in Sentry, triggered by Josh Ferge. 👁️ Run ID: 2555348
Not quite right? Click here to continue debugging with Seer.
Legal Boilerplate
Look, I get it. The entity doing business as "Sentry" was incorporated in the State of Delaware in 2015 as Functional Software, Inc. and is gonna need some rights from me in order to utilize my contributions in this here PR. So here's the deal: I retain all rights, title and interest in and to my contributions, and by keeping this boilerplate intact I confirm that Sentry can use, modify, copy, and redistribute my contributions, under Sentry's choice of terms.