mikebridge commented on PR #44288:
URL: https://github.com/apache/superset/pull/44288#issuecomment-5687385885
Flagging a collision before this lands, because it is cheap to fix now and
an emergency afterwards.
There are two open PRs merging the same two alembic heads:
| PR | revision | down_revision |
|---|---|---|
| #44288 (this one) | `e2f3a1b9c640` | `("c7f53d184ea2", "88a01c781622")` |
| #44283 | `f7b3a9c14e02` | `("88a01c781622", "c7f53d184ea2")` |
Same two parents, order swapped. Each consumes both heads and becomes a new
childless head, so whichever lands **second** re-forks master — the very thing
both PRs are fixing.
Simulated against `a184395eca` by AST-walking all 388 revisions in
`superset/migrations/versions/`:
```
master today -> 88a01c781622, c7f53d184ea2 (2 heads, broken)
+ #44288 alone -> e2f3a1b9c640 (1 head, fixed)
+ #44283 as written -> e2f3a1b9c640, f7b3a9c14e02 (2 heads, broken again)
```
The fix is one line in whichever merges second: point its `down_revision` at
the other's revision instead of at the original pair. If this PR lands first,
#44283 becomes `down_revision = "e2f3a1b9c640"`.
Also worth knowing for whoever reviews: the `enforce-single-migration-head`
job only runs its assertion when a PR touches `superset/migrations/`, and
reports SUCCESS otherwise so it can stay a required check. That is the right
design, but it means the second PR's green checks will not catch this — the
two-head state is invisible to every PR that does not touch migrations.
I have no write access here beyond my own PRs, so this needs a committer.
@eschutho — you own #44283, so you may be best placed to decide the ordering.
Happy to open the one-line re-point against whichever ends up second.
(For the record: I opened a third merge migration myself before spotting
this one, and closed it. Flagging so we do not all repair it in parallel.)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
