check daemon last seen at

johnstcn · johnstcn · commit d46f1564eb81 · 2025-06-20T10:30:15.000+01:00
diff --git a/coderd/wsbuilder/wsbuilder.go b/coderd/wsbuilder/wsbuilder.go
@@ -472,18 +472,27 @@ func (b *Builder) buildTx(authFunc func(action policy.Action, object rbac.Object
 		// There are cases where tagged provisioner daemons have been decommissioned
 		// without deleting the relevant workspaces, and without any provisioners
 		// available these workspaces cannot be deleted.
-		if b.state.orphan && len(provisionerDaemons) == 0 {
+		hasActiveEligibleProvisioner := false
+		for _, pd := range provisionerDaemons {
+			age := now.Sub(pd.ProvisionerDaemon.LastSeenAt.Time)
+			if age <= provisionerdserver.StaleInterval {
+				hasActiveEligibleProvisioner = true
+				break
+			}
+		}
+		if b.state.orphan && !hasActiveEligibleProvisioner {
 			// nolint: gocritic // At this moment, we are pretending to be provisionerd.
 			if err := store.UpdateProvisionerJobWithCompleteWithStartedAtByID(dbauthz.AsProvisionerd(b.ctx), database.UpdateProvisionerJobWithCompleteWithStartedAtByIDParams{
 				CompletedAt: sql.NullTime{Valid: true, Time: now},
-				Error:       sql.NullString{Valid: true, String: "No provisioners were available to handle the orphan-delete request. The workspace was marked as deleted, but no resources were destroyed."},
+				Error:       sql.NullString{Valid: true, String: "No provisioners were available to handle the request. The workspace has been deleted. No resources were destroyed."},
 				ErrorCode:   sql.NullString{Valid: false},
 				ID:          provisionerJob.ID,
 				StartedAt:   sql.NullTime{Valid: true, Time: now},
 				UpdatedAt:   now,
 			}); err != nil {
 				return BuildError{http.StatusInternalServerError, "mark orphan-delete provisioner job as completed", err}
 			}
+			// TODO: audit baggage?
 
 			if err := store.UpdateWorkspaceDeletedByID(b.ctx, database.UpdateWorkspaceDeletedByIDParams{
 				ID:      b.workspace.ID,
diff --git a/coderd/wsbuilder/wsbuilder_test.go b/coderd/wsbuilder/wsbuilder_test.go
@@ -861,8 +861,10 @@ func TestWorkspaceBuildDeleteOrphan(t *testing.T) {
 			withRichParameters(nil),
 			withWorkspaceTags(inactiveVersionID, nil),
 			withProvisionerDaemons([]database.GetEligibleProvisionerDaemonsByProvisionerJobIDsRow{{
-				JobID:             inactiveJobID,
-				ProvisionerDaemon: database.ProvisionerDaemon{},
+				JobID: inactiveJobID,
+				ProvisionerDaemon: database.ProvisionerDaemon{
+					LastSeenAt: sql.NullTime{Valid: true, Time: dbtime.Now()},
+				},
 			}}),
 
 			// Outputs
