fix(coderd): only allow untagged provisioners to pick up untagged jobs #12269
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
johnstcn
commented
Feb 22, 2024
Comment on lines
+348
to
+353
| { | ||
| name: "tagged provisioner and untagged job", | ||
| provisionerJobTags: map[string]string{"scope": "organization", "owner": ""}, | ||
| acquireJobTags: map[string]string{"scope": "organization", "owner": "", "foo": "bar"}, | ||
| expectAcquire: false, | ||
| }, |
There was a problem hiding this comment.
review: this is the behaviour that changes
mafredri
approved these changes
Feb 22, 2024
| AND nested.tags <@ @tags :: jsonb | ||
| AND CASE | ||
| -- Special case for untagged provisioners: only match untagged jobs. | ||
| WHEN nested.tags :: jsonb = '{"scope": "organization", "owner": ""}' :: jsonb |
There was a problem hiding this comment.
When we assign @ tags, will it always contain scope = organization when untagged and used live?
There was a problem hiding this comment.
We make sure to call provisionersdk.MutateTags before serializing tags, so it will always contain scope and owner keys.
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.
Alternative solution to #6442
Modifies the behaviour of
AcquireProvisionerJoband adds a special case for 'un-tagged' jobs such that they can only be picked up by 'un-tagged' provisioners.Also adds comprehensive test coverage for
AcquireJobgiven various combinations of tags.This solves the issue described in #6442 without the need for another configuration knob.
The approach in #12244 needs some additional supporting work and potentially some input from customers before we go ahead and build it properly.
This is a behavioural change for sure, but there doesn't seem to be any scenario in which the previous behaviour would be warranted.