Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Revert "ref: replace deprecated index_together with indexes (#63776)"" #64055

Merged
merged 1 commit into from
Jan 30, 2024
Merged

Revert "Revert "ref: replace deprecated index_together with indexes (#63776)"" #64055

merged 1 commit into from
Jan 30, 2024

Conversation

asottile-sentry
Copy link
Member

This reverts commit e24ccd3.

I have applied the "dangerous" migration that was missing previously in singletenants causing the failure

@asottile-sentry asottile-sentry requested a review from a team January 29, 2024 13:50
@asottile-sentry asottile-sentry requested review from a team as code owners January 29, 2024 13:50
@github-actions github-actions bot added the Scope: Backend Automatically applied to PRs that change backend components label Jan 29, 2024
@github-actions GitHub Actions
Copy link
Contributor

This PR has a migration; here is the generated SQL for src/sentry/migrations/0639_index_together.py ()

--
-- Rename unnamed index for ('project', 'datetime') on activity to sentry_acti_project_cd8457_idx
--
ALTER INDEX "sentry_activity_project_id_datetime_c00585e4_idx" RENAME TO "sentry_acti_project_cd8457_idx";
--
-- Rename unnamed index for ('url', 'artifact_bundle') on artifactbundleindex to sentry_arti_url_7e628a_idx
--
ALTER INDEX "sentry_artifactbundleindex_url_artifact_bundle_id_39528bd6_idx" RENAME TO "sentry_arti_url_7e628a_idx";
--
-- Rename unnamed index for ('repository_id', 'date_added') on commit to sentry_comm_reposit_da31f2_idx
--
ALTER INDEX "sentry_commit_repository_id_date_added_506000b5_idx" RENAME TO "sentry_comm_reposit_da31f2_idx";
--
-- Rename unnamed index for ('author', 'date_added') on commit to sentry_comm_author__131211_idx
--
ALTER INDEX "sentry_commit_author_id_date_added_67da210a_idx" RENAME TO "sentry_comm_author__131211_idx";
--
-- Rename unnamed index for ('organization_id', 'date_added') on commit to sentry_comm_organiz_7be514_idx
--
ALTER INDEX "sentry_commit_organization_id_date_added_ab037274_idx" RENAME TO "sentry_comm_organiz_7be514_idx";
--
-- Rename unnamed index for ('region_name', 'shard_scope', 'shard_identifier', 'category', 'object_identifier') on controloutbox to sentry_cont_region__1c1c72_idx
--
ALTER INDEX "sentry_controloutbox_region_name_shard_scope__db82084e_idx" RENAME TO "sentry_cont_region__1c1c72_idx";
--
-- Rename unnamed index for ('region_name', 'shard_scope', 'shard_identifier', 'scheduled_for') on controloutbox to sentry_cont_region__0c4512_idx
--
ALTER INDEX "sentry_controloutbox_region_name_shard_scope__3ab080ca_idx" RENAME TO "sentry_cont_region__0c4512_idx";
--
-- Rename unnamed index for ('region_name', 'shard_scope', 'shard_identifier', 'id') on controloutbox to sentry_cont_region__a95d82_idx
--
ALTER INDEX "sentry_controloutbox_region_name_shard_scope__4e3255a0_idx" RENAME TO "sentry_cont_region__a95d82_idx";
--
-- Rename unnamed index for ('debug_id', 'artifact_bundle') on debugidartifactbundle to sentry_debu_debug_i_8c6c44_idx
--
ALTER INDEX "sentry_debugidartifactbu_debug_id_artifact_bundle_edc164fe_idx" RENAME TO "sentry_debu_debug_i_8c6c44_idx";
--
-- Rename unnamed index for ('project_id', 'date_added') on eventattachment to sentry_even_project_62b83b_idx
--
ALTER INDEX "sentry_eventattachment_project_id_date_added_750bbee8_idx" RENAME TO "sentry_even_project_62b83b_idx";
--
-- Rename unnamed index for ('project_id', 'event_id') on eventattachment to sentry_even_project_974f7b_idx
--
ALTER INDEX "sentry_eventattachment_project_id_event_id_fbb6a77a_idx" RENAME TO "sentry_even_project_974f7b_idx";
--
-- Rename unnamed index for ('project', 'status', 'type', 'last_seen', 'id') on group to sentry_grou_project_17d28d_idx
--
ALTER INDEX "sentry_groupedmessage_project_id_type_status_l_074196b6_idx" RENAME TO "sentry_grou_project_17d28d_idx";
--
-- Rename unnamed index for ('project', 'status', 'substatus', 'type', 'last_seen', 'id') on group to sentry_grou_project_ff3fdf_idx
--
ALTER INDEX "sentry_groupedmessage_project_id_status_substa_c95bb62c_idx" RENAME TO "sentry_grou_project_ff3fdf_idx";
--
-- Rename unnamed index for ('status', 'substatus', 'first_seen') on group to sentry_grou_status_e07f40_idx
--
ALTER INDEX "sentry_groupedmessage_status_substatus_first_seen_99773cf6_idx" RENAME TO "sentry_grou_status_e07f40_idx";
--
-- Rename unnamed index for ('project', 'status', 'last_seen', 'id') on group to sentry_grou_project_81a5ed_idx
--
ALTER INDEX "sentry_groupedmessage_project_id_status_last_s_6b8195a7_idx" RENAME TO "sentry_grou_project_81a5ed_idx";
--
-- Rename unnamed index for ('project', 'status', 'substatus', 'id') on group to sentry_grou_project_5acaf7_idx
--
ALTER INDEX "sentry_groupedmessage_project_id_status_substa_78b9cc1c_idx" RENAME TO "sentry_grou_project_5acaf7_idx";
--
-- Rename unnamed index for ('project', 'status', 'substatus', 'last_seen', 'id') on group to sentry_grou_project_5eb75b_idx
--
ALTER INDEX "sentry_groupedmessage_project_id_status_substa_fbe106b6_idx" RENAME TO "sentry_grou_project_5eb75b_idx";
--
-- Rename unnamed index for ('status', 'substatus', 'id') on group to sentry_grou_status_48b516_idx
--
ALTER INDEX "sentry_groupedmessage_status_substatus_id_e00e92ae_idx" RENAME TO "sentry_grou_status_48b516_idx";
--
-- Rename unnamed index for ('project', 'first_release') on group to sentry_grou_project_4662d9_idx
--
ALTER INDEX "sentry_groupedmessage_project_id_first_release_id_7f8c0ae5_idx" RENAME TO "sentry_grou_project_4662d9_idx";
--
-- Rename unnamed index for ('project', 'id') on group to sentry_grou_project_41a5ce_idx
--
ALTER INDEX "sentry_groupedmessage_project_id_id_515aaa7e_idx" RENAME TO "sentry_grou_project_41a5ce_idx";
--
-- Rename unnamed index for ('environment', 'first_release', 'first_seen') on groupenvironment to sentry_grou_environ_443bdb_idx
--
ALTER INDEX "sentry_groupenvironment_environment_id_first_rel_9a1a5cd4_idx" RENAME TO "sentry_grou_environ_443bdb_idx";
--
-- Rename unnamed index for ('project', 'status', 'release') on grouphistory to sentry_grou_project_bbcf30_idx
--
ALTER INDEX "sentry_grouphistory_project_id_status_release_id_dbbe6354_idx" RENAME TO "sentry_grou_project_bbcf30_idx";
--
-- Rename unnamed index for ('group', 'status') on grouphistory to sentry_grou_group_i_c61acb_idx
--
ALTER INDEX "sentry_grouphistory_group_id_status_7ae79a2b_idx" RENAME TO "sentry_grou_group_i_c61acb_idx";
--
-- Rename unnamed index for ('project', 'date_added') on grouphistory to sentry_grou_project_20b3f8_idx
--
ALTER INDEX "sentry_grouphistory_project_id_date_added_7e6f676f_idx" RENAME TO "sentry_grou_project_20b3f8_idx";
--
-- Rename unnamed index for ('project', 'date_added') on groupinbox to sentry_grou_project_a9fe16_idx
--
ALTER INDEX "sentry_groupinbox_project_id_date_added_fd440409_idx" RENAME TO "sentry_grou_project_a9fe16_idx";
--
-- Rename unnamed index for ('group_id', 'first_seen') on grouprelease to sentry_grou_group_i_6eaff8_idx
--
ALTER INDEX "sentry_grouprelease_group_id_first_seen_53fc35ds" RENAME TO "sentry_grou_group_i_6eaff8_idx";
--
-- Rename unnamed index for ('group_id', 'last_seen') on grouprelease to sentry_grou_group_i_f10abe_idx
--
ALTER INDEX "sentry_grouprelease_group_id_last_seen_g8v2sk7c" RENAME TO "sentry_grou_group_i_f10abe_idx";
--
-- Rename unnamed index for ('alert_rule', 'type', 'status') on incident to sentry_inci_alert_r_24a457_idx
--
ALTER INDEX "sentry_incident_alert_rule_id_type_status_cfc6291a_idx" RENAME TO "sentry_inci_alert_r_24a457_idx";
--
-- Rename unnamed index for ('alert_rule_trigger', 'incident_id') on incidenttrigger to sentry_inci_alert_r_33da01_idx
--
ALTER INDEX "sentry_incidenttrigger_alert_rule_trigger_id_in_e98fd1e3_idx" RENAME TO "sentry_inci_alert_r_33da01_idx";
--
-- Rename unnamed index for ('organization_id', 'user') on organizationmembermapping to sentry_orga_organiz_ae9fe7_idx
--
ALTER INDEX "sentry_organizationmembe_organization_id_user_id_feb6bdf0_idx" RENAME TO "sentry_orga_organiz_ae9fe7_idx";
--
-- Rename unnamed index for ('organization_id', 'email') on organizationmembermapping to sentry_orga_organiz_7de26b_idx
--
ALTER INDEX "sentry_organizationmembe_organization_id_email_66a560fc_idx" RENAME TO "sentry_orga_organiz_7de26b_idx";
--
-- Rename unnamed index for ('project_id', 'artifact_bundle') on projectartifactbundle to sentry_proj_project_f73d36_idx
--
ALTER INDEX "sentry_projectartifactbu_project_id_artifact_bund_b374329e_idx" RENAME TO "sentry_proj_project_f73d36_idx";
--
-- Rename unnamed index for ('project_id', 'code_id') on projectdebugfile to sentry_proj_project_9b5950_idx
--
ALTER INDEX "sentry_projectdsymfile_project_id_code_id_8f1678d3_idx" RENAME TO "sentry_proj_project_9b5950_idx";
--
-- Rename unnamed index for ('project_id', 'debug_id') on projectdebugfile to sentry_proj_project_c586ac_idx
--
ALTER INDEX "sentry_projectdsymfile_project_id_uuid_b95b851b_idx" RENAME TO "sentry_proj_project_c586ac_idx";
--
-- Rename unnamed index for ('organization_id', 'merge_commit_sha') on pullrequest to sentry_pull_organiz_8aabcf_idx
--
ALTER INDEX "sentry_pull_request_organization_id_merge_co_b0cd1b4e_idx" RENAME TO "sentry_pull_organiz_8aabcf_idx";
--
-- Rename unnamed index for ('repository_id', 'date_added') on pullrequest to sentry_pull_reposit_c429a4_idx
--
ALTER INDEX "sentry_pull_request_repository_id_date_added_aef4d968_idx" RENAME TO "sentry_pull_reposit_c429a4_idx";
--
-- Rename unnamed index for ('shard_scope', 'shard_identifier', 'category', 'object_identifier') on regionoutbox to sentry_regi_shard_s_bfff84_idx
--
ALTER INDEX "sentry_regionoutbox_shard_scope_shard_identi_80a8a166_idx" RENAME TO "sentry_regi_shard_s_bfff84_idx";
--
-- Rename unnamed index for ('shard_scope', 'shard_identifier', 'scheduled_for') on regionoutbox to sentry_regi_shard_s_cd9995_idx
--
ALTER INDEX "sentry_regionoutbox_shard_scope_shard_identi_bc439563_idx" RENAME TO "sentry_regi_shard_s_cd9995_idx";
--
-- Rename unnamed index for ('shard_scope', 'shard_identifier', 'id') on regionoutbox to sentry_regi_shard_s_e7412f_idx
--
ALTER INDEX "sentry_regionoutbox_shard_scope_shard_identi_ec4e1f4f_idx" RENAME TO "sentry_regi_shard_s_e7412f_idx";
--
-- Rename unnamed index for ('type', 'project_id', 'fingerprint', 'active') on regressiongroup to sentry_regr_type_3a29e7_idx
--
ALTER INDEX "sentry_regressiongroup_type_project_id_fingerpr_4004f756_idx" RENAME TO "sentry_regr_type_3a29e7_idx";
--
-- Rename unnamed index for ('organization_id', 'release_name', 'dist_name', 'artifact_bundle') on releaseartifactbundle to sentry_rele_organiz_291018_idx
--
ALTER INDEX "sentry_releaseartifactbu_organization_id_release__a6b32419_idx" RENAME TO "sentry_rele_organiz_291018_idx";
--
-- Rename unnamed index for ('release_id', 'name') on releasefile to sentry_rele_release_bff97c_idx
--
ALTER INDEX "sentry_releasefile_release_id_name_6026cf06_idx" RENAME TO "sentry_rele_release_bff97c_idx";
--
-- Rename unnamed index for ('project', 'adopted', 'environment') on releaseprojectenvironment to sentry_rele_project_4bea8e_idx
--
ALTER INDEX "sentry_releaseprojectenvironment_proj_id_env_id_adopted_j6h89s3" RENAME TO "sentry_rele_project_4bea8e_idx";
--
-- Rename unnamed index for ('project', 'unadopted', 'environment') on releaseprojectenvironment to sentry_rele_project_922a6a_idx
--
ALTER INDEX "sentry_releaseprojectenvironment_proj_id_env_id_unadopted_kyh5m" RENAME TO "sentry_rele_project_922a6a_idx";
--
-- Rename unnamed index for ('project', 'status', 'owner') on rule to sentry_rule_project_676d0d_idx
--
ALTER INDEX "sentry_rule_project_id_status_owner_id_82f20db5_idx" RENAME TO "sentry_rule_project_676d0d_idx";
--
-- Rename unnamed index for ('project_id', 'event_id') on userreport to sentry_user_project_cbfd59_idx
--
ALTER INDEX "sentry_userreport_project_id_event_id_17036863_idx" RENAME TO "sentry_user_project_cbfd59_idx";
--
-- Rename unnamed index for ('project_id', 'date_added') on userreport to sentry_user_project_b8faaf_idx
--
ALTER INDEX "sentry_userreport_project_id_date_added_3c4bcac4_idx" RENAME TO "sentry_user_project_b8faaf_idx";

@codecov Codecov
Copy link

codecov bot commented Jan 29, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (658eeb8) 81.20% compared to head (00d956b) 81.23%.
Report is 8 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master   #64055      +/-   ##
==========================================
+ Coverage   81.20%   81.23%   +0.03%     
==========================================
  Files        5227     5230       +3     
  Lines      230440   230491      +51     
  Branches    45235    45243       +8     
==========================================
+ Hits       187132   187244     +112     
+ Misses      37444    37389      -55     
+ Partials     5864     5858       -6
Files Coverage Δ
.../sentry/feedback/migrations/0004_index_together.py 100.00% <100.00%> (ø)
src/sentry/feedback/models.py 100.00% <100.00%> (ø)
src/sentry/incidents/models.py 96.61% <100.00%> (ø)
src/sentry/models/activity.py 93.54% <100.00%> (ø)
src/sentry/models/artifactbundle.py 92.88% <100.00%> (ø)
src/sentry/models/commit.py 89.74% <100.00%> (ø)
src/sentry/models/debugfile.py 72.07% <100.00%> (ø)
src/sentry/models/eventattachment.py 90.81% <100.00%> (ø)
src/sentry/models/group.py 94.78% <100.00%> (ø)
src/sentry/models/groupenvironment.py 100.00% <100.00%> (ø)
... and 13 more

... and 16 files with indirect coverage changes

wedamija
wedamija approved these changes Jan 29, 2024
View reviewed changes
Copy link
Member

@wedamija wedamija left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems ok to me, index renames should be safe.

Could you elaborate on the problem you saw previously?

@asottile-sentry
Copy link
Member Author

This seems ok to me, index renames should be safe.

Could you elaborate on the problem you saw previously?

there's a comment in the linked PR

@wedamija
Copy link
Member

This seems ok to me, index renames should be safe.
Could you elaborate on the problem you saw previously?

there's a comment in the linked PR

So an unapplied index in single tenant that we attempted to rename?

@asottile-sentry
Copy link
Member Author

This seems ok to me, index renames should be safe.
Could you elaborate on the problem you saw previously?

there's a comment in the linked PR

So an unapplied index in single tenant that we attempted to rename?

yep yep

@asottile-sentry asottile-sentry merged commit 2e7ff9d into master Jan 30, 2024
51 checks passed
@asottile-sentry asottile-sentry deleted the asottile-index-together-attempt-2 branch January 30, 2024 08:21
@asottile-sentry asottile-sentry added the Trigger: Revert Add to a merged PR to revert it (skips CI) label Jan 30, 2024
@getsentry-bot
Copy link
Contributor

PR reverted: 782ec4c

getsentry-bot added a commit that referenced this pull request Jan 30, 2024
@getsentry-bot @asottile-sentry
Revert "Revert "Revert "ref: replace deprecated index_together with i…
782ec4c 
…ndexes (#63776)"" (#64055)"

This reverts commit 2e7ff9d.

Co-authored-by: asottile-sentry <103459774+asottile-sentry@users.noreply.github.com>
@asottile-sentry
Copy link
Member Author

another one :/

ValueError: Found wrong number (0) of indexes for sentry_incidenttrigger(alert_rule_trigger_id, incident_id).

snigdhas pushed a commit that referenced this pull request Jan 30, 2024
@asottile-sentry @snigdhas
Revert "Revert "ref: replace deprecated index_together with indexes (#…
85b81bc 
…63776)"" (#64055)

This reverts commit e24ccd3.

I have applied the "dangerous" migration that was missing previously in
singletenants causing the failure

<!-- Describe your PR here. -->
snigdhas pushed a commit that referenced this pull request Jan 30, 2024
@getsentry-bot @asottile-sentry @snigdhas
Revert "Revert "Revert "ref: replace deprecated index_together with i…
682c44f 
…ndexes (#63776)"" (#64055)"

This reverts commit 2e7ff9d.

Co-authored-by: asottile-sentry <103459774+asottile-sentry@users.noreply.github.com>
asottile-sentry added a commit that referenced this pull request Jan 31, 2024
@asottile-sentry
Revertx4 "ref: replace deprecated index_together with indexes (#64055)"
28d4a6c 
This reverts commit 782ec4c.
asottile-sentry added a commit that referenced this pull request Jan 31, 2024
@asottile-sentry
Revertx4 "ref: replace deprecated index_together with indexes (#64055)…
3f531fe 
…" (#64158)

I've run the next missing dangerous migration in STs and will try again

This reverts commit 782ec4c.

<!-- Describe your PR here. -->
@github-actions github-actions bot locked and limited conversation to collaborators Feb 14, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@wedamija wedamija wedamija approved these changes

@armenzg armenzg armenzg approved these changes

Assignees
No one assigned
Labels
Scope: Backend Automatically applied to PRs that change backend components Trigger: Revert Add to a merged PR to revert it (skips CI)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@asottile-sentry @wedamija @getsentry-bot @armenzg