Specify progress type

Signed-off-by: Danny Kopping <danny@coder.com>
This commit is contained in:
Danny Kopping
2025-01-24 12:18:19 +00:00
parent 981f61e272
commit 815ecbc74b
3 changed files with 41 additions and 30 deletions

View File

@ -18,7 +18,7 @@ WITH
INNER JOIN template_version_preset_prebuilds tvpp ON tvpp.preset_id = tvp.id
WHERE t.id = @template_id::uuid
GROUP BY t.id, tv.id, tvpp.id),
prebuilds_in_progress AS (SELECT wpb.template_version_id, pj.id AS job_id, pj.type, pj.job_status
prebuilds_in_progress AS (SELECT wpb.template_version_id, pj.id AS job_id, pj.type, pj.job_status, wpb.transition
FROM workspace_prebuild_builds wpb
INNER JOIN workspace_latest_build wlb ON wpb.workspace_id = wlb.workspace_id
INNER JOIN provisioner_jobs pj ON wlb.job_id = pj.id
@ -26,12 +26,17 @@ WITH
('succeeded'::provisioner_job_status, 'canceled'::provisioner_job_status,
'failed'::provisioner_job_status))
SELECT t.template_id,
CAST(COUNT(p.id) AS INT) AS actual, -- running prebuilds for active version
CAST(MAX(CASE WHEN t.using_active_version THEN t.desired_instances ELSE 0 END) AS int) AS desired, -- we only care about the active version's desired instances
CAST(SUM(CASE WHEN t.using_active_version THEN 0 ELSE 1 END) AS INT) AS extraneous, -- running prebuilds for inactive version
CAST(COUNT(pip.template_version_id) AS INT) AS in_progress,
t.deleted,
t.deprecated
CAST(COUNT(p.id) AS INT) AS actual, -- running prebuilds for active version
CAST(MAX(CASE WHEN t.using_active_version THEN t.desired_instances ELSE 0 END) AS int) AS desired, -- we only care about the active version's desired instances
CAST(SUM(CASE WHEN t.using_active_version THEN 0 ELSE 1 END) AS INT) AS extraneous, -- running prebuilds for inactive version
CAST(SUM(CASE
WHEN pip.transition = 'start'::workspace_transition THEN 1
ELSE 0 END) AS INT) AS starting,
CAST(SUM(CASE
WHEN pip.transition = 'delete'::workspace_transition THEN 1
ELSE 0 END) AS INT) AS deleting,
t.deleted AS template_deleted,
t.deprecated AS template_deprecated
FROM templates_with_prebuilds t
LEFT JOIN running_prebuilds p ON p.template_version_id = t.template_version_id
LEFT JOIN prebuilds_in_progress pip ON pip.template_version_id = t.template_version_id