Rework layer handling to return a ResourceCloser #1743
Merged
+295
−357
Conversation
This file contains 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
This was referenced Apr 23, 2023
kevpar
force-pushed
the
layers-rework
branch
3 times, most recently
from
0c6b861
to
e10b0ab
Compare
katiewasnothere
approved these changes
Apr 28, 2023
kevpar
force-pushed
the
layers-rework
branch
2 times, most recently
from
3a99332
to
50523d2
Compare
anmaxvl
approved these changes
May 3, 2023
Currently, the layers package relies on the caller of Mount*COWLayers to subsequently call NewImageLayers, which constructs a special ImageLayers object that can be used to later clean up the layer mounts. However, this requires the caller to know too much about the internals of the layer mounting process. A cleaner approach, which I take here, is to instead return a standard ResourceCloser from Mount*COWLayers which then knows how to clean up whatever mounts were done. I have also changed the layers code to use ResourceCloser in more places internally. There is a new check in resources_*cow.go, such that the layers closer is only stored if the container is not a hypervisor-isolated sandbox container. This duplicates the logic that was previously in (*ImageLayers).Release. Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
Merged
anmaxvl
pushed a commit
that referenced
this pull request
Oct 20, 2023
This PR updates our ADO fork to commits in hcsshim up to commit hash [7769a64](7769a64). This includes support for partitioned scsi devices and ensuring filesystem format for lcow scsi devices. Related work items: #1728, #1740, #1741, #1742, #1743, #1744, #1745, #1747, #1748, #1749, #1750, #1752, #1754, #1756, #1757, #1767, #1769, #1771, #1772, #1773, #1779
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.
This is commit 4/6 in a chain. Recommended to review in order. If reviewing a later PR in the chain, you can view individual commits to see just what that PR changes.
Currently, the layers package relies on the caller of Mount*COWLayers to
subsequently call NewImageLayers, which constructs a special ImageLayers
object that can be used to later clean up the layer mounts. However,
this requires the caller to know too much about the internals of the
layer mounting process.
A cleaner approach, which I take here, is to instead return a standard
ResourceCloser from Mount*COWLayers which then knows how to clean up
whatever mounts were done. I have also changed the layers code to use
ResourceCloser in more places internally.
There is a new check in resources_*cow.go, such that the layers closer
is only stored if the container is not a hypervisor-isolated sandbox
container. This duplicates the logic that was previously in
(*ImageLayers).Release.