storage: close pebble iter gracefully when NewPebbleSSTIterator fails#84003
Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom Jul 7, 2022
Merged
Conversation
Currently, if `pebble.NewExternalIter` sets pebbleIterator.inuse to True, but then fails, the subsequent `pebbleIterator.destroy()` will panic unecessarily, since the caller of `pebble.NewExternalIter` is not actually using the iter. This bug causes TestBackupRestoreChecksum to flake in cockroachdb#83984. To fix, this patch uses pebble.Close() to gracefully close the pebbleIterator if `pebble.NewExternalIter` fails. Release Note: None
Member
|
This change is |
erikgrinaker
approved these changes
Jul 7, 2022
Contributor
erikgrinaker
left a comment
There was a problem hiding this comment.
Oops, thanks for fixing!
Collaborator
Author
|
bors r=erikgrinaker |
Contributor
|
Build succeeded: |
30 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Currently, if
pebble.NewExternalItersets pebbleIterator.inuse to True, butthen fails, the subsequent
pebbleIterator.destroy()will panic unecessarily,since the caller of
pebble.NewExternalIteris not actually using the iter.This bug causes TestBackupRestoreChecksum to flake in #83984.
To fix, this patch uses pebble.Close() to gracefully close the pebbleIterator
if
pebble.NewExternalIterfails.Release Note: None