feat(cells): Add projectkeymapping table to control silo by lynnagara · Pull Request #109831 · getsentry/sentry

lynnagara · 2026-03-03T21:13:34Z

This is the first step to ensuring global projectkey uniqueness.

Right now we just create the table, not using it yet.

Note: in order to keep this table minimal we only put the publickey in here, and not the project_key_id.

This is the first step to ensuring global projectkey uniqueness. Right now we just create the table, not using it yet.

github-actions · 2026-03-03T21:21:32Z

This PR has a migration; here is the generated SQL for src/sentry/migrations/1039_projectkeymapping.py

for 1039_projectkeymapping in sentry

--
-- Create model ProjectKeyMapping
--
CREATE TABLE "sentry_projectkeymapping" ("id" bigint NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, "project_key_id" bigint NOT NULL, "public_key" varchar(32) NOT NULL UNIQUE, "cell_name" varchar(48) NOT NULL, "date_updated" timestamp with time zone DEFAULT (STATEMENT_TIMESTAMP()) NOT NULL);
CREATE INDEX CONCURRENTLY "sentry_projectkeymapping_project_key_id_fee1d050" ON "sentry_projectkeymapping" ("project_key_id");
CREATE INDEX CONCURRENTLY "sentry_projectkeymapping_public_key_c2b56897_like" ON "sentry_projectkeymapping" ("public_key" varchar_pattern_ops);
CREATE INDEX CONCURRENTLY "sentry_projkeymapping_date_updated_id_idx" ON "sentry_projectkeymapping" ((DATE_TRUNC('second', "date_updated" AT TIME ZONE 'UTC')), "id");

wedamija

Migration lgtm

wedamija · 2026-03-03T21:34:08Z

src/sentry/models/projectkeymapping.py

+
+
+@control_silo_model
+class ProjectKeyMapping(Model):


Should we make this DefaultFieldsModel so that we get date_created and date_updated for free?

I'd rather not use that because:

the underlying region model doesn't use it

we don't need date_created

i think it's better to have the database level default for date_updated which is not present in the DefaultFieldsModel for when we do the migration later

ProjectKey predates DefaultFieldsModel which is why it doesn't used that base class. Having date_created could be helpful for understanding when mapping records were created and seeing the latency between records created in the cells and mapping data in control.

markstory · 2026-03-03T22:35:29Z

src/sentry/migrations/1039_projectkeymapping.py

+                        primary_key=True, serialize=False
+                    ),
+                ),
+                ("public_key", models.CharField(db_index=True, max_length=32, unique=True)),


Currently public_key is mutable. If we don't have a project_key_id + organization_id/project_id available in this table it will be hard to do upserts when keys change.

If this key is unique, do we need a separate id field?

added back the project key id to keep things aligned with the other hybrid cloud models

👍 With public_key, project_key_id we'll be able to uniquely identify records to do upserts and deletes.

markstory · 2026-03-03T22:41:27Z

src/sentry/models/projectkeymapping.py

+
+
+@control_silo_model
+class ProjectKeyMapping(Model):


Do you want to put this model in the main sentry django app, or in the sentry.hybridcloud django app which also contains replica models for authtokens?

Hmm, not sure. I modelled this off OrganizationMapping which is in the main app

👍 That's fair. I forgot that those models were in the main django app.

markstory · 2026-03-04T15:31:54Z

src/sentry/models/projectkeymapping.py

+
+
+@control_silo_model
+class ProjectKeyMapping(Model):


👍 That's fair. I forgot that those models were in the main django app.

markstory · 2026-03-04T15:42:32Z

src/sentry/migrations/1039_projectkeymapping.py

+                        primary_key=True, serialize=False
+                    ),
+                ),
+                ("public_key", models.CharField(db_index=True, max_length=32, unique=True)),


👍 With public_key, project_key_id we'll be able to uniquely identify records to do upserts and deletes.

markstory · 2026-03-04T15:46:52Z

src/sentry/migrations/1039_projectkeymapping.py

+                    sentry.db.models.indexes.IndexWithPostgresNameLimits(
+                        django.db.models.functions.datetime.TruncSecond("date_updated"),
+                        models.F("id"),
+                        name="sentry_projkeymapping_date_updated_id_idx",
+                    ),


Should this index also include cell_name? I assume we'll mostly being doing filter queries based on the locality, date_updated.

oh good point --- i need to add this to the org mapping index too

markstory · 2026-03-04T15:48:47Z

src/sentry/models/projectkeymapping.py

+
+
+@control_silo_model
+class ProjectKeyMapping(Model):


ProjectKey predates DefaultFieldsModel which is why it doesn't used that base class. Having date_created could be helpful for understanding when mapping records were created and seeing the latency between records created in the cells and mapping data in control.

github-actions · 2026-03-04T20:36:54Z

This PR has a migration; here is the generated SQL for src/sentry/migrations/1041_projectkeymapping.py

for 1041_projectkeymapping in sentry

--
-- Create model ProjectKeyMapping
--
CREATE TABLE "sentry_projectkeymapping" ("id" bigint NOT NULL PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, "project_key_id" bigint NOT NULL, "public_key" varchar(32) NOT NULL UNIQUE, "cell_name" varchar(48) NOT NULL, "date_updated" timestamp with time zone DEFAULT (STATEMENT_TIMESTAMP()) NOT NULL);
CREATE INDEX CONCURRENTLY "sentry_projectkeymapping_project_key_id_fee1d050" ON "sentry_projectkeymapping" ("project_key_id");
CREATE INDEX CONCURRENTLY "sentry_projectkeymapping_public_key_c2b56897_like" ON "sentry_projectkeymapping" ("public_key" varchar_pattern_ops);
CREATE INDEX CONCURRENTLY "sentry_projkeymapping_cell_name_date_updated_id_idx" ON "sentry_projectkeymapping" ("cell_name", (DATE_TRUNC('second', "date_updated" AT TIME ZONE 'UTC')), "id");

This is the first step to ensuring global projectkey uniqueness. Right now we just create the table, not using it yet. Note: in order to keep this table minimal we only put the publickey in here, and not the project_key_id.

feat(cells): Add projectkeymapping table to control silo

80973e6

This is the first step to ensuring global projectkey uniqueness. Right now we just create the table, not using it yet.

lynnagara requested a review from a team as a code owner March 3, 2026 21:13

github-actions bot added the Scope: Backend Automatically applied to PRs that change backend components label Mar 3, 2026

vercel bot deployed to Preview March 3, 2026 21:15 View deployment

wedamija approved these changes Mar 3, 2026

View reviewed changes

markstory reviewed Mar 3, 2026

View reviewed changes

add back project_key_id

9a08e95

vercel bot deployed to Preview March 3, 2026 23:13 View deployment

markstory approved these changes Mar 4, 2026

View reviewed changes

add cell_name to index

a7770cf

vercel bot deployed to Preview March 4, 2026 20:20 View deployment

Merge branch 'master' into cells-projectkey-control-silo

1c6c4eb

vercel bot deployed to Preview March 4, 2026 20:24 View deployment

Merge branch 'master' into cells-projectkey-control-silo

aa0d783

vercel bot deployed to Preview March 4, 2026 20:31 View deployment

lynnagara merged commit 798ba21 into master Mar 4, 2026
76 of 77 checks passed

lynnagara deleted the cells-projectkey-control-silo branch March 4, 2026 20:54

sentry-release-bot bot mentioned this pull request Mar 15, 2026

publish: getsentry/[email protected] getsentry/publish#7450

Closed

3 tasks

github-actions bot locked and limited conversation to collaborators Mar 20, 2026



		@control_silo_model
		class ProjectKeyMapping(Model):



		@control_silo_model
		class ProjectKeyMapping(Model):



		@control_silo_model
		class ProjectKeyMapping(Model):



		@control_silo_model
		class ProjectKeyMapping(Model):

Uh oh!

Conversation

lynnagara commented Mar 3, 2026

Uh oh!

github-actions bot commented Mar 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wedamija left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lynnagara Mar 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Mar 4, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

github-actions bot commented Mar 3, 2026 •

edited

Loading

lynnagara Mar 4, 2026 •

edited

Loading