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

fix(blooms): Improve error wrap to make ignoreNotFound work when fetching blocks #13656

Merged
merged 1 commit into from
Jul 25, 2024

Conversation

honganan
Copy link
Contributor

What this PR does / why we need it:
Fix an issue where the options.ignoreNotFound of the fetcher is not effective.

The root cause of this issue is that the error returned by fmt.Errorf() in BloomClient loses the underlying cause. As a result, S3ObjectClient.IsObjectNotFoundErr() fails to determine if the underlying cause of the returned error is of type awserr.Error.

https://github.com/grafana/loki/blob/2dfc13bb73c73c6c8cfb57c23ce832f902d8a43e/pkg/storage/chunk/client/aws/s3_storage_client.go#L498C1-L504C2

Which issue(s) this PR fixes:

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

@honganan honganan requested a review from a team as a code owner July 25, 2024 10:12
@honganan honganan changed the title fix(blooms) Improve error wrap to make ignoreNotFound work when fetching blocks fix(blooms): Improve error wrap to make ignoreNotFound work when fetching blocks Jul 25, 2024
Copy link
Contributor

@chaudum chaudum left a comment

Choose a reason for hiding this comment

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

Thanks, good catch!

@chaudum chaudum merged commit bd20171 into grafana:main Jul 25, 2024
63 checks passed
@honganan honganan deleted the fix-ignore-not-found branch July 26, 2024 02:07
benclive pushed a commit to cyriltovena/loki that referenced this pull request Jul 31, 2024
…hing blocks (grafana#13656)

Fix an issue where the `options.ignoreNotFound` of the fetcher is not effective. 

The root cause of this issue is that the error returned by `fmt.Errorf()` in `BloomClient` loses the underlying cause. As a result, `S3ObjectClient.IsObjectNotFoundErr()` fails to determine if the underlying cause of the returned error is of type `awserr.Error`.
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