fix: complete job and mark workspace as deleted when no provisioners are available #18465
+502
−86
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
Pull Request Overview
This PR ensures that when an orphan-delete request finds no active provisioners, the builder marks the provisioner job as completed and the workspace as deleted. It also adds the UI hook for orphan deletion, updates in-memory DB behavior, and expands tests to cover the new orphan scenarios.
- Add
canOrphanflag and checkbox in the workspace delete dialog - Implement orphan-delete fallback in wsbuilder (complete job + delete workspace)
- Expand unit and integration tests to cover orphan-delete paths
Reviewed Changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| site/src/modules/workspaces/WorkspaceMoreActions/WorkspaceDeleteDialog.tsx | Extract canOrphan and render orphan checkbox with updated text |
| coderd/wsbuilder/wsbuilder.go | Orphan-delete logic: complete provisioner job and mark workspace deleted when no provisioners available |
| coderd/wsbuilder/wsbuilder_test.go | New tests for orphan-delete with and without available provisioners |
| coderd/workspacebuilds.go | Use qpr variable to pass provisioner job info into conversion |
| coderd/workspacebuilds_test.go | Import dbfake and add subtests for orphan build errors and permissions |
| coderd/database/dbmem/dbmem.go | Return empty slice instead of sql.ErrNoRows for no provisioner daemons |
| cli/delete_test.go | Update CLI delete test to cover --orphan behavior and status codes |
Comments suppressed due to low confidence (2)
site/src/modules/workspaces/WorkspaceMoreActions/WorkspaceDeleteDialog.tsx:53
- [nitpick] Add frontend tests to verify that the "Orphan Resources" checkbox appears only when
canOrphanis true and is hidden otherwise.
const canOrphan =
coderd/wsbuilder/wsbuilder.go:495
- Implement or remove the TODO for audit baggage so that delete transitions are properly logged in the audit system.
// TODO: audit baggage?
site/src/modules/workspaces/WorkspaceMoreActions/WorkspaceDeleteDialog.tsx
Outdated
Show resolved
Hide resolved
johnstcn
commented
Jun 20, 2025
site/src/modules/workspaces/WorkspaceMoreActions/WorkspaceDeleteDialog.tsx
Outdated
Show resolved
Hide resolved
johnstcn
commented
Jun 20, 2025
Comment on lines
-374
to
-378
| client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true}) | ||
| first := coderdtest.CreateFirstUser(t, client) | ||
|
|
||
| ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) | ||
| defer cancel() |
There was a problem hiding this comment.
review: refactored to use dbfake instead
johnstcn
commented
Jun 20, 2025
Comment on lines
-407
to
-409
| _, err = client.Workspace(ctx, workspace.ID) | ||
| require.Error(t, err) | ||
| require.Equal(t, http.StatusGone, coderdtest.SDKError(t, err).StatusCode()) |
There was a problem hiding this comment.
review: moved this check to the relevant CLI test
dannykopping
approved these changes
Jun 23, 2025
site/src/modules/workspaces/WorkspaceMoreActions/WorkspaceDeleteDialog.tsx
Show resolved
Hide resolved
| @@ -484,7 +486,7 @@ func (b *Builder) buildTx(authFunc func(action policy.Action, object rbac.Object | |||
| // nolint: gocritic // At this moment, we are pretending to be provisionerd. | |||
| if err := store.UpdateProvisionerJobWithCompleteWithStartedAtByID(dbauthz.AsProvisionerd(b.ctx), database.UpdateProvisionerJobWithCompleteWithStartedAtByIDParams{ | |||
There was a problem hiding this comment.
Can we please log that this has occurred?
There was a problem hiding this comment.
Logging in the API handler where we do the auditing.
dannykopping
approved these changes
Jun 23, 2025
|
Follow-up issue: coder/internal#740 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Alternate fix for #18080
Modifies wsbuilder to complete the provisioner job and mark the workspace as deleted if it is clear that no provisioner will be able to pick up the delete build.
This has a significant advantage of not deviating too much from the current semantics of
POST /api/v2/workspacebuilds. #18460 ends up returning a 204 on orphan delete due to no build being created.Downside is that we have to duplicate some responsibilities of provisionerdserver in wsbuilder.
There is a slight gotcha to this approach though: if you stop a provisioner and then immediately try to orphan-delete, the job will still be created because of the provisioner heartbeat interval. However you can cancel it and try again.