fix(preprod): add unique constraint to commit comparison #107371
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
![cursor[bot]](https://cdn.statically.io/img/avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 1 potential issue.
Bugbot Autofix is OFF. To automatically fix reported issues with Cloud Agents, enable Autofix in the Cursor dashboard.
src/sentry/migrations/1023_add_commitcomparison_unique_constraints.py
Outdated
Show resolved
Hide resolved
Contributor
|
This PR has a migration; here is the generated SQL for for --
-- Raw Python operation
--
-- THIS OPERATION CANNOT BE WRITTEN AS SQL
--
-- Create constraint sentry_commitcomparison_org_comparison_uniq on model commitcomparison
--
CREATE UNIQUE INDEX CONCURRENTLY "sentry_commitcomparison_org_comparison_uniq" ON "sentry_commitcomparison" ("organization_id", "head_repo_name", "head_sha", "base_sha") WHERE "base_sha" IS NOT NULL;
--
-- Create constraint sentry_commitcomparison_org_commit_uniq on model commitcomparison
--
CREATE UNIQUE INDEX CONCURRENTLY "sentry_commitcomparison_org_commit_uniq" ON "sentry_commitcomparison" ("organization_id", "head_repo_name", "head_sha") WHERE "base_sha" IS NULL; |
Tests were creating CommitComparison records with the same unique key values as the setUp fixture. Changed head_sha values to be unique per test to avoid IntegrityError.
![sentry[bot]](https://cdn.statically.io/img/avatars.githubusercontent.com/in/12637?s=60&v=4){kind=small}
wedamija
approved these changes
Jan 30, 2026
| PreprodArtifact.objects.filter(commit_comparison_id=duplicate_id).update( | ||
| commit_comparison_id=kept_id | ||
| ) | ||
| CommitComparison.objects.filter(id__in=duplicate_to_kept.keys()).delete() |
Member
There was a problem hiding this comment.
Not sure how many rows there are to delete here, but it could be safer to just delete individually so that you don't hit any transaction timeouts.
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 https://sentry.sentry.io/issues/7229263157/?query=is%3Aunresolved%20assigned%3A%23emerge-tools&referrer=issue-stream&sort=date by adding a unique constraint.
Basically due to race conditions of this particular user sending a high volume of writes to us, we saw cases where multiple objects are created despite the
CommitComparison.objects.get_or_create()call within the transaction. This can cause some downstream issues that assume only oneCommitComparisonexists.