kvm: fix RBD exclusive-lock leak that breaks revertSnapshot on Ceph - #2
Closed
calvix wants to merge 3 commits into
Closed
kvm: fix RBD exclusive-lock leak that breaks revertSnapshot on Ceph#2calvix wants to merge 3 commits into
calvix wants to merge 3 commits into
Conversation
added 2 commits
August 7, 2026 16:56
takeRbdVolumeSnapshotOfStoppedVm() called image.snapCreate(snapshotName)
twice. The first call creates the RBD snapshot, the second one always
throws RbdException ("Failed to create snapshot <uuid>") because the
snapshot already exists.
The duplicate is a merge artifact: 30d3066 ("Merge branch '4.20' into
4.22") resolved a conflict by keeping the call from both sides - each
parent had exactly one.
Because there was no finally block, that exception skipped rbd.close(image)
and r.ioCtxDestroy(io), so the agent kept the image open and held its RBD
exclusive-lock indefinitely. The exception is only logged, so the snapshot
job still reported success and the fault stayed invisible.
Consequences observed on a KVM + Ceph/RBD cluster:
- revertSnapshot fails with "com.ceph.rbd.RbdException: Failed to rollback
snapshot <uuid>". librbd returns EROFS because a live peer holds the
exclusive-lock; 'rbd snap rollback' only succeeds once that client dies
and librbd can break the lock, which makes the failure look intermittent.
- getRbdSnapshotSize() is never reached, so every snapshot is reported with
physical size 0 when snapshot.backup.to.secondary is false.
- The leaked watchers keep the image busy, so 'rbd rm' fails and the volume
cannot be expunged - it stays stuck in state Destroy.
Note the method also runs for RUNNING VMs: createSnapshot() branches on
"RUNNING && !primaryPool.isExternalSnapshot()", and RBD is an
external-snapshot pool, so every RBD volume snapshot took this path.
Remove the duplicated call and move the image/IO-context cleanup into a
finally block so the lock is released even if the snapshot itself fails.
…napshot createRBDvolumeFromRBDSnapshot() closed the source image, the cloned image and the RADOS IO context only on the success path, and called snapUnprotect() only there too. Two paths escaped that cleanup: - the early "Could not find snapshot ... on RBD" return, and - any RadosException/RbdException from clone(), resize() or flatten(), which is caught and turned into a null disk. Both leave the images open, so this client keeps the RBD exclusive-lock. That later makes 'rbd snap rollback' (revertSnapshot) fail with EROFS from another host, and keeps the image busy so 'rbd rm' cannot remove it - the volume then stays stuck in state Destroy. The failure paths after snapProtect() are worse: the snapshot stays protected, and a protected snapshot can be deleted neither on its own nor together with its volume. Move the cleanup into a finally block, tracking whether the snapshot was actually protected so it is unprotected exactly when it needs to be. Failures during cleanup are logged and never mask the original outcome; a failed snapUnprotect is logged at ERROR since it needs manual intervention. This is the same class of defect as the leak fixed in takeRbdVolumeSnapshotOfStoppedVm(); no behaviour changes on the success path.
calvix
force-pushed
the
fix/rbd-snapshot-exclusive-lock-leak
branch
from
August 7, 2026 15:00
bf94118 to
fd61c2a
Compare
Two tests around takeRbdVolumeSnapshotOfStoppedVm, using the MockedConstruction pattern already used in this test class (the Rbd instance is created inside the method under test, so it cannot be injected): - createsSnapshotExactlyOnce guards the duplicated snapCreate call from coming back, and checks the image and IO context are released. - releasesHandlesWhenSnapshotFails makes snapCreate throw and asserts the image is still closed and the IO context destroyed, so a future failure cannot leak the RBD exclusive-lock again. takeRbdVolumeSnapshotOfStoppedVm, radosConnect and getRbdSnapshotSize widened from private to protected so the test can stub the Ceph interactions.
Owner
Author
|
Superseded — reopening with corrected commit authorship. |
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.
Summary
On KVM + Ceph/RBD,
revertSnapshotfails intermittently with:The root cause is not in the revert path at all — it is a leaked RBD
exclusive-lockleft behind by snapshot creation.What is wrong
KVMStorageProcessor.takeRbdVolumeSnapshotOfStoppedVm()callsimage.snapCreate(snapshotName)twice:The duplicate is a merge artifact.
4.20grew asnapCreatenext to the newgetRbdSnapshotSize(),4.22already had one, and the merge kept both:4.19and4.20have one call;4.22andmainhave two.Because there is no
finally, the exception from the second call skipsrbd.close(image)/r.ioCtxDestroy(io), so the agent keeps the image openand holds its RBD
exclusive-lockindefinitely. The exception is only logged,so the snapshot job still reports success and nothing looks wrong.
Note this method runs for running VMs too —
createSnapshot()branches onRUNNING && !primaryPool.isExternalSnapshot(), and RBD is anexternal-snapshot pool, so every RBD volume snapshot takes this path.
Observed consequences
Reproduced on CloudStack 4.22 with KVM + Ceph/RBD primary storage:
revertSnapshotfails withEROFS. A live peer holds theexclusive-lock, so librbd refusessnap_rollback. It only succeeds oncethat client dies and librbd can break the lock — which is why the failure
looks intermittent (~50% in my testing). Removing the lock by hand makes the
very same rollback succeed immediately:
After clearing the lock, the CloudStack
revertSnapshotAPI job alsoreturns success.
Snapshots report
physicalsize: 0whensnapshot.backup.to.secondaryis
false, becausegetRbdSnapshotSize()is never reached.Volumes get stuck in state
Destroy. The leaked watchers keep the imagebusy,
rbd rmfails, and the volume can never be expunged.The agent log shows the swallowed exception on every snapshot:
<snap-uuid>there is exactly the snapshot the nextrevertSnapshotthenfailed to roll back.
The fix
Commit 1 —
takeRbdVolumeSnapshotOfStoppedVmimage.snapCreate(snapshotName);rbd.close(image)andr.ioCtxDestroy(io)into afinallyso theexclusive-lock is released even when the snapshot itself fails.
Commit 2 —
createRBDvolumeFromRBDSnapshot(same class of defect)This method released its handles only on the success path. Two paths escaped
cleanup: the early
Could not find snapshot ... on RBDreturn, and anyexception from
clone()/resize()/flatten()(caught and turned into anulldisk). Both leak the same lock. Worse, the failure paths aftersnapProtect()leave the snapshot protected, and a protected snapshot canbe deleted neither on its own nor with its volume.
Cleanup moved into a
finally, tracking whether the snapshot was actuallyprotected so
snapUnprotect()runs exactly when it should. Cleanup failuresare logged and never mask the original outcome; a failed
snapUnprotectislogged at
ERRORbecause it needs manual intervention.No behaviour change on the success path in either method.
Types of changes
How Has This Been Tested?
On a KVM + Ceph/RBD cluster (CloudStack 4.22.1.0, Ceph 20.2.2, single RBD pool,
snapshot.backup.to.secondarytested bothtrueandfalse):createSnapshoton a DATADISK, stop theVM,
revertSnapshot→RbdException: Failed to rollback snapshot.rollback target was never the problem:
rbd snap ls→505162dd-8fa5-4262-acfc-bce540cf36cd, the exact name passedto
snapRollBack.appears in
rbd status(live client) the revert fails; when it does not(dead client, librbd breaks the lock) it succeeds. Outcomes were predicted
from
rbd statusbefore each attempt.rbd snap rollbackand theCloudStack
revertSnapshotjob succeed (see output above).stack trace quoted above.
Not compile-tested locally — no Maven toolchain on the machine used for the
investigation — so CI is the first build of these commits.