Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[modules] pin version of memberlist #6413

Merged
merged 2 commits into from
Jun 17, 2022
Merged

[modules] pin version of memberlist #6413

merged 2 commits into from
Jun 17, 2022

Conversation

cstyan
Copy link
Contributor

@cstyan cstyan commented Jun 17, 2022

Use a replace directive to ensure we're using the same version of memberlist as mimir/dskit. The memberlist adjacent issues we have seen this week could be a result of using a new version of dskit but without the forked version of memberlist.

cc @JordanRushing @vlad-diachenko @owen-d @slim-bean

Signed-off-by: Callum Styan callumstyan@gmail.com

memberlist as mimir.

Signed-off-by: Callum Styan <callumstyan@gmail.com>
@cstyan cstyan requested a review from a team as a code owner June 17, 2022 00:11
Signed-off-by: Callum Styan <callumstyan@gmail.com>
@grafanabot
Copy link
Collaborator

./tools/diff_coverage.sh ../loki-main/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0%
+            querier	0%
+ querier/queryrange	0.1%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
+               loki	0%

Copy link
Collaborator

@slim-bean slim-bean left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@slim-bean slim-bean merged commit aa31b46 into grafana:main Jun 17, 2022
@grafanabot
Copy link
Collaborator

The backport to k102 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-6413-to-k102 origin/k102
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x aa31b46d26c0392cbb4bcbd5c0fc20870120bc79
# Push it to GitHub
git push --set-upstream origin backport-6413-to-k102
git switch main
# Remove the local backport branch
git branch -D backport-6413-to-k102

Then, create a pull request where the base branch is k102 and the compare/head branch is backport-6413-to-k102.

JordanRushing added a commit that referenced this pull request Jun 17, 2022
* Backport memberlist dependency version pin to k102

Signed-off-by: JordanRushing <rushing.jordan@gmail.com>

* Revert "Loki Prometheus mixin: templatize cluster label" (#6377)

* Revert "Loki Prometheus mixin: templatize cluster label (#6353)"

This reverts commit 459036f.

* Replace `loki-mixin` dependency to working commit.

Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>
(cherry picked from commit 666bac2)

Co-authored-by: Kaviraj Kanagaraj <kavirajkanagaraj@gmail.com>
grafanabot pushed a commit that referenced this pull request Jun 24, 2022
* Backport memberlist dependency version pin to k102

Signed-off-by: JordanRushing <rushing.jordan@gmail.com>

* Revert "Loki Prometheus mixin: templatize cluster label" (#6377)

* Revert "Loki Prometheus mixin: templatize cluster label (#6353)"

This reverts commit 459036f.

* Replace `loki-mixin` dependency to working commit.

Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>
(cherry picked from commit 666bac2)

Co-authored-by: Kaviraj Kanagaraj <kavirajkanagaraj@gmail.com>
(cherry picked from commit 372961d)
vlad-diachenko pushed a commit that referenced this pull request Jun 24, 2022
* Backport memberlist dependency version pin to k102

Signed-off-by: JordanRushing <rushing.jordan@gmail.com>

* Revert "Loki Prometheus mixin: templatize cluster label" (#6377)

* Revert "Loki Prometheus mixin: templatize cluster label (#6353)"

This reverts commit 459036f.

* Replace `loki-mixin` dependency to working commit.

Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>
(cherry picked from commit 666bac2)

Co-authored-by: Kaviraj Kanagaraj <kavirajkanagaraj@gmail.com>
(cherry picked from commit 372961d)

Co-authored-by: JordanRushing <rushing.jordan@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants