Upgraded Prometheus and Cortex dependencies #3382
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
Signed-off-by: Marco Pracucci <[email protected]>
bwplotka
approved these changes
Oct 30, 2020
Signed-off-by: Marco Pracucci <[email protected]>
Signed-off-by: Marco Pracucci <[email protected]>
|
Let me think about priv type problem 🤔 |
Signed-off-by: Marco Pracucci <[email protected]>
Signed-off-by: Marco Pracucci <[email protected]>
|
Double checked and this looks fair to me. I would use Prometheus tsdb multi error though everywhere, except where we assert error type. We should probably use local type for this to explicitness. We can fix later this readability suggestion 👍 LGTM |
Signed-off-by: Marco Pracucci <[email protected]>
Signed-off-by: Marco Pracucci <[email protected]>
Signed-off-by: Marco Pracucci <[email protected]>
Signed-off-by: Marco Pracucci <[email protected]>
Oghenebrume50
pushed a commit
to Oghenebrume50/thanos
that referenced
this pull request
Dec 7, 2020
* Upgraded Prometheus and Cortex dependencies Signed-off-by: Marco Pracucci <[email protected]> * Updated mod replace Signed-off-by: Marco Pracucci <[email protected]> * Fixed linter Signed-off-by: Marco Pracucci <[email protected]> * Use errutil.MultiError everywhere Signed-off-by: Marco Pracucci <[email protected]> * Small fixes Signed-off-by: Marco Pracucci <[email protected]> * Do not use Prometheus MultiError in cmd too Signed-off-by: Marco Pracucci <[email protected]> * Fixed linter Signed-off-by: Marco Pracucci <[email protected]> * Fixed dot in a comment Signed-off-by: Marco Pracucci <[email protected]> * Added copyight Signed-off-by: Marco Pracucci <[email protected]> Signed-off-by: Oghenebrume50 <[email protected]>
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.
Changes
We fixed a TSDB WAL corruption which we urgently need to backport to Cortex and deploy (we already got 2 incidents this week because of this).
Prometheus has recently done a refactoring of
MultiError, which introduced a circular breaking change in Cortex and Thanos. To solve this, I've internedMultiErrorinto Cortex first (cortexproject/cortex#3425) and in this PR I'm upgrading Cortex and Prometheus. Thanos does an use theMultiErrordata type assertion in compactor and receiver, but the data type is not exposed anymore, so to unblock this situation I've interned the previous version ofMultiErrorin Thanos, in order to gain some time to discuss how to better address it, while being able to rollout the WAL corruption fix to Cortex.Thoughts?
Verification
Existing tests.