[Backport 5.3] Migrator Backfill Override (#60651)

Author: sourcegraph-release-bot

internal/database/migration/store/store.go

@@ -93,6 +93,12 @@ func (s *Store) EnsureSchemaTable(ctx context.Context) (err error) {
 	return nil
 }
 
+// backfillOverrides contains a list of migration IDs that are to be backfilled
+// after the stitched-migration graph has already been constructed.
+var backfillOverrides = []int64{
+	1648115472, // See https://github.com/sourcegraph/sourcegraph/pull/46969 and https://github.com/sourcegraph/sourcegraph/pull/55650
+}
+
 // BackfillSchemaVersions adds "backfilled" rows into the migration_logs table to make instances
 // upgraded from older versions work uniformly with instances booted from a newer version.
 //
@@ -171,7 +177,12 @@ func (s *Store) BackfillSchemaVersions(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
+
 	idsToBackfill := []int64{}
+	for _, id := range backfillOverrides {
+		idsToBackfill = append(idsToBackfill, int64(id))
+	}
+
 	for _, id := range ancestorIDs {
 		idsToBackfill = append(idsToBackfill, int64(id))
 	}

internal/database/migration/store/store_test.go

@@ -127,6 +127,9 @@ func testBackfillSchemaVersion(
 	}
 
 	sort.Ints(appliedVersions)
+	for _, version := range backfillOverrides {
+		expectedVersions = append(expectedVersions, int(version))
+	}
 	sort.Ints(expectedVersions)
 	if diff := cmp.Diff(expectedVersions, appliedVersions); diff != "" {
 		t.Errorf("unexpected applied migrations (-want +got):\n%s", diff)