-
Notifications
You must be signed in to change notification settings - Fork 462
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
Improve memory limit on the in-memory cache used for regular expression matchers #4751
Conversation
…on matchers Signed-off-by: Marco Pracucci <marco@pracucci.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. But the CI seems to complain about leaking goroutines.
Signed-off-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>
Right. This should address it: c5d2f54 |
Signed-off-by: Marco Pracucci <marco@pracucci.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 label matchers not comparable with reflect.DeepEqual() so we're going to | ||
// compare their string representation. | ||
require.Len(t, decodedMatchers, len(matchers)) | ||
for i := 0; i < len(matchers); i++ { |
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.
nit
for i := 0; i < len(matchers); i++ { | |
for i := range matchers { |
but if you don't want to wait for CI again, feel free to disregard this
…on matchers (#4751) * Improve memory limit on the in-memory cache used for regular expression matchers Signed-off-by: Marco Pracucci <marco@pracucci.com> * Fixed CHANGELOG Signed-off-by: Marco Pracucci <marco@pracucci.com> * Ignore ristretto.Cache goroutines Signed-off-by: Marco Pracucci <marco@pracucci.com> * Fix unit tests Signed-off-by: Marco Pracucci <marco@pracucci.com> --------- Signed-off-by: Marco Pracucci <marco@pracucci.com>
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-4751-to-release-2.8 origin/release-2.8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 020e69d80bfd5ca5f6dfddc9fe341f7aa027f8c9
# Push it to GitHub
git push --set-upstream origin backport-4751-to-release-2.8
git switch main
# Remove the local backport branch
git branch -D backport-4751-to-release-2.8 Then, create a pull request where the |
…on matchers (#4751) * Improve memory limit on the in-memory cache used for regular expression matchers Signed-off-by: Marco Pracucci <marco@pracucci.com> * Fixed CHANGELOG Signed-off-by: Marco Pracucci <marco@pracucci.com> * Ignore ristretto.Cache goroutines Signed-off-by: Marco Pracucci <marco@pracucci.com> * Fix unit tests Signed-off-by: Marco Pracucci <marco@pracucci.com> --------- Signed-off-by: Marco Pracucci <marco@pracucci.com> (cherry picked from commit 020e69d)
…on matchers (#4751) * Improve memory limit on the in-memory cache used for regular expression matchers Signed-off-by: Marco Pracucci <marco@pracucci.com> * Fixed CHANGELOG Signed-off-by: Marco Pracucci <marco@pracucci.com> * Ignore ristretto.Cache goroutines Signed-off-by: Marco Pracucci <marco@pracucci.com> * Fix unit tests Signed-off-by: Marco Pracucci <marco@pracucci.com> --------- Signed-off-by: Marco Pracucci <marco@pracucci.com> (cherry picked from commit 020e69d)
…on matchers (#4751) (#4758) * Improve memory limit on the in-memory cache used for regular expression matchers Signed-off-by: Marco Pracucci <marco@pracucci.com> * Fixed CHANGELOG Signed-off-by: Marco Pracucci <marco@pracucci.com> * Ignore ristretto.Cache goroutines Signed-off-by: Marco Pracucci <marco@pracucci.com> * Fix unit tests Signed-off-by: Marco Pracucci <marco@pracucci.com> --------- Signed-off-by: Marco Pracucci <marco@pracucci.com> (cherry picked from commit 020e69d) Co-authored-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com> Co-authored-by: Jon Kartago Lamida <jon.lamida@grafana.com>
What this PR does
Updating Prometheus to get grafana/mimir-prometheus#482. This will have to be cherry-picked into 2.8 release.
Which issue(s) this PR fixes or relates to
N/A
Checklist
CHANGELOG.md
updated - the order of entries should be[CHANGE]
,[FEATURE]
,[ENHANCEMENT]
,[BUGFIX]