Commitb135381

committed

chore: address comments

1 parentb0cde3b commitb135381Copy full SHA for b135381

File tree

+16

-2

lines changed

+16

-2

lines changed

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,17 @@ const (`
`64`	`64`	`DeprovisionModeOrphan`
`65`	`65`	`)`
`66`	`66`
	`67`	`+func (dDeprovisionMode)String()string {`
	`68`	`+switchd {`
	`69`	`+caseDeprovisionModeOrphan:`
	`70`	`+return"orphan"`
	`71`	`+caseDeprovisionModeNormal:`
	`72`	`+return"normal"`
	`73`	`+default:`
	`74`	`+return"unknown"`
	`75`	`+}`
	`76`	`+}`
	`77`	`+`
`67`	`78`	`funcNewStoreReconciler(store database.Store,`
`68`	`79`	`ps pubsub.Pubsub,`
`69`	`80`	`fileCache*files.Cache,`
`@@ -728,8 +739,8 @@ func (c *StoreReconciler) provisionDelete(ctx context.Context, db database.Store`
`728`	`739`	`returnxerrors.Errorf("prebuilt workspace is not owned by prebuild user anymore, probably it was claimed")`
`729`	`740`	`}`
`730`	`741`
`731`		`-c.logger.Info(ctx,"attempting to delete prebuild",`
`732`		`-slog.F("workspace_id",workspaceID.String()),slog.F("preset_id",presetID.String()))`
	`742`	`+c.logger.Info(ctx,"attempting to delete prebuild",slog.F("orphan",mode.String()),`
	`743`	`+slog.F("name",workspace.Name),slog.F("workspace_id",workspaceID.String()),slog.F("preset_id",presetID.String()))`
`733`	`744`
`734`	`745`	`returnc.provision(ctx,db,workspaceID,template,presetID,`
`735`	`746`	`database.WorkspaceTransitionDelete,workspace,mode)`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -204,6 +204,9 @@ func TestPrebuildReconciliation(t *testing.T) {`
`204`	`204`	`templateDeleted: []bool{false},`
`205`	`205`	`},`
`206`	`206`	`{`
	`207`	`+// TODO(ssncferreira): Investigate why the GetRunningPrebuiltWorkspaces query is returning 0 rows.`
	`208`	`+// When a template version is inactive (templateVersionActive = false), any prebuilds in the`
	`209`	`+// database.ProvisionerJobStatusRunning state should be deleted.`
`207`	`210`	`name:"never attempt to interfere with prebuilds from an active template version",`
`208`	`211`	`// The workspace builder does not allow scheduling a new build if there is already a build`
`209`	`212`	`// pending, running, or canceling. As such, we should never attempt to start, stop or delete`

Comments

(0)