Replace internal thanos fork with latest thanos #3205
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
jesusvazquez
changed the title
jesusvazquez
force-pushed
the
jvp/replace-thanos-dependency
branch
3 times, most recently
from
3a250ad
to
afdb2e0
Compare
|
@jesusvazquez I moved this PR to draft because I want to get #2682 in first. @bboreham will try to rebase it soon. If there's any issue, we'll ask you if you could give an hand. |
|
@jesusvazquez We merged #2682. Is there anything else we want to get from this PR? If so, could you rebase it, please? |
Due to the out-of-order implementation and Mimir's dependency with Thanos's code, we had to fork thanos due to an interface change in the TSDB. Since out-of-order has been upstreamed to Prometheus and Thanos has already updated its dependency, we can now get rid of our internal fork usage. Please note that Thanos has extracted its objstore implementation to its own repository so we had to update a few references throughout the codebase. Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com>
Also replace PrometheusIssue5372Err with OutOfOrderLabelsErr due to thanos-io/thanos#5508 Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com>
Also replace CAS with CompareAndSwap
Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com>
jesusvazquez
force-pushed
the
jvp/replace-thanos-dependency
branch
from
0f5983c
to
16282ec
Compare
|
@pracucci Yes this PR removes the need of the grafana thanos fork. I just rebased and made sure CI was 🆗 Please review. |
pracucci
approved these changes
Oct 14, 2022
There was a problem hiding this comment.
Good job @jesusvazquez ! I reviewed the Mimir changes and Thanos one. I can't see any issue, so 👍
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.
Due to the out-of-order implementation and Mimir's dependency with Thanos's code, we had to fork thanos due to an interface change in the TSDB.
Since out-of-order has been upstreamed to Prometheus and Thanos has already updated its dependency, we can now get rid of our internal fork usage.
Please note that Thanos has extracted its objstore implementation to its own repository so we had to update a few references throughout the codebase.
Note: Before merge we need grafana/e2e#5 merged and update e2e commit dependency.