Safe per tenant overrides loading #4421
Merged
Conversation
This file contains 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
dannykopping
approved these changes
Oct 7, 2021
|
Merging for now since I'm in the same space and want to avoid a conflict headache. Will make the suggested change if you agree. |
dannykopping
pushed a commit
that referenced
this pull request
Oct 8, 2021
* safe per tenant overrides loading * exports submap for OverwriteMarshalingStringMap
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Historically, the
Limitsused to use pass-by-value semantics to clone themselves during per tenant overrides loading. This worked well when theLimitsstruct had no reference fields (pointers, slices, maps). Adding them, notablyruler_remote_write_headers,ruler_remote_write_relabel_configs, andretention_streamintroduced some mutability bugs. Notably, this allowed loading per tenant overrides to mutate the global defaults, which would then be used in subsequent tenant overrides creation. This PR fixes this loophole by introducing a marshaling cycle as a cloning hack.