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: move aside TSM file on errBlockRead #25899

Merged
merged 2 commits into from
Jan 22, 2025
Merged

Conversation

davidby-influx
Copy link
Contributor

The error type check for errBlockRead was incorrect,
and bad TSM files were not being moved aside when
that error was encountered. Use errors.Join,
errors.Is, and errors.As to correctly unwrap multiple
errors.

Closes #25838

(cherry picked from commit 8009704)

Closes #25840

davidby-influx and others added 2 commits January 22, 2025 11:09
The error type check for errBlockRead was incorrect,
and bad TSM files were not being moved aside when
that error was encountered. Use errors.Join,
errors.Is, and errors.As to correctly unwrap multiple
errors.

Closes #25838

(cherry picked from commit 8009704)

Closes #25840
Copy link

@devanbenz devanbenz left a comment

Choose a reason for hiding this comment

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

LGTM - compared with original and appears to be mostly clean except what you had stated in slack

had to modify the imports in the two test files.

@davidby-influx davidby-influx merged commit dd7b4ce into main-2.x Jan 22, 2025
25 checks passed
@davidby-influx davidby-influx deleted the DSB_rename_bad_tsm_2 branch January 22, 2025 22:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/tsm area/2.x OSS 2.0 related issues and PRs kind/bug team/edge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

block read error should move aside bad TSM file [port to main-2.x]
2 participants