Commit58d0234

committed

fix: limit worker_name addition to GetProvisionerJobsByOrganizationAndStatusWithQueuePositionAndProvisioner query

1 parent5fc39a0 commit58d0234Copy full SHA for 58d0234

File tree

-300

lines changed

-300

lines changed

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@`
`37`	`37`	`"completed_at": "====[timestamp]=====",`
`38`	`38`	`"status": "succeeded",`
`39`	`39`	`"worker_id": "====[workspace build worker ID]=====",`
`40`		`- "worker_name": "test-daemon",`
`41`	`40`	`"file_id": "=====[workspace build file ID]======",`
`42`	`41`	`"tags": {`
`43`	`42`	`"owner": "",`

Lines changed: 0 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1267,14 +1267,6 @@ func (q *FakeQuerier) getProvisionerJobsByIDsWithQueuePositionLockedTagBasedQueu`
`1267`	`1267`	`// Step 6: Compute the final results with minimal checks`
`1268`	`1268`	`varresults []database.GetProvisionerJobsByIDsWithQueuePositionRow`
`1269`	`1269`	`for_,job:=rangefilteredJobs {`
`1270`		`-workerName:=""`
`1271`		`-// Add daemon name to provisioner job`
`1272`		`-for_,daemon:=rangeq.provisionerDaemons {`
`1273`		`-ifjob.WorkerID.Valid&&job.WorkerID.UUID==daemon.ID {`
`1274`		`-workerName=daemon.Name`
`1275`		`-}`
`1276`		`-}`
`1277`		`-`
`1278`	`1270`	`// If the job has a computed rank, use it`
`1279`	`1271`	`ifrank,found:=jobQueueStats[job.ID];found {`
`1280`	`1272`	`results=append(results,rank)`
`@@ -1286,7 +1278,6 @@ func (q *FakeQuerier) getProvisionerJobsByIDsWithQueuePositionLockedTagBasedQueu`
`1286`	`1278`	`ProvisionerJob:job,`
`1287`	`1279`	`QueuePosition:0,`
`1288`	`1280`	`QueueSize:0,`
`1289`		`-WorkerName:workerName,`
`1290`	`1281`	`})`
`1291`	`1282`	`}`
`1292`	`1283`	`}`

Lines changed: 1 addition & 6 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -100,15 +100,12 @@ SELECT`
`100`	`100`	`fj.created_at,`
`101`	`101`	`sqlc.embed(pj),`
`102`	`102`	`fj.queue_position,`
`103`		`-fj.queue_size,`
`104`		`-COALESCE(pd.name,'')AS worker_name`
	`103`	`+fj.queue_size`
`105`	`104`	`FROM`
`106`	`105`	`final_jobs fj`
`107`	`106`	`INNER JOIN provisioner_jobs pj`
`108`	`107`	ONfj.id=pj.id-- Ensure we retrieve full details from `provisioner_jobs`.
`109`	`108`	`-- JOIN with pj is required for sqlc.embed(pj) to compile successfully.`
`110`		`-LEFT JOIN provisioner_daemons pd-- Join to get the daemon name corresponding to the job's worker_id`
`111`		`-ONpj.worker_id=pd.id`
`112`	`109`	`ORDER BY`
`113`	`110`	`fj.created_at;`
`114`	`111`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,6 @@ func convertProvisionerJob(pj database.GetProvisionerJobsByIDsWithQueuePositionR`
`354`	`354`	`provisionerJob:=pj.ProvisionerJob`
`355`	`355`	`job:= codersdk.ProvisionerJob{`
`356`	`356`	`ID:provisionerJob.ID,`
`357`		`-WorkerName:pj.WorkerName,`
`358`	`357`	`OrganizationID:provisionerJob.OrganizationID,`
`359`	`358`	`CreatedAt:provisionerJob.CreatedAt,`
`360`	`359`	`Type:codersdk.ProvisionerJobType(provisionerJob.Type),`
`@@ -393,10 +392,10 @@ func convertProvisionerJob(pj database.GetProvisionerJobsByIDsWithQueuePositionR`
`393`	`392`	`funcconvertProvisionerJobWithQueuePosition(pj database.GetProvisionerJobsByOrganizationAndStatusWithQueuePositionAndProvisionerRow) codersdk.ProvisionerJob {`
`394`	`393`	`job:=convertProvisionerJob(database.GetProvisionerJobsByIDsWithQueuePositionRow{`
`395`	`394`	`ProvisionerJob:pj.ProvisionerJob,`
`396`		`-WorkerName:pj.WorkerName,`
`397`	`395`	`QueuePosition:pj.QueuePosition,`
`398`	`396`	`QueueSize:pj.QueueSize,`
`399`	`397`	`})`
	`398`	`+job.WorkerName=pj.WorkerName`
`400`	`399`	`job.AvailableWorkers=pj.AvailableWorkers`
`401`	`400`	`job.Metadata= codersdk.ProvisionerJobMetadata{`
`402`	`401`	`TemplateVersionName:pj.TemplateVersionName,`

Comments

(0)