Skip to content

fix: coderd: decouple ttl and deadline #2282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jun 14, 2022
Merged

fix: coderd: decouple ttl and deadline #2282

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a19a0e9
fix: coderd: decouple ttl and deadline
johnstcn Jun 13, 2022
3999661
yarn lint
johnstcn Jun 13, 2022
f5ce8a3
update storybook
johnstcn Jun 13, 2022
987f785
fmt
johnstcn Jun 13, 2022
cd4dce3
fix ttl command
johnstcn Jun 14, 2022
91e3171
drive-by: default ttl to min(12 hours, template max) for new workspaces
johnstcn Jun 14, 2022
00ac2a2
fix: WorkspaceSchedule: show tz of schedule if available, default to …
johnstcn Jun 14, 2022
3faf3c8
cli: list: measure extension from provisioner job completed_at
johnstcn Jun 14, 2022
a763d2f
WorkspaceScheduleForm: fix "a few seconds after start"
johnstcn Jun 14, 2022
bbd8288
address PR comments
johnstcn Jun 14, 2022
feef823
Merge remote-tracking branch 'origin/main' into cj/2229/decouple-ws-d…
johnstcn Jun 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
drive-by: default ttl to min(12 hours, template max) for new workspaces
  • Loading branch information
@johnstcn
johnstcn committed Jun 14, 2022
commit 91e3171d1bdec966845f5345aa50ec302027ef81
11 changes: 9 additions & 2 deletions coderd/workspaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,8 +319,8 @@ func (api *API) postWorkspacesByOrganization(rw http.ResponseWriter, r *http.Req
}

if !dbTTL.Valid {
// Default to template maximum when creating a new workspace
dbTTL = sql.NullInt64{Valid: true, Int64: template.MaxTtl}
// Default to min(12 hours, template maximum). Just defaulting to template maximum can be surprising.
dbTTL = sql.NullInt64{Valid: true, Int64: min(template.MaxTtl, int64(12*time.Hour))}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

review: as the default max_ttl for templates is 168 hours, setting the workspace default to something hopefully more reasonable on a day-to-day basis. Folks can still change this if they want!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion (non-blocking): Should we make this a constant somewhere, or perhaps define in the db? It could be hard to determine where this limit is coming from.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Constant sounds good!

}

workspace, err := api.Database.GetWorkspaceByOwnerIDAndName(r.Context(), database.GetWorkspaceByOwnerIDAndNameParams{
Expand Down Expand Up @@ -940,3 +940,10 @@ func validWorkspaceSchedule(s *string, min time.Duration) (sql.NullString, error
String: *s,
}, nil
}

func min(x, y int64) int64 {
if x < y {
return x
}
return y
}