Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: complete job and mark workspace as deleted when no provisioners are available #18465

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 9 commits into from
Jun 23, 2025
Merged

fix: complete job and mark workspace as deleted when no provisioners are available #18465

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9d3ea6f
fix: wsbuilder: complete job and mark workspace deleted if no provisi…
johnstcn Jun 19, 2025
d46f156
check daemon last seen at
johnstcn Jun 20, 2025
dba9fce
allow orphaning if last build was cancelled
johnstcn Jun 20, 2025
f312292
re-fetch provisioner job before returning
johnstcn Jun 20, 2025
2eea932
ensure that audit logs are created
johnstcn Jun 20, 2025
459ce5c
write audit log
johnstcn Jun 20, 2025
92a4b99
nits
johnstcn Jun 20, 2025
5a896ed
fixup! nits
johnstcn Jun 23, 2025
cb2b000
log
johnstcn Jun 23, 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
nits
  • Loading branch information
@johnstcn
johnstcn committed Jun 20, 2025
commit 92a4b991c0da20d123a5b01c5b5db9263c4f68a6
1 change: 1 addition & 0 deletions coderd/database/dbmem/dbmem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4464,6 +4464,7 @@ func (q *FakeQuerier) GetProvisionerDaemons(_ context.Context) ([]database.Provi
defer q.mutex.RUnlock()

if len(q.provisionerDaemons) == 0 {
// Returning err=nil here for consistency with real querier
return []database.ProvisionerDaemon{}, nil
}
// copy the data so that the caller can't manipulate any data inside dbmem
Expand Down
8 changes: 4 additions & 4 deletions coderd/workspacebuilds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,10 +424,10 @@ func (api *API) postWorkspaceBuilds(rw http.ResponseWriter, r *http.Request) {
return
}

var qpr database.GetProvisionerJobsByIDsWithQueuePositionRow
var queuePos database.GetProvisionerJobsByIDsWithQueuePositionRow
if provisionerJob != nil {
qpr.ProvisionerJob = *provisionerJob
qpr.QueuePosition = 0
queuePos.ProvisionerJob = *provisionerJob
queuePos.QueuePosition = 0
if err := provisionerjobs.PostJob(api.Pubsub, *provisionerJob); err != nil {
// Client probably doesn't care about this error, so just log it.
api.Logger.Error(ctx, "failed to post provisioner job to pubsub", slog.Error(err))
Expand Down Expand Up @@ -468,7 +468,7 @@ func (api *API) postWorkspaceBuilds(rw http.ResponseWriter, r *http.Request) {
apiBuild, err := api.convertWorkspaceBuild(
*workspaceBuild,
workspace,
qpr,
queuePos,
[]database.WorkspaceResource{},
[]database.WorkspaceResourceMetadatum{},
[]database.WorkspaceAgent{},
Expand Down
2 changes: 1 addition & 1 deletion site/src/modules/workspaces/WorkspaceMoreActions/WorkspaceDeleteDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const WorkspaceDeleteDialog: FC<WorkspaceDeleteDialogProps> = ({
// usually means that builds are failing as well.
// b) No provisioner is available to delete the workspace, which will
// cause the job to remain in the "pending" state indefinitely.
// The assumption here is that and admin will cancel the job.
// The assumption here is that an admin will cancel the job.
const canOrphan =
canDeleteFailedWorkspace &&
(workspace.latest_build.status === "failed" ||
Expand Down
Loading