Skip to content
Merged
53 changes: 34 additions & 19 deletions internal/mergequeue/coordinator.go
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,13 @@ func (a *Coordinator) eventLoop() {

case <-periodicTrigger.C:
a.queuesLock.Lock()
for _, q := range a.queues {
for branchID, q := range a.queues {
if q.IsEmpty() {
q.Wait()
delete(a.queues, branchID)
a.Logger.With(q.baseBranch.Logfields...).Debug("removed empty queue for base branch")
continue
}
q.ScheduleProcessPR(context.Background(), TaskNone)
a.Logger.Debug("periodic run scheduled", q.baseBranch.Logfields...)
}
Expand Down Expand Up @@ -768,7 +774,7 @@ func (a *Coordinator) processCheckRunEvent(ctx context.Context, logger *zap.Logg
logger.Debug("event received")

if len(branches) == 0 {
logger.Info("ignoring event, pull request or branches fields is empty")
logger.Debug("ignoring event, pull request or branches fields is empty")

return
}
Expand All @@ -777,31 +783,32 @@ func (a *Coordinator) processCheckRunEvent(ctx context.Context, logger *zap.Logg
baseBranch := pr.GetBase().GetRef()
prNumber := pr.GetNumber()

logger = logger.With(
prLogger := logger.With(
logfields.BaseBranch(baseBranch),
logfields.PullRequest(prNumber),
)

bb, err := NewBaseBranch(owner, repo, baseBranch)
if err != nil {
logger.Warn(
prLogger.Warn(
"ignoring check run event for pull-request, incomplete base branch information",
zap.Error(err),
)
continue
}

err := a.SetPRStaleSinceIfNewer(ctx, bb, pr.GetNumber(), time.Now())
if err != nil {
if errors.Is(err, ErrNotFound) {
logger.Debug(
"pr not queued, can not update stale timestamp",
)
continue
}
logger.Error(
"updating stale timestamp failed",
zap.Error(err),
err = a.SetPRStaleSinceIfNewer(ctx, bb, prNumber, time.Now())
if err != nil {
if errors.Is(err, ErrNotFound) {
prLogger.Debug(
"pr not queued, can not update stale timestamp",
)
continue
}
prLogger.Error(
"updating stale timestamp failed",
zap.Error(err),
)
}
}

Expand Down Expand Up @@ -848,7 +855,7 @@ func (a *Coordinator) processStatusEvent(ctx context.Context, logger *zap.Logger
logger.Debug("event received")

if len(branches) == 0 {
logger.Info("ignorning event, pull request or branches field is empty")
logger.Debug("ignoring event, pull request or branches field is empty")

return
}
Expand Down Expand Up @@ -948,11 +955,14 @@ func (a *Coordinator) Dequeue(_ context.Context, baseBranch *BaseBranch, prNumbe

pr, err := q.Dequeue(prNumber, setPendingStatusState)
if err != nil {
if q.IsEmpty() {
q.Wait()
delete(a.queues, baseBranch.BranchID)
a.Logger.With(baseBranch.Logfields...).Debug("removed empty queue for base branch")
}
return nil, fmt.Errorf("removing pr from merge queue failed: %w", err)
}

metrics.DequeueOpsInc(&baseBranch.BranchID)

if q.IsEmpty() {
q.Wait()
delete(a.queues, baseBranch.BranchID)
Expand Down Expand Up @@ -985,7 +995,12 @@ func (a *Coordinator) SetPRStaleSinceIfNewerByBranch(
continue
}

missing = q.SetPRStaleSinceIfNewerByBranch(branchNames, updatedAt)
notFoundInQueue := q.SetPRStaleSinceIfNewerByBranch(branchNames, updatedAt)
for b := range missing {
if !notFoundInQueue.Contains(b) {
delete(missing, b)
}
}
}

return missing.Slice()
Expand Down
181 changes: 180 additions & 1 deletion internal/mergequeue/coordinator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1884,7 +1884,7 @@ func TestPauseResumeQueue(t *testing.T) {
require.NoError(t, err)

mockSuccessfulGithubUpdateBranchCall(ghClient, pr.Number, false).Times(4)
mockSuccessfulGithubAddLabelQueueHeadCall(ghClient, pr.Number).Times(4)
mockSuccessfulGithubAddLabelQueueHeadCall(ghClient, pr.Number).Times(1)
mockReadyForMergeStatus(
ghClient, pr.Number,
githubclt.ReviewDecisionApproved, githubclt.CIStatusExpected,
Expand Down Expand Up @@ -2162,3 +2162,182 @@ func TestCIJobsRetriedWhenTriggerFails(t *testing.T) {
waitForQueueUpdateRunsGreaterThan(t, queue, 2)
assert.EqualValues(t, 2, ciBuildCalls.Load(), "CI jobs must not be triggered again after succeeding")
}

func TestCheckRunEventUpdatesStaleTimestampAndHandlesMissingBaseBranch(t *testing.T) {
l := forwardLogsToTestLogger(t)

evChan := make(chan *github_prov.Event, 1)
t.Cleanup(func() { close(evChan) })
mockctrl := gomock.NewController(t)
ghClient := mocks.NewMockGithubClient(mockctrl)
ciClient := mocks.NewMockJenkinsClient(mockctrl)

autoupdater := newAutoupdater(
ghClient,
ciClient,
evChan,
[]Repository{{OwnerLogin: repoOwner, RepositoryName: repo}},
true,
nil,
)

bb, err := NewBaseBranch(repoOwner, repo, "master")
require.NoError(t, err)

pr, err := NewPullRequest(1, "pr_branch1", "me", "test pr", "")
require.NoError(t, err)
initialTime := time.Now().Add(-time.Hour)
pr.SetStateUnchangedSince(initialTime)

q := newQueue(bb, l, ghClient, retry.NewRetryer(), autoupdater.CI, queueHeadLabel)
t.Cleanup(q.Stop)
_, added := q.active.InsertIfNotExist(pr.Number, pr)
require.True(t, added)
autoupdater.queues[bb.BranchID] = q

ev := newCheckRunEvent("stale", "", "pr_branch1")
ev.CheckRun.PullRequests = append(ev.CheckRun.PullRequests, newBasicPullRequest(2, "", "pr_branch2"))

require.NotPanics(t, func() {
autoupdater.processCheckRunEvent(context.Background(), l, ev)
})
assert.True(t, pr.GetStateUnchangedSince().After(initialTime), "expected check_run event to update stateUnchangedSince timestamp")
}

func TestSetPRStaleSinceIfNewerByBranchMultipleQueues(t *testing.T) {
l := forwardLogsToTestLogger(t)

evChan := make(chan *github_prov.Event, 1)
t.Cleanup(func() { close(evChan) })
mockctrl := gomock.NewController(t)
ghClient := mocks.NewMockGithubClient(mockctrl)
ciClient := mocks.NewMockJenkinsClient(mockctrl)

autoupdater := newAutoupdater(
ghClient,
ciClient,
evChan,
[]Repository{{OwnerLogin: repoOwner, RepositoryName: repo}},
true,
nil,
)

bbMaster, err := NewBaseBranch(repoOwner, repo, "master")
require.NoError(t, err)
bbRelease, err := NewBaseBranch(repoOwner, repo, "release")
require.NoError(t, err)

pr1, err := NewPullRequest(1, "pr_branch1", "me", "test pr 1", "")
require.NoError(t, err)
pr2, err := NewPullRequest(2, "pr_branch2", "me", "test pr 2", "")
require.NoError(t, err)

qMaster := newQueue(bbMaster, l, ghClient, retry.NewRetryer(), autoupdater.CI, queueHeadLabel)
t.Cleanup(qMaster.Stop)
_, added := qMaster.active.InsertIfNotExist(pr1.Number, pr1)
require.True(t, added)
autoupdater.queues[bbMaster.BranchID] = qMaster

qRelease := newQueue(bbRelease, l, ghClient, retry.NewRetryer(), autoupdater.CI, queueHeadLabel)
t.Cleanup(qRelease.Stop)
_, added = qRelease.active.InsertIfNotExist(pr2.Number, pr2)
require.True(t, added)
autoupdater.queues[bbRelease.BranchID] = qRelease

updatedAt := time.Now().Add(time.Minute)
notFound := autoupdater.SetPRStaleSinceIfNewerByBranch(
context.Background(),
repoOwner,
repo,
[]string{"pr_branch1", "pr_branch2", "unqueued_branch"},
updatedAt,
)

assert.Equal(t, []string{"unqueued_branch"}, notFound)
assert.Equal(t, updatedAt, pr1.GetStateUnchangedSince())
assert.Equal(t, updatedAt, pr2.GetStateUnchangedSince())
}

func TestInitialSyncPreservesQueueHeadAndOrdersByNumber(t *testing.T) {
t.Cleanup(zap.ReplaceGlobals(zaptest.NewLogger(t).Named(t.Name())))

evChan := make(chan *github_prov.Event, 1)
defer close(evChan)

mockctrl := gomock.NewController(t)
ghClient := mocks.NewMockGithubClient(mockctrl)
ciClient := mocks.NewMockJenkinsClient(mockctrl)

mockSuccessfulGithubUpdateBranchCall(ghClient, 30, false).AnyTimes()
mockReadyForMergeStatus(
ghClient, 30,
githubclt.ReviewDecisionApproved, githubclt.CIStatusExpected,
).AnyTimes()
mockCreateCommitStatusSuccessful(ghClient).Times(1)
ciClient.
EXPECT().
Build(gomock.Any(), gomock.Any()).
AnyTimes()
mockGetBuildFromQueueItemID(ciClient).AnyTimes()

syncPRRequestsRet := []*githubclt.PR{
{
Number: 10,
AutoMergeEnabled: true,
Branch: "pr10",
BaseBranch: "main",
},
{
Number: 20,
AutoMergeEnabled: true,
Branch: "pr20",
BaseBranch: "main",
},
{
Number: 30,
AutoMergeEnabled: true,
Branch: "pr30",
BaseBranch: "main",
Labels: []string{queueHeadLabel},
},
}

ghClient.
EXPECT().
ListPRs(gomock.Any(), gomock.Eq(repoOwner), gomock.Eq(repo)).
Return(
func(yield func(*githubclt.PR, error) bool) {
for _, item := range syncPRRequestsRet {
if !yield(item, nil) {
return
}
}
},
).Times(1)

autoupdater := newAutoupdater(
ghClient,
ciClient,
evChan,
[]Repository{{OwnerLogin: repoOwner, RepositoryName: repo}},
true,
nil,
)
autoupdater.CI.Jobs = map[string]*jenkins.JobTemplate{
ciJobExpectedName: {RelURL: "here"},
}

err := autoupdater.InitSync(context.Background())
require.NoError(t, err)
t.Cleanup(autoupdater.Stop)

q := autoupdater.getQueue(&BranchID{Repository: repo, RepositoryOwner: repoOwner, Branch: "main"})
require.NotNil(t, q)
waitForQueueUpdateRunsGreaterThan(t, q, 0)

activePRs, _ := q.asSlices()
require.Len(t, activePRs, 3)
assert.Equal(t, 30, activePRs[0].Number, "PR carrying head label before sync must remain at queue head")
assert.Equal(t, 10, activePRs[1].Number, "remaining PRs must be ordered by ascending PR number")
assert.Equal(t, 20, activePRs[2].Number, "remaining PRs must be ordered by ascending PR number")
}
3 changes: 3 additions & 0 deletions internal/mergequeue/httplistdata.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ func (a *Coordinator) httpListData() *pagestypes.ListData {
}

activePRs, suspendedPRs := queue.asSlices()
if len(activePRs) == 0 && len(suspendedPRs) == 0 {
continue
}

// sort them PRs to show list in a stable order in the UI
slices.SortFunc(suspendedPRs, orderBefore)
Expand Down
3 changes: 3 additions & 0 deletions internal/mergequeue/pullrequest.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ type PullRequest struct {

GithubStatusLastSetState ReportedStatusState
GithubStatusLock sync.Mutex

hasHeadLabel bool
headLabelLock sync.Mutex
}

type ReportedStatusState struct {
Expand Down
Loading
Loading