loki: Fix common config net interface name overwritten by ring common config #5888
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
|
Hey thanks for catching this, we noticed that this also happened for the replication factor so we're fixing this for the replication factor on another PR. |
DylanGuedes
reviewed
Apr 12, 2022
| r.Distributor.DistributorRing.InstanceAddr = r.Common.InstanceAddr | ||
| r.Ruler.Ring.InstanceAddr = r.Common.InstanceAddr | ||
| r.QueryScheduler.SchedulerRing.InstanceAddr = r.Common.InstanceAddr | ||
| if reflect.DeepEqual(r.Common.Ring.InstanceAddr, defaults.Common.Ring.InstanceAddr) { |
There was a problem hiding this comment.
hey this was really smart 😄
… config
In the case where `instance_interface_names` is declared in the common
configuration AND the common ring configuration is also present,
`instance_interface_names` from common configuration is overwritten by
default ring configuration for all ring components.
This commit fix this issue by overwriting common ring net interface
config IF it is deeply equal to the default one.
Example:
```
common:
instance_interface_names:
- interface
ring:
kvstore:
store: inmemory
```
Then,
```
Distributor.DistributorRing.InstanceInterfaceNames ==
defaults.Common.Ring.InstanceInterfaceNames
```
but should be
```
Distributor.DistributorRing.InstanceInterfaceNames == []string{"interface"}
```
Papawy
force-pushed
the
fix-common-config-if-overwritten
branch
from
4fc174c to
3dd80cc
Compare
|
|
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.
What this PR does / why we need it:
In the case where
instance_interface_namesis declared in the commonconfiguration AND the common ring configuration is also present,
instance_interface_namesfrom common configuration is overwritten bydefault ring configuration for all ring components.
This behavior is not the one described in documentation.
This commit fix this issue by overwriting common ring net interface
config IF it is deeply equal to the default one.
Example:
Then (example with Distributor configuration),
but should be
Which issue(s) this PR fixes:
None.
Special notes for your reviewer:
Checklist
CHANGELOG.mdabout the changes.