[docker-29.x backport] layer: Fix orphan creation in registerWithDescriptor #51703
Conversation
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
Start the metadata transaction before creating the overlay2 directory. This ensures that if driver.Create() fails, we can properly cancel the transaction. Previously, if StartTransaction() failed after driver.Create() succeeded, the defer cleanup would not run (not registered yet), leaving an orphaned overlay2 directory. The fix reorders operations so that: 1. Transaction is started first (no filesystem changes yet) 2. Overlay2 directory is created second (transaction ready for cleanup) 3. Defer is registered after both succeed (tx is guaranteed non-nil) If driver.Create() fails, the transaction is explicitly cancelled before returning. The nil check for tx in the defer is no longer needed since tx is guaranteed to exist when the defer runs. Related to moby#45939 Signed-off-by: Jan Scheffler <jan.scheffler@qodev.ai> (cherry picked from commit 7000454) Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
vvoland
added
area/storage/overlay
status/2-code-review
impact/changelog
area/daemon
Contributor
Author
|
@thaJeztah You good with backporting this to 29.1.3? |
Member
|
Yup, seems sane to me; it's effectively just swapping the order to allow an early return. |
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.
- What I did
Start the metadata transaction before creating the overlay2 directory. This ensures that if
driver.Create()fails, we can properly cancel the transaction. Previously, ifStartTransaction()failed afterdriver.Create()succeeded, the defer cleanup would not run (not registered yet), leaving an orphaned overlay2 directory.Related to #45939
- How I did it
The fix reorders operations so that:
If
driver.Create()fails, the transaction is explicitly cancelled before returning. The nil check for tx in the defer is no longer needed since tx is guaranteed to exist when the defer runs.- How to verify it
go test ./daemon/internal/layer/...