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

store-gateway: fix stats recording in filtering...Iterator #4830

Merged
merged 4 commits into from
Apr 25, 2023

Conversation

dimitarvdimitrov
Copy link
Contributor

What this PR does

This is a follow-up of #4797. This code is panicking because stats are nil. I am planning to backport this to r235

Checklist

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

This code is panicking because stats is nil. I am planning to backport this to r235

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
@dimitarvdimitrov dimitarvdimitrov enabled auto-merge (squash) April 25, 2023 07:24
@dimitarvdimitrov dimitarvdimitrov merged commit 29a3fcc into main Apr 25, 2023
@dimitarvdimitrov dimitarvdimitrov deleted the dimitar/fix-panic-in-labelvalues branch April 25, 2023 07:42
@grafanabot
Copy link
Contributor

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

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

dimitarvdimitrov added a commit that referenced this pull request Apr 25, 2023
---------

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
(cherry picked from commit 29a3fcc)
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.

3 participants