[Backport 3.6.x] fix: prevent silent volume migration in ControllerPublishVolume#144
Merged
mweibel merged 1 commit intorelease/3.6from Mar 27, 2026
Merged
[Backport 3.6.x] fix: prevent silent volume migration in ControllerPublishVolume#144mweibel merged 1 commit intorelease/3.6from
mweibel merged 1 commit intorelease/3.6from
Conversation
mweibel
force-pushed
the
fix/multiattach-3.6
branch
from
2c000be to
300ee25
Compare
ControllerPublishVolume previously overwrote ServerUUIDs unconditionally, silently moving an attached volume to a new node. When the subsequent ControllerUnpublishVolume for the old node found the volume no longer there, it returned success without detaching, leaving a stale VolumeAttachment that caused hours-long Multi-Attach deadlocks in production. Fix: fetch the volume before attaching. If it is attached to a different node return FailedPrecondition so the external-attacher waits for the old detach to complete first. If already attached to the requested node return idempotent success. Also add volume locks (TryAcquire/Release, already used on the node side) to DeleteVolume, ControllerPublishVolume, ControllerUnpublishVolume, and ControllerExpandVolume to prevent TOCTOU races between concurrent mutating operations on the same volume. Backport of f7ffaa4 to release/3.6.x.
mweibel
force-pushed
the
fix/multiattach-3.6
branch
from
300ee25 to
415e013
Compare
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
1 participant
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.
ControllerPublishVolume previously overwrote ServerUUIDs unconditionally, silently moving an attached volume to a new node. When the subsequent ControllerUnpublishVolume for the old node found the volume no longer there, it returned success without detaching, leaving a stale VolumeAttachment that caused hours-long Multi-Attach deadlocks in production.
Fix: fetch the volume before attaching. If it is attached to a different node return FailedPrecondition so the external-attacher waits for the old detach to complete first. If already attached to the requested node return idempotent success.
Also add volume locks (TryAcquire/Release, already used on the node side) to DeleteVolume, ControllerPublishVolume, ControllerUnpublishVolume, and ControllerExpandVolume to prevent TOCTOU races between concurrent mutating operations on the same volume.
Backport of f7ffaa4 to release/3.6.x.
See #143