fix(coderd): make activitybump aware of default template ttl #10253
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. Co-Authored-By: Dean Sheather <dean@deansheather.com>
johnstcn
added a commit
that referenced
this pull request
Oct 13, 2023
These changes have been broken out to a separate PR: #10253 Removing from this PR
mafredri
approved these changes
Oct 13, 2023
| CASE | ||
| WHEN templates.allow_user_autostop | ||
| THEN (workspaces.ttl / 1000 / 1000 / 1000 || ' seconds')::interval | ||
| ELSE (templates.default_ttl / 1000 / 1000 / 1000 || ' seconds')::interval |
There was a problem hiding this comment.
Perhaps I'm missing some context, but is the workspace.ttl the same as this setting?
If yes, that's IMO quite different from the template one:
In the screenshots, the workspace autostop does not IMO translate to a TTL and would produce unexpected results given this query logic. But as I said, I may be missing context and perhaps this is hat Deans PR is about (I haven't looked at it).
There was a problem hiding this comment.
Yeah this makes more sense in the context of the original PR. I do agree that the current autostop/TTL behaviour has grown unwieldy though.
johnstcn
added a commit
that referenced
this pull request
Oct 13, 2023
These changes have been broken out to a separate PR: #10253 Removing from this PR
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.