chore(hybridcloud) Remove file_id from control avatar subclasses (#68916)

Control silo scoped avatars don't need a file_id column as they use
control_file_id instead.

Refs HC-712
Requires getsentry/getsentry#13659

Author: markstory

fixtures/backup/model_dependencies/detailed.json

@@ -1748,11 +1748,6 @@
         "kind": "FlexibleForeignKey",
         "model": "sentry.docintegration",
         "nullable": false
-      },
-      "file_id": {
-        "kind": "ImplicitForeignKey",
-        "model": "sentry.file",
-        "nullable": true
       }
     },
     "model": "sentry.docintegrationavatar",
@@ -1766,9 +1761,6 @@
       [
         "control_file_id"
       ],
-      [
-        "file_id"
-      ],
       [
         "ident"
       ]
@@ -5538,11 +5530,6 @@
         "model": "sentry.controlfile",
         "nullable": true
       },
-      "file_id": {
-        "kind": "ImplicitForeignKey",
-        "model": "sentry.file",
-        "nullable": true
-      },
       "sentry_app": {
         "kind": "FlexibleForeignKey",
         "model": "sentry.sentryapp",
@@ -5560,9 +5547,6 @@
       [
         "control_file_id"
       ],
-      [
-        "file_id"
-      ],
       [
         "ident"
       ]
@@ -5986,11 +5970,6 @@
         "model": "sentry.controlfile",
         "nullable": true
       },
-      "file_id": {
-        "kind": "ImplicitForeignKey",
-        "model": "sentry.file",
-        "nullable": true
-      },
       "user": {
         "kind": "FlexibleForeignKey",
         "model": "sentry.user",
@@ -6008,9 +5987,6 @@
       [
         "control_file_id"
       ],
-      [
-        "file_id"
-      ],
       [
         "ident"
       ],

fixtures/backup/model_dependencies/flat.json

@@ -240,8 +240,7 @@
   "sentry.docintegration": [],
   "sentry.docintegrationavatar": [
     "sentry.controlfile",
-    "sentry.docintegration",
-    "sentry.file"
+    "sentry.docintegration"
   ],
   "sentry.email": [],
   "sentry.environment": [
@@ -763,7 +762,6 @@
   ],
   "sentry.sentryappavatar": [
     "sentry.controlfile",
-    "sentry.file",
     "sentry.sentryapp"
   ],
   "sentry.sentryappcomponent": [
@@ -823,7 +821,6 @@
   "sentry.user": [],
   "sentry.useravatar": [
     "sentry.controlfile",
-    "sentry.file",
     "sentry.user"
   ],
   "sentry.useremail": [

fixtures/backup/model_dependencies/sorted.json

@@ -14,6 +14,7 @@
   "sentry.controltombstone",
   "sentry.deletedorganization",
   "sentry.docintegration",
+  "sentry.docintegrationavatar",
   "sentry.fileblob",
   "sentry.identityprovider",
   "sentry.integration",
@@ -51,6 +52,7 @@
   "sentry.team",
   "sentry.teamreplica",
   "sentry.user",
+  "sentry.useravatar",
   "sentry.userip",
   "sentry.useroption",
   "sentry.userpermission",
@@ -92,7 +94,6 @@
   "sentry.eventattachment",
   "sentry.environment",
   "sentry.email",
-  "sentry.docintegrationavatar",
   "sentry.distribution",
   "sentry.discoversavedquery",
   "sentry.deploy",
@@ -124,7 +125,6 @@
   "feedback.feedback",
   "sentry.userreport",
   "sentry.useremail",
-  "sentry.useravatar",
   "sentry.teamkeytransaction",
   "sentry.snubaquery",
   "sentry.sentryapp",

fixtures/backup/model_dependencies/truncate.json

@@ -14,6 +14,7 @@
   "sentry_controltombstone",
   "sentry_deletedorganization",
   "sentry_docintegration",
+  "sentry_docintegrationavatar",
   "sentry_fileblob",
   "sentry_identityprovider",
   "sentry_integration",
@@ -51,6 +52,7 @@
   "sentry_team",
   "sentry_teamreplica",
   "auth_user",
+  "sentry_useravatar",
   "sentry_userip",
   "sentry_useroption",
   "sentry_userpermission",
@@ -92,7 +94,6 @@
   "sentry_eventattachment",
   "sentry_environment",
   "sentry_email",
-  "sentry_docintegrationavatar",
   "sentry_distribution",
   "sentry_discoversavedquery",
   "sentry_deploy",
@@ -124,7 +125,6 @@
   "feedback_feedback",
   "sentry_userreport",
   "sentry_useremail",
-  "sentry_useravatar",
   "sentry_performanceteamkeytransaction",
   "sentry_snubaquery",
   "sentry_sentryapp",

migrations_lockfile.txt

@@ -9,5 +9,5 @@ feedback: 0004_index_together
 hybridcloud: 0016_add_control_cacheversion
 nodestore: 0002_nodestore_no_dictfield
 replays: 0004_index_together
-sentry: 0697_remove_monitor_owner_actor_id_db
+sentry: 0698_remove_file_id_from_control_avatars
 social_auth: 0002_default_auto_field

src/sentry/migrations/0698_remove_file_id_from_control_avatars.py

@@ -0,0 +1,45 @@
+# Generated by Django 5.0.3 on 2024-04-15 18:26
+
+from django.db import migrations
+
+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 = [
+        ("sentry", "0697_remove_monitor_owner_actor_id_db"),
+    ]
+
+    operations = [
+        migrations.SeparateDatabaseAndState(
+            database_operations=[],
+            state_operations=[
+                migrations.RemoveField(
+                    model_name="docintegrationavatar",
+                    name="file_id",
+                ),
+                migrations.RemoveField(
+                    model_name="sentryappavatar",
+                    name="file_id",
+                ),
+                migrations.RemoveField(
+                    model_name="useravatar",
+                    name="file_id",
+                ),
+            ],
+        )
+    ]

src/sentry/models/avatars/base.py

@@ -13,7 +13,6 @@
 from sentry import options
 from sentry.backup.scopes import RelocationScope
 from sentry.db.models import Model
-from sentry.db.models.fields.bounded import BoundedBigIntegerField
 from sentry.models.files.control_file import ControlFile
 from sentry.models.files.file import File
 from sentry.silo import SiloMode
@@ -37,8 +36,6 @@ class AvatarBase(Model):
     FILE_TYPE: ClassVar[str]
 
     ident = models.CharField(max_length=32, unique=True, db_index=True)
-    # Deprecated, will be moved to OrganizationAvatar soon
-    file_id = BoundedBigIntegerField(unique=True, null=True)
 
     class Meta:
         abstract = True

src/sentry/tasks/files.py

@@ -1,4 +1,3 @@
-import logging
 from datetime import timedelta
 
 from django.db import DatabaseError, IntegrityError, router
@@ -9,8 +8,6 @@
 from sentry.tasks.deletion.scheduled import MAX_RETRIES
 from sentry.utils.db import atomic_transaction
 
-logger = logging.getLogger(__name__)
-
 
 @instrumented_task(
     name="sentry.tasks.files.delete_file",
@@ -104,26 +101,3 @@ def delete_unreferenced_blobs(blob_model, blob_index_model, blob_ids):
                 # Do nothing if the blob was deleted in another task, or
                 # if had another reference added concurrently.
                 pass
-
-
-# TODO(mark): Remove this after no tasks are confirmed
-@instrumented_task(
-    name="sentry.tasks.files.copy_to_control",
-    queue="files.copy",
-    default_retry_delay=60 * 5,
-    max_retries=MAX_RETRIES,
-    autoretry_for=(DatabaseError, IntegrityError),
-    acks_late=True,
-)
-def copy_file_to_control_and_update_model(
-    app_name: str,
-    model_name: str,
-    model_id: int,
-    file_id: int,
-    **kwargs,
-):
-    # Shouldn't happen but we can confirm after deploy
-    logger.info(
-        "copy_file_to_control_and_update_model.spawned",
-        extra={"model_name": model_name, "model_id": model_id, "file_id": file_id},
-    )

tests/sentry/backup/snapshots/test_comparators/test_default_comparators.pysnap

@@ -1,5 +1,5 @@
 ---
-created: '2024-04-12T19:46:00.491186+00:00'
+created: '2024-04-15T19:02:42.654156+00:00'
 creator: sentry
 source: tests/sentry/backup/test_comparators.py
 ---
@@ -458,7 +458,6 @@ source: tests/sentry/backup/test_comparators.py
     fields:
     - control_file_id
     - doc_integration
-    - file_id
   model_name: sentry.docintegrationavatar
 - comparators:
   - class: EmailObfuscatingComparator
@@ -1390,7 +1389,6 @@ source: tests/sentry/backup/test_comparators.py
   - class: ForeignKeyComparator
     fields:
     - control_file_id
-    - file_id
     - sentry_app
   model_name: sentry.sentryappavatar
 - comparators:
@@ -1530,7 +1528,6 @@ source: tests/sentry/backup/test_comparators.py
   - class: ForeignKeyComparator
     fields:
     - control_file_id
-    - file_id
     - user
   model_name: sentry.useravatar
 - comparators: