Skip to content

[ADHOC] Graceful dequeue when branch queue is already removed. #32

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

Open
siarhei-kisialeu wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[ADHOC] Graceful dequeue when branch queue is already removed. #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10c8deb
possible fix
siarhei-kisialeu Feb 24, 2026
e4f473c
upd gitignore
siarhei-kisialeu Feb 24, 2026
e929af9
fix fmt
siarhei-kisialeu Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
*.swp
*.swo
*.orig

.DS_Store
dist/
11 changes: 11 additions & 0 deletions internal/mergequeue/coordinator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,13 @@ func (a *Coordinator) processPullRequestEvent(ctx context.Context, logger *zap.L
)
return
}
// If pr == nil, it means that the queue has already been deleted earlier by another event.
if pr == nil {
logger.Warn(
"PR already dequeued or queue non-existent",
)
return
}

if ev.PullRequest.GetMerged() {
metrics.RecordTimeToMerge(time.Since(pr.EnqueuedAt), owner, repo)
Expand Down Expand Up @@ -926,6 +933,10 @@ func (a *Coordinator) Dequeue(_ context.Context, baseBranch *BaseBranch, prNumbe

pr, err := q.Dequeue(prNumber, setPendingStatusState)
if err != nil {
// If there is a queue but no PR in it, this may also be a duplicate.
if errors.Is(err, ErrNotFound) {
return nil, nil
}
return nil, fmt.Errorf("removing pr from merge queue failed: %w", err)
}

Expand Down
Loading