mirror of
https://github.com/coder/coder.git
synced 2025-07-03 16:13:58 +00:00
fix(coderd): make activitybump aware of default template ttl (#10253)
The refactored ActivityBump query did not take into account the template-level TTL, resulting in potentially incorrect bump amounts for workspaces that have both a user-defined and template- defined TTL that differ. This change is ported over from PR#10035 to reduce the overall size of that PR. Also includes a drive-by unit test in autobuild for checking template autostop/TTL. Co-authored-by: Dean Sheather <dean@deansheather.com>
This commit is contained in:
@ -814,8 +814,26 @@ func (q *FakeQuerier) ActivityBumpWorkspace(ctx context.Context, workspaceID uui
|
||||
if q.workspaceBuilds[i].Deadline.IsZero() {
|
||||
return nil
|
||||
}
|
||||
|
||||
// Check the template default TTL.
|
||||
template, err := q.getTemplateByIDNoLock(ctx, workspace.TemplateID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var ttlDur time.Duration
|
||||
if workspace.Ttl.Valid {
|
||||
ttlDur = time.Duration(workspace.Ttl.Int64)
|
||||
}
|
||||
if !template.AllowUserAutostop {
|
||||
ttlDur = time.Duration(template.DefaultTTL)
|
||||
}
|
||||
if ttlDur <= 0 {
|
||||
// There's no TTL set anymore, so we don't know the bump duration.
|
||||
return nil
|
||||
}
|
||||
|
||||
// Only bump if 5% of the deadline has passed.
|
||||
ttlDur := time.Duration(workspace.Ttl.Int64)
|
||||
ttlDur95 := ttlDur - (ttlDur / 20)
|
||||
minBumpDeadline := q.workspaceBuilds[i].Deadline.Add(-ttlDur95)
|
||||
if now.Before(minBumpDeadline) {
|
||||
|
@ -28,6 +28,7 @@ type sqlcQuerier interface {
|
||||
// as the TTL wraps. For example, if I set the TTL to 12 hours, sign off
|
||||
// work at midnight, come back at 10am, I would want another full day
|
||||
// of uptime.
|
||||
// We only bump if the raw interval is positive and non-zero.
|
||||
// We only bump if workspace shutdown is manual.
|
||||
// We only bump when 5% of the deadline has elapsed.
|
||||
ActivityBumpWorkspace(ctx context.Context, workspaceID uuid.UUID) error
|
||||
|
@ -23,12 +23,20 @@ WITH latest AS (
|
||||
workspace_builds.max_deadline::timestamp with time zone AS build_max_deadline,
|
||||
workspace_builds.transition AS build_transition,
|
||||
provisioner_jobs.completed_at::timestamp with time zone AS job_completed_at,
|
||||
(workspaces.ttl / 1000 / 1000 / 1000 || ' seconds')::interval AS ttl_interval
|
||||
(
|
||||
CASE
|
||||
WHEN templates.allow_user_autostop
|
||||
THEN (workspaces.ttl / 1000 / 1000 / 1000 || ' seconds')::interval
|
||||
ELSE (templates.default_ttl / 1000 / 1000 / 1000 || ' seconds')::interval
|
||||
END
|
||||
) AS ttl_interval
|
||||
FROM workspace_builds
|
||||
JOIN provisioner_jobs
|
||||
ON provisioner_jobs.id = workspace_builds.job_id
|
||||
JOIN workspaces
|
||||
ON workspaces.id = workspace_builds.workspace_id
|
||||
JOIN templates
|
||||
ON templates.id = workspaces.template_id
|
||||
WHERE workspace_builds.workspace_id = $1::uuid
|
||||
ORDER BY workspace_builds.build_number DESC
|
||||
LIMIT 1
|
||||
@ -46,6 +54,7 @@ FROM latest l
|
||||
WHERE wb.id = l.build_id
|
||||
AND l.job_completed_at IS NOT NULL
|
||||
AND l.build_transition = 'start'
|
||||
AND l.ttl_interval > '0 seconds'::interval
|
||||
AND l.build_deadline != '0001-01-01 00:00:00+00'
|
||||
AND l.build_deadline - (l.ttl_interval * 0.95) < NOW()
|
||||
`
|
||||
@ -54,6 +63,7 @@ AND l.build_deadline - (l.ttl_interval * 0.95) < NOW()
|
||||
// as the TTL wraps. For example, if I set the TTL to 12 hours, sign off
|
||||
// work at midnight, come back at 10am, I would want another full day
|
||||
// of uptime.
|
||||
// We only bump if the raw interval is positive and non-zero.
|
||||
// We only bump if workspace shutdown is manual.
|
||||
// We only bump when 5% of the deadline has elapsed.
|
||||
func (q *sqlQuerier) ActivityBumpWorkspace(ctx context.Context, workspaceID uuid.UUID) error {
|
||||
|
@ -10,12 +10,20 @@ WITH latest AS (
|
||||
workspace_builds.max_deadline::timestamp with time zone AS build_max_deadline,
|
||||
workspace_builds.transition AS build_transition,
|
||||
provisioner_jobs.completed_at::timestamp with time zone AS job_completed_at,
|
||||
(workspaces.ttl / 1000 / 1000 / 1000 || ' seconds')::interval AS ttl_interval
|
||||
(
|
||||
CASE
|
||||
WHEN templates.allow_user_autostop
|
||||
THEN (workspaces.ttl / 1000 / 1000 / 1000 || ' seconds')::interval
|
||||
ELSE (templates.default_ttl / 1000 / 1000 / 1000 || ' seconds')::interval
|
||||
END
|
||||
) AS ttl_interval
|
||||
FROM workspace_builds
|
||||
JOIN provisioner_jobs
|
||||
ON provisioner_jobs.id = workspace_builds.job_id
|
||||
JOIN workspaces
|
||||
ON workspaces.id = workspace_builds.workspace_id
|
||||
JOIN templates
|
||||
ON templates.id = workspaces.template_id
|
||||
WHERE workspace_builds.workspace_id = @workspace_id::uuid
|
||||
ORDER BY workspace_builds.build_number DESC
|
||||
LIMIT 1
|
||||
@ -33,6 +41,8 @@ FROM latest l
|
||||
WHERE wb.id = l.build_id
|
||||
AND l.job_completed_at IS NOT NULL
|
||||
AND l.build_transition = 'start'
|
||||
-- We only bump if the raw interval is positive and non-zero.
|
||||
AND l.ttl_interval > '0 seconds'::interval
|
||||
-- We only bump if workspace shutdown is manual.
|
||||
AND l.build_deadline != '0001-01-01 00:00:00+00'
|
||||
-- We only bump when 5% of the deadline has elapsed.
|
||||
|
Reference in New Issue
Block a user