Cherry-pick #47168: Reorder org_logo migration - #47186
Merged
nulmete merged 1 commit intoJun 9, 2026
Merged
Conversation
…AtIndex (#47168) Follow-up to #47099. Re-timestamps the `CreateOrgLogoTable` migration so it can also ship in the **4.86.2** patch. `CreateOrgLogoTable` must sort **immediately after** `20260527215817_AddHostCertificatesOriginDeletedAtIndex` (the last migration in 4.86.1). - Started server with latest `main` migrations applied. It failed. - Ran `UPDATE migration_status_tables SET version_id = 20260527215818 WHERE version_id = 20260608173427;`. - Started server, no crashes. <img width="1458" height="628" alt="Screenshot 2026-06-09 at 10 19 40 AM" src="https://github.com/user-attachments/assets/68d24712-78ae-42ca-8989-60c39647dd33" /> <!-- This is an auto-generated comment: release notes by coderabbit.ai --> * **Chores** * Updated database migration infrastructure and corresponding tests to maintain consistency. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## rc-minor-fleet-v4.87.0 #47186 +/- ##
=========================================================
Coverage ? 67.17%
=========================================================
Files ? 2910
Lines ? 226166
Branches ? 11825
=========================================================
Hits ? 151919
Misses ? 60508
Partials ? 13739
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
lucasmrod
approved these changes
Jun 9, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-pick of #47168 into the
rc-minor-fleet-v4.87.0RC branch.Follows the cherry-pick of #47099 (#47166, already merged here). This re-timestamps the
CreateOrgLogoTablemigration20260608173427→20260527215818so it sorts immediately afterAddHostCertificatesOriginDeletedAtIndex(required so the same migration can also ship in the 4.86.2 patch without breaking the 4.86.2 → 4.87.0 upgrade path).Note:
schema.sqlconflicted (main regenerated it against main's migration set, which differs from this RC branch) because 20260608202705_AddVulnPerfIndexes.go and 20260608210432_CleanupSoftwareLastOpenedAtSentinels.go are not part of the RC branch yet (looks like the PRs that introduced them on main have not been cherry-picked yet).