Skip to content

Conversation

dimitarvdimitrov
Copy link
Contributor

the multierror was hiding some errors in Mimir. I also added unit tests because I had them handy from a similar change I and @duricanikolic did in grafana/dskit#522 and grafana/dskit#254 some time ago.

the multierror was hiding some errors in Mimir. I also added unit tests because I had them handy from a similar change I and yuri did in XXX and some time ago

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>
Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
Copy link
Contributor

@aknuds1 aknuds1 left a comment

Choose a reason for hiding this comment

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

LGTM save for some nits.

@mmorel-35
Copy link
Contributor

mmorel-35 commented May 3, 2025

Would it help solve this ?

prometheus/.golangci.yml

Lines 69 to 71 in e7e3ab2

- linters:
- errorlint
path: "tsdb/head_wal.go"

@aknuds1
Copy link
Contributor

aknuds1 commented May 4, 2025

@mmorel-35 I'm really not sure. How would the two be connected? @dimitarvdimitrov Would you know?

@mmorel-35
Copy link
Contributor

mmorel-35 commented May 4, 2025

When I enabled errorlint on the code base, I got stuck on that part , I'm not sure but it might be due to the fact that MultiError was not supporting errors.As correctly. It's the occasion to check on that.

@mmorel-35
Copy link
Contributor

This is related to errors.As on wlog.CorruptionErr sorry for the trouble

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
@dimitarvdimitrov dimitarvdimitrov requested a review from aknuds1 May 6, 2025 13:30
@aknuds1 aknuds1 enabled auto-merge (squash) May 6, 2025 13:33
@aknuds1 aknuds1 merged commit 7e49b91 into prometheus:main May 6, 2025
27 checks passed
Shuimo03 pushed a commit to Shuimo03/prometheus that referenced this pull request May 8, 2025
* tsdb/errors.MultiError: implement Unwrap

the multierror was hiding some errors in Mimir. I also added unit tests because I had them handy from a similar change I and yuri did in XXX and some time ago

---------

Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Signed-off-by: WuLiang <wu1998102@gmail.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.

3 participants