Skip to content

fix: prioritise human-initiated builds over prebuilds #18933

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

Merged
merged 10 commits into from
Jul 22, 2025
Merged

fix: prioritise human-initiated builds over prebuilds #18933

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a314c51
feat: prioritize human-initiated workspace builds over prebuilds in q…
blink-so[bot] Jul 15, 2025
bce74b7
revert addition of provisioner_jobs.priority
johnstcn Jul 21, 2025
a6e9987
adjust ordering in AcquireProvisionerJob to ensure human-initiated jo…
johnstcn Jul 21, 2025
0112806
improve test and move to correct location
johnstcn Jul 21, 2025
9ad95c9
fixup! improve test and move to correct location
johnstcn Jul 21, 2025
6571937
improve test logging
johnstcn Jul 21, 2025
64c28a9
update queue position based on initiator_id
johnstcn Jul 21, 2025
2f2b118
set order explicitly for clarity
johnstcn Jul 21, 2025
69de64e
test queued job positions
johnstcn Jul 21, 2025
b2af244
undiff
johnstcn Jul 21, 2025
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
Prev Previous commit
Next Next commit
test queued job positions
  • Loading branch information
@johnstcn
johnstcn committed Jul 21, 2025
commit 69de64eb1a9ace2241c9de718638fc855471907e
27 changes: 24 additions & 3 deletions coderd/database/querier_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1332,6 +1332,7 @@ func TestAcquireProvisionerJob(t *testing.T) {
db, _ = dbtestutil.NewDB(t)
ctx = testutil.Context(t, testutil.WaitMedium)
org = dbgen.Organization(t, db, database.Organization{})
_ = dbgen.ProvisionerDaemon(t, db, database.ProvisionerDaemon{}) // Required for queue position
now = dbtime.Now()
numJobs = 10
humanIDs = make([]uuid.UUID, 0, numJobs/2)
Expand All @@ -1344,10 +1345,10 @@ func TestAcquireProvisionerJob(t *testing.T) {
if idx%2 == 0 {
initiator = database.PrebuildsSystemUserID
} else {
initiator = uuid.New()
initiator = uuid.MustParse("c0dec0de-c0de-c0de-c0de-c0dec0dec0de")
}
pj, err := db.InsertProvisionerJob(ctx, database.InsertProvisionerJobParams{
ID: uuid.New(),
ID: uuid.MustParse(fmt.Sprintf("00000000-0000-0000-0000-00000000000%x", idx+1)),
CreatedAt: time.Now().Add(-time.Second * time.Duration(idx)),
UpdatedAt: time.Now().Add(-time.Second * time.Duration(idx)),
InitiatorID: initiator,
Expand All @@ -1372,7 +1373,27 @@ func TestAcquireProvisionerJob(t *testing.T) {

expectedIDs := append(humanIDs, prebuildIDs...) //nolint:gocritic // not the same slice

// When: a job is acquired
// When: we query the queue positions for the jobs
qjs, err := db.GetProvisionerJobsByIDsWithQueuePosition(ctx, database.GetProvisionerJobsByIDsWithQueuePositionParams{
IDs: expectedIDs,
StaleIntervalMS: provisionerdserver.StaleInterval.Milliseconds(),
})
require.NoError(t, err)
require.Len(t, qjs, numJobs)
// Ensure the jobs are sorted by queue position.
sort.Slice(qjs, func(i, j int) bool {
return qjs[i].QueuePosition < qjs[j].QueuePosition
})

// Then: the queue positions for the jobs should indicate the order in which
// they will be acquired, with human-initiated jobs first.
for idx, qj := range qjs {
t.Logf("queued job %d/%d id=%q initiator=%q created_at=%q queue_position=%d", idx+1, numJobs, qj.ProvisionerJob.ID.String(), qj.ProvisionerJob.InitiatorID.String(), qj.ProvisionerJob.CreatedAt.String(), qj.QueuePosition)
require.Equal(t, expectedIDs[idx].String(), qj.ProvisionerJob.ID.String(), "job %d/%d should match expected id", idx+1, numJobs)
require.Equal(t, int64(idx+1), qj.QueuePosition, "job %d/%d should have queue position %d", idx+1, numJobs, idx+1)
}

// When: the jobs are acquired
// Then: human-initiated jobs are prioritized first.
for idx := range numJobs {
acquired, err := db.AcquireProvisionerJob(ctx, database.AcquireProvisionerJobParams{
Expand Down
Loading