support az aware hashring and multiple sts in one hashring #129
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
christopherzli
changed the title
christopherzli
changed the title
christopherzli
commented
Jan 24, 2024
| @@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT | |||
|
|
|||
| go 1.17 | |||
|
|
|||
| require github.com/golangci/golangci-lint v1.45.2 // cmd/golangci-lint | |||
There was a problem hiding this comment.
needs to update golangci-lint version and bingo version to work with golang v1.21
| @@ -19,6 +19,11 @@ linters: | |||
| - varnamelen | |||
| - paralleltest | |||
| - cyclop | |||
| - exhaustruct | |||
There was a problem hiding this comment.
temp disable some newly added lint checks, feel free to resolve on these lint issues
| k8s.io/apimachinery v0.26.1 | ||
| k8s.io/client-go v0.26.1 | ||
| github.com/prometheus/client_golang v1.17.0 | ||
| github.com/thanos-io/thanos v0.33.0 |
There was a problem hiding this comment.
accomodate thanos newer version
| return p.listsMetric | ||
| } | ||
|
|
||
| func (p prometheusReflectorMetrics) NewListDurationMetric(name string) cache.SummaryMetric { | ||
| func (p prometheusReflectorMetrics) NewListDurationMetric(_ string) cache.SummaryMetric { |
There was a problem hiding this comment.
fix lint issues
| @@ -283,7 +289,7 @@ func newReflectorMetrics(reg *prometheus.Registry) prometheusReflectorMetrics { | |||
|
|
|||
| const labelParts = 2 | |||
|
|
|||
| func splitLabel(in string) (key, value string) { | |||
| func splitLabel(in string) (string, string) { | |||
There was a problem hiding this comment.
fix nonamed return values
| statefulsets[hashring] = []*appsv1.StatefulSet{} | ||
| } | ||
| // Append the new value to the slice associated with the hashring key | ||
| statefulsets[hashring] = append(statefulsets[hashring], sts.DeepCopy()) |
There was a problem hiding this comment.
support multiple sts placed in a single hashring in our setup
| @@ -679,6 +686,40 @@ func (c *controller) populate(ctx context.Context, hashrings []receive.HashringC | |||
| } | |||
| } | |||
|
|
|||
| func (c *controller) populateEndpoint(sts *appsv1.StatefulSet, podIndex int, err error, pod *corev1.Pod) *receive.Endpoint { | |||
There was a problem hiding this comment.
extracted this function to reduce cognitive complexity required by lint
|
tested it worked when scale up 1 node, the configmap updates the configmap too: |
christopherzli
added a commit
to databricks/thanos-receive-controller
that referenced
this pull request
Jan 25, 2024
## What changes are proposed in this pull request? 1. Support az aware hashring in Thanos v0.32+ https://thanos.io/tip/components/receive.md/#az-aware-ketama-hashring-experimental, 2. also supported multiple sts in one hashring config 3. fix lint and go dependency issues OSS PR: observatorium#129 ## How is this tested? main_test.go, Make thanos-receive-controller pending test in deployment
philipgough
approved these changes
May 16, 2024
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 changes are proposed in this pull request?
https://thanos.io/tip/components/receive.md/#az-aware-ketama-hashring-experimental
How is this tested?
main_test.go,
Make thanos-receive-controller
#127