From 1eeca4f34d0b71ef02463579edba1b91e5b003bd Mon Sep 17 00:00:00 2001 From: Trevor Elkins Date: Thu, 12 Jun 2025 14:14:48 -0400 Subject: [PATCH 1/3] feat(preprod): Perform actual extras column drop --- .../0003_drop_sentry_jsonfield_actual.py | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/sentry/preprod/migrations/0003_drop_sentry_jsonfield_actual.py diff --git a/src/sentry/preprod/migrations/0003_drop_sentry_jsonfield_actual.py b/src/sentry/preprod/migrations/0003_drop_sentry_jsonfield_actual.py new file mode 100644 index 00000000000000..9a604f2f60fe21 --- /dev/null +++ b/src/sentry/preprod/migrations/0003_drop_sentry_jsonfield_actual.py @@ -0,0 +1,31 @@ +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 = [ + ("preprod", "0002_drop_sentry_jsonfield"), + ] + + operations = [ + SafeRemoveField( + model_name="preprodartifact", + name="extras", + deletion_action=DeletionAction.DELETE, + ), + ] From db6e589ccd41f25084f4a74b8a6b16818adefd47 Mon Sep 17 00:00:00 2001 From: Trevor Elkins Date: Thu, 12 Jun 2025 17:59:46 -0400 Subject: [PATCH 2/3] Add extras JSONField --- migrations_lockfile.txt | 2 +- .../migrations/0004_add_django_jsonfield.py | 33 +++++++++++++++++++ src/sentry/preprod/models.py | 3 ++ 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 src/sentry/preprod/migrations/0004_add_django_jsonfield.py diff --git a/migrations_lockfile.txt b/migrations_lockfile.txt index f7868b75f4d94e..dc9425b10d7ed8 100644 --- a/migrations_lockfile.txt +++ b/migrations_lockfile.txt @@ -19,7 +19,7 @@ monitors: 0006_add_is_upserting nodestore: 0001_squashed_0002_nodestore_no_dictfield -preprod: 0002_drop_sentry_jsonfield +preprod: 0004_add_django_jsonfield replays: 0001_squashed_0005_drop_replay_index diff --git a/src/sentry/preprod/migrations/0004_add_django_jsonfield.py b/src/sentry/preprod/migrations/0004_add_django_jsonfield.py new file mode 100644 index 00000000000000..490c4d211f7af8 --- /dev/null +++ b/src/sentry/preprod/migrations/0004_add_django_jsonfield.py @@ -0,0 +1,33 @@ +# Generated by Django 5.2.1 on 2025-06-12 21:29 + +from django.db import migrations, models + +from sentry.new_migrations.migrations import CheckedMigration + + +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 = [ + ("preprod", "0003_drop_sentry_jsonfield_actual"), + ] + + operations = [ + migrations.AddField( + model_name="preprodartifact", + name="extras", + field=models.JSONField(null=True), + ), + ] diff --git a/src/sentry/preprod/models.py b/src/sentry/preprod/models.py index fdd169e329c177..d84e661d931a15 100644 --- a/src/sentry/preprod/models.py +++ b/src/sentry/preprod/models.py @@ -108,6 +108,9 @@ def as_choices(cls): # E.g. 9999 build_number = BoundedBigIntegerField(null=True) + # Miscellaneous fields that we don't need columns for, e.g. enqueue/dequeue times, user-agent, etc. + extras = models.JSONField(null=True) + class Meta: app_label = "preprod" db_table = "sentry_preprodartifact" From 49eda7c14c30f5c2b7fd2606bfa1508d3c64b40f Mon Sep 17 00:00:00 2001 From: Trevor Elkins Date: Thu, 12 Jun 2025 18:00:23 -0400 Subject: [PATCH 3/3] fix lockfile --- migrations_lockfile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migrations_lockfile.txt b/migrations_lockfile.txt index f7868b75f4d94e..9f149357398bf8 100644 --- a/migrations_lockfile.txt +++ b/migrations_lockfile.txt @@ -19,7 +19,7 @@ monitors: 0006_add_is_upserting nodestore: 0001_squashed_0002_nodestore_no_dictfield -preprod: 0002_drop_sentry_jsonfield +preprod: 0003_drop_sentry_jsonfield_actual replays: 0001_squashed_0005_drop_replay_index