-
Notifications
You must be signed in to change notification settings - Fork 529
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
Update mimir-prometheus to incl MemPostings improvements #8327
Update mimir-prometheus to incl MemPostings improvements #8327
Conversation
Updating to bring changes from: - prometheus/prometheus#13286 - prometheus/prometheus#14286 Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
e11be5b
to
b437df6
Compare
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-8327-to-r292 origin/r292
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 6cc0bf7bcb7c6909501a5ec5958ec3cdc0f29dd6
# Push it to GitHub
git push --set-upstream origin backport-8327-to-r292
git switch main
# Remove the local backport branch
git branch -D backport-8327-to-r292 Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-8327-to-r291 origin/r291
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 6cc0bf7bcb7c6909501a5ec5958ec3cdc0f29dd6
# Push it to GitHub
git push --set-upstream origin backport-8327-to-r291
git switch main
# Remove the local backport branch
git branch -D backport-8327-to-r291 Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-8327-to-r293 origin/r293
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 6cc0bf7bcb7c6909501a5ec5958ec3cdc0f29dd6
# Push it to GitHub
git push --set-upstream origin backport-8327-to-r293
git switch main
# Remove the local backport branch
git branch -D backport-8327-to-r293 Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-8327-to-r294 origin/r294
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 6cc0bf7bcb7c6909501a5ec5958ec3cdc0f29dd6
# Push it to GitHub
git push --set-upstream origin backport-8327-to-r294
git switch main
# Remove the local backport branch
git branch -D backport-8327-to-r294 Then, create a pull request where the |
I will not merge this backports, I'll create |
What this PR does
Updates mimir-promteheus to bring changes from:
MemPostings.Delete()
: reduce locking/unlocking prometheus/prometheus#13286MemPostings.PostingsForLabelMatching()
: don't hold the mutex while matching prometheus/prometheus#14286Which issue(s) this PR fixes or relates to
Fixes an internal issue.
Checklist
CHANGELOG.md
updated - the order of entries should be[CHANGE]
,[FEATURE]
,[ENHANCEMENT]
,[BUGFIX]
.about-versioning.md
updated with experimental features.