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

Update mimir-prometheus to 20230907080713-7c067467a0fd #5957

Merged
merged 2 commits into from
Sep 7, 2023
Merged

Conversation

krajorama
Copy link
Contributor

@krajorama krajorama commented Sep 7, 2023

What this PR does

Get the fix grafana/mimir-prometheus#528

We have experienced spurious errors during head compaction on the labelvalues endpoint. This fixes the errors by
handling the case where 1) postings are read 2) head compaction clears series 3) stale postings are used to look up series.

Which issue(s) this PR fixes or relates to

Fixes N/A .

Checklist

  • N/A Tests updated
  • N/A Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

Get the fix grafana/mimir-prometheus#528

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
@krajorama krajorama requested review from grafanabot and a team as code owners September 7, 2023 08:17
Copy link
Member

@pstibrany pstibrany left a comment

Choose a reason for hiding this comment

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

lgtm. I'd suggest adding bugfix changelog entry.

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
@krajorama krajorama enabled auto-merge (squash) September 7, 2023 08:27
Copy link
Member

@pstibrany pstibrany left a comment

Choose a reason for hiding this comment

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

Thanks!

@krajorama krajorama merged commit da6ebc8 into main Sep 7, 2023
28 checks passed
@krajorama krajorama deleted the krajo/fix branch September 7, 2023 08:50
grafanabot pushed a commit that referenced this pull request Sep 7, 2023
* Update mimir-prometheus to 20230907080713-7c067467a0fd

Get the fix grafana/mimir-prometheus#528

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
(cherry picked from commit da6ebc8)
krajorama added a commit that referenced this pull request Sep 7, 2023
* Update mimir-prometheus to 20230907080713-7c067467a0fd

Get the fix grafana/mimir-prometheus#528

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
(cherry picked from commit da6ebc8)

Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com>
@grafanabot
Copy link
Contributor

The backport to release-2.10 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-5957-to-release-2.10 origin/release-2.10
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x da6ebc8d94f7b85462cfb8a03c1904b558f48668
# Push it to GitHub
git push --set-upstream origin backport-5957-to-release-2.10
git switch main
# Remove the local backport branch
git branch -D backport-5957-to-release-2.10

Then, create a pull request where the base branch is release-2.10 and the compare/head branch is backport-5957-to-release-2.10.

colega pushed a commit that referenced this pull request Sep 11, 2023
* Update mimir-prometheus to 20230907080713-7c067467a0fd

Get the fix grafana/mimir-prometheus#528

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
(cherry picked from commit da6ebc8)
colega added a commit that referenced this pull request Sep 11, 2023
* Update mimir-prometheus to 20230907080713-7c067467a0fd

Get the fix grafana/mimir-prometheus#528

Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
(cherry picked from commit da6ebc8)

Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants