kvm: extract RBD snapshot unprotect into a helper method - #6
Merged
calvix merged 1 commit intoAug 11, 2026
Merged
Conversation
Follow-up to the teardown helpers: the snapUnprotect block in the finally clause of createRBDvolumeFromRBDSnapshot moves into a never-throwing unprotectRbdSnapshot helper, so the finally clause is now free of inline try-catch constructions entirely. No behavior change.
calvix
merged commit Aug 11, 2026
ecb0c7a
into
fix/rbd-snapshot-exclusive-lock-leak
14 checks passed
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
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.
Follow-up to the reviewer's "I would personally still give the snapprotect block a separate method as well":
The
snapUnprotectblock in thefinallyclause ofcreateRBDvolumeFromRBDSnapshotmoves into a never-throwingunprotectRbdSnapshot(image, snapshotName, snapProtected)helper next tocloseRbdImage/destroyRadosIoCtx. ThesnapProtectedguard moves inside the helper, mirroring how the other helpers guard on null — the finally clause is now four plain helper calls with no inline try-catch at all:Keeps ERROR severity and the operator-facing message about the snapshot/volume being undeletable until resolved.
No behavior change. All 39 tests in
KVMStorageProcessorTestpass.