Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion migrations_lockfile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ replays: 0001_squashed_0007_organizationmember_replay_access

seer: 0037_rename_agentic_triage_result

sentry: 1210_release_validate_foreign_keys
sentry: 1211_release_drop_new_id_pending

social_auth: 0001_squashed_0003_social_auth_json_field

Expand Down
41 changes: 41 additions & 0 deletions src/sentry/migrations/1211_release_drop_new_id_pending.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Generated by Django 5.2.17 on 2026-10-14 20:09

from django.db import migrations

import sentry.db.models.fields.bounded
from sentry.new_migrations.migrations import CheckedMigration
from sentry.new_migrations.monkey.fields import SafeRemoveField
from sentry.new_migrations.monkey.state import DeletionAction


class Migration(CheckedMigration):
# This flag is used to mark that a migration shouldn't be automatically run in production.
# This should only be used for operations where it's safe to run the migration after your
# code has deployed. So this should not be used for most operations that alter the schema
# of a table.
# Here are some things that make sense to mark as post deployment:
# - Large data migrations. Typically we want these to be run manually so that they can be
# monitored and not block the deploy for a long period of time while they run.
# - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to
# run this outside deployments so that we don't block them. Note that while adding an index
# is a schema change, it's completely safe to run the operation after the code has deployed.
# Once deployed, run these manually via: https://develop.sentry.dev/database-migrations/#migration-deployment

is_post_deployment = False

dependencies = [
("sentry", "1210_release_validate_foreign_keys"),
]

operations = [
migrations.AlterField(
model_name="release",
name="new_id",
field=sentry.db.models.fields.bounded.BoundedIntegerField(null=True),
),
SafeRemoveField(
model_name="release",
name="new_id",
deletion_action=DeletionAction.MOVE_TO_PENDING,
),
]
15 changes: 0 additions & 15 deletions src/sentry/models/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
from sentry.constants import BAD_RELEASE_CHARS, COMMIT_RANGE_DELIMITER
from sentry.db.models import (
BoundedBigIntegerField,
BoundedIntegerField,
BoundedPositiveIntegerField,
FlexibleForeignKey,
Model,
Expand All @@ -49,7 +48,6 @@
SemverFilter,
SemverVersion,
release_order_date,
reserve_ids,
)
from sentry.utils import metrics
from sentry.utils.cache import cache
Expand Down Expand Up @@ -249,8 +247,6 @@ class Release(Model):

__relocation_scope__ = RelocationScope.Excluded

# Narrow leftover of the id widening, still written on every insert until it is dropped.
new_id = BoundedIntegerField()
organization = FlexibleForeignKey("sentry.Organization")
projects = models.ManyToManyField(
"sentry.Project", related_name="releases", through=ReleaseProject
Expand Down Expand Up @@ -384,17 +380,6 @@ def __hash__(self):
# https://code.djangoproject.com/ticket/30333
return super().__hash__()

def save(self, **kwds: Any) -> None:
if self.id is None:
using = kwds.get("using")
if using is None:
using = router.db_for_write(type(self), instance=self)
self.id = reserve_ids(type(self), 1, using)[0]
self.new_id = self.id
# A freshly claimed pk cannot exist yet, so skip Django's UPDATE probe.
kwds["force_insert"] = True
super().save(**kwds)

@staticmethod
def is_valid_version(value):
if value is None:
Expand Down
35 changes: 4 additions & 31 deletions src/sentry/models/releases/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

import logging
from collections import namedtuple
from collections.abc import Iterable, Sequence
from collections.abc import Sequence
from dataclasses import dataclass
from datetime import datetime
from typing import TYPE_CHECKING, Any, Self
from typing import TYPE_CHECKING, Self

from django.db import connections, models
from django.db import models
from django.db.models import Case, Exists, F, Func, OuterRef, Q, Subquery, Value, When
from django.db.models.signals import pre_save
from sentry_relay.exceptions import RelayError
Expand All @@ -23,20 +23,6 @@

logger = logging.getLogger(__name__)

MAX_RESERVED_IDS = 100_000


def reserve_ids(model: type[models.Model], count: int, using: str) -> list[int]:
"""Pk values claimed ahead of insert from the sequence on `using`, the write database."""
if not 1 <= count <= MAX_RESERVED_IDS:
raise ValueError(f"Cannot reserve {count} ids, expected 1 to {MAX_RESERVED_IDS}.")

sequence = f"{model._meta.db_table}_id_seq"
with connections[using].cursor() as cursor:
cursor.execute("SELECT nextval(%s) FROM generate_series(1, %s);", [sequence, count])
rows = cursor.fetchall()
return [row_id for (row_id,) in rows]


def release_order_date(
date_added: datetime, date_released: datetime | None, *, use_finalized_order: bool
Expand All @@ -60,18 +46,6 @@ class SemverFilter:


class ReleaseQuerySet(BaseQuerySet["Release"]):
def bulk_create(self, objs: Iterable[Release], *args: Any, **kwds: Any) -> list[Release]:
releases = list(objs)
if not releases:
return super().bulk_create(releases, *args, **kwds)

self._for_write = True
ids = reserve_ids(self.model, len(releases), self.db)
for release, release_id in zip(releases, ids):
release.id = release_id
release.new_id = release_id
return super().bulk_create(releases, *args, **kwds)

def annotate_prerelease_column(self) -> Self:
"""
Adds a `prerelease_case` column to the queryset which is used to properly sort
Expand Down Expand Up @@ -331,8 +305,7 @@ def _convert_build_code_to_build_number(build_code):


def parse_semver_pre_save(instance, **kwargs):
# `Release.save()` claims the id before `pre_save`, so a set id doesn't mean the row exists.
if not instance._state.adding:
if instance.id:
return
ReleaseQuerySet.massage_semver_cols_into_release_object_data(instance.__dict__)

Expand Down
67 changes: 0 additions & 67 deletions tests/sentry/models/test_release.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

import pytest
from django.core.exceptions import ValidationError
from django.db import connections, router
from django.test.utils import CaptureQueriesContext
from django.utils import timezone

from sentry.analytics.events.issue_resolved import IssueResolvedEvent
Expand Down Expand Up @@ -2333,68 +2331,3 @@ def test_get_unused_filter_excludes_releases_with_old_group_resolutions(self) ->
unused_filter = Release.get_unused_filter(self.cutoff_date)
unused_releases = Release.objects.filter(unused_filter)
assert old_release not in unused_releases


# The write paths themselves are under test here, so rows are built directly rather
# than through fixtures.
class ReleaseShadowIdTest(TestCase):
def setUp(self) -> None:
self.org = self.create_organization()
self.project = self.create_project(organization=self.org)

def assert_new_id_mirrors_id(self, release: Release) -> None:
release.refresh_from_db()
assert release.new_id == release.id

def test_single_row_writes_populate_new_id(self) -> None:
created = Release.objects.create(organization=self.org, version="created")
self.assert_new_id_mirrors_id(created)

saved = Release(organization=self.org, version="saved")
saved.save()
self.assert_new_id_mirrors_id(saved)

fetched = Release.get_or_create(project=self.project, version="fetched")
self.assert_new_id_mirrors_id(fetched)

# The version exists in the org but not on this project, so the create hits the
# unique constraint and falls back to fetching the existing row.
def test_get_or_create_conflict_leaves_no_null_new_id(self) -> None:
other_project = self.create_project(organization=self.org)
existing = self.create_release(project=other_project, version="1.0")

release = Release.get_or_create(project=self.project, version="1.0")

assert release.id == existing.id
assert not Release.objects.filter(organization=self.org, new_id__isnull=True).exists()

def test_bulk_create_populates_new_id(self) -> None:
releases = Release.objects.bulk_create(
[Release(organization=self.org, version=f"bulk-{i}") for i in range(3)]
)

for release in releases:
self.assert_new_id_mirrors_id(release)

# `objects.create()` already forces the insert; a bare `save()` is what would probe.
def test_bare_save_issues_no_update(self) -> None:
release = Release(organization=self.org, version="1.0")
using = router.db_for_write(Release)

with CaptureQueriesContext(connections[using]) as queries:
release.save()

updates = [
query["sql"]
for query in queries.captured_queries
if query["sql"].lstrip().upper().startswith('UPDATE "SENTRY_RELEASE"')
]
assert updates == []

# The id is claimed before `pre_save` fires, so the semver hook must not read a set
# id as an existing row.
def test_create_still_parses_semver_columns(self) -> None:
release = Release.objects.create(organization=self.org, version="pkg@1.2.3")

release.refresh_from_db()
assert (release.package, release.major, release.minor, release.patch) == ("pkg", 1, 2, 3)
Loading