ci(auto-rebase): a green pull request is merged, not only armed - the scheduled queue stopped draining #2435
No reviewers
Labels
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference
jaylouisw/packetforge!2435
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "ci/1121-1427"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
What was broken
Five pull requests were green,
mergeable: true, based on main's head, and not merging:pull_scheduled_merge)The last merge on the repository was #2428 at 13:38:01Z. The five before it merged
4-16 min after their arm (#2424 16 min, #2427 8 min, #2428 4 min). Both auto-rebase
ticks in that window (runs 9428 14:00:03Z and 9435 14:30:07Z) re-armed every one of
them and merged none.
merge_base == base == main head (51bd617f)on all five, sothis is not a branch that needs a rebase - it is the scheduled-merge entry that
is not being drained.
The change
auto-rebase.ymlnow asks for the merge itself instead of only queueing one:{"Do":"squash","head_commit_id":"<head>"}on a headchecks_greenjustread (all statuses success, all three
CI / Test (Node *)legs present) andthat the existing
mergeablepoll settled.already scheduled: cancel the stale schedule (DELETE .../merge) andretry the direct merge once - exactly the state the queue was stuck in.
merge_when_checks_succeedarm.No check is weakened: same status reader, same poll, merge pinned to the sha that
was read, red/pending never reaches the call.
Baseline / after
ci.ymlrun (unchanged) plus a dispatch of the newauto-rebase.yml; run id andmerged=Nin the report comment.7115ea59e83f6ed82c75Measured after (same day, same gate)
Baseline, before this change:
success,mergeable: true,merge_base == base == 51bd617f, armed (pull_scheduled_merge) at 13:51:30Z - still open at 14:39. 47 min, and #2430-#2433 queued behind it.After this branch's
auto-rebase.ymlwas dispatched (batch=0, no rebase) against the same queue:pull_cancel_scheduled_mergeat 14:47:04Z (the stale entry the old code left alone), thenmerge_pullat 14:47:23Z - merged 34 s after green, 19 s after the cancel.No check moved:
ci.ymlis untouched, the merge is pinned to thehead_commit_idwhose statuseschecks_greenread (all statuses success, all threeCI / Test (Node *)legs present), and themergeablepoll gates the call. A red or pending head never reaches the merge. The fallback arm call is unchanged for every non-409 answer.