Commit0497f8b

committed

fix: UpdatePrebuildProvisionerJobWithCancel to filter by non-active template version

1 parentdcb6de1 commit0497f8bCopy full SHA for 0497f8b

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 1 deletion

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

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -308,8 +308,11 @@ WHERE id IN (`
`308`	`308`	`SELECTpj.id`
`309`	`309`	`FROM provisioner_jobs pj`
`310`	`310`	`INNER JOIN workspace_prebuild_builds wpbONwpb.job_id=pj.id`
	`311`	`+INNER JOIN workspaces wONw.id=wpb.workspace_id`
	`312`	`+INNER JOIN templates tONt.id=w.template_id`
`311`	`313`	`WHERE`
`312`		`-wpb.template_version_preset_id= @preset_id`
	`314`	`+wpb.template_version_id!=t.active_version_id`
	`315`	`+ANDwpb.template_version_preset_id= @preset_id`
`313`	`316`	`-- Only considers initial builds, i.e. created by the reconciliation loop`
`314`	`317`	`ANDwpb.build_number=1`
`315`	`318`	`-- Only consider 'start' transitions (provisioning), not 'stop'/'delete' (deprovisioning)`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,9 @@ import (`
`8`	`8`
`9`	`9`	`"cdr.dev/slog"`
`10`	`10`
`11`		`-"github.com/coder/quartz"`
`12`		`-`
`13`	`11`	`"github.com/coder/coder/v2/coderd/database"`
`14`	`12`	`"github.com/coder/coder/v2/coderd/util/slice"`
	`13`	`+"github.com/coder/quartz"`
`15`	`14`	`)`
`16`	`15`
`17`	`16`	`// GlobalSnapshot represents a full point-in-time snapshot of state relating to prebuilds across all templates.`

Comments

(0)