Skip to content

Commit 1cce55d

Browse files
authored
Merge pull request moby#51714 from jschfflr/45939-rw-layer-cleanup
layer: Clean up RW layer if mount metadata save fails
2 parents b2d84a3 + d7a6250 commit 1cce55d

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

daemon/internal/layer/layer_store.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,9 @@ func (ls *layerStore) CreateRWLayer(name string, parent ChainID, opts *CreateRWL
535535
return nil, err
536536
}
537537
if err := ls.saveMount(m); err != nil {
538+
if removeErr := ls.driver.Remove(m.mountID); removeErr != nil {
539+
log.G(context.TODO()).WithFields(log.Fields{"mount-id": m.mountID, "error": removeErr}).Error("Failed to clean up RW layer after mount save failure")
540+
}
538541
return nil, err
539542
}
540543

0 commit comments

Comments
 (0)