Support flexible LCOW layer parsing and partitioned layers #1745
+226
−55
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
lcow-layers
branch
5 times, most recently
from
d9550e1 to
354d3fc
Compare
kevpar
force-pushed
the
lcow-layers
branch
2 times, most recently
from
cdc086a to
f13f4ac
Compare
katiewasnothere
approved these changes
Apr 28, 2023
kevpar
force-pushed
the
lcow-layers
branch
2 times, most recently
from
f0563c1 to
e01339a
Compare
anmaxvl
reviewed
May 4, 2023
anmaxvl
reviewed
May 4, 2023
Merged
anmaxvl
reviewed
May 8, 2023
anmaxvl
approved these changes
May 8, 2023
kevpar
force-pushed
the
lcow-layers
branch
3 times, most recently
from
fae0655 to
e425877
Compare
kevpar
force-pushed
the
lcow-layers
branch
4 times, most recently
from
f2274c6 to
0244f81
Compare
Previously, layer information for both Windows and Linux containers was passed throughout the shim through the OCI runtime spec's Windows.LayerFolders field. This was used to store the set of directories used for the layers, including the scratch. The exact semantics of what is expected in these directories differed between Windows and Linux. This approach worked okay, but had a few annoying limitations. For instance, there was no way to represent more complex layer data, such as a VHD path as well as a partition index on that VHD. This change removes the use of Windows.LayerFolders completely for Linux containers, and instead creates a new layers.LCOWLayers type that is used to represent Linux layer configuration. This new type is passed into hcsoci.CreateContainer, and from there is passed into layers.MountLCOWLayers where it is actually used to set up the filesystem for the container. The new layers.LCOWLayers type is currently quite simple, but having this as a proper Go type allows us a lot of flexibility in the future. We can add more fields on this struct, but we could also change out the nested LCOWLayer type for an interface, for instance, if we wanted to support new types of layers that have drastically different representation. This change does not aim to touch the way Windows container layers are handled, nor how the Windows UVM root filesystem is set up. These would be good things to improve in the future, but the Windows container layers are more complicated in how they are used, so this is left for future work. Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
Adds support for a new type of LCOW mount that can use individual disk partitions for each read-only layer. This change adds the work to parse the new layer type and pass it through the shim, as well as the support to the shim-side SCSI package to send the partition index in the guest request. This change does not add the GCS-side work to actually mount the specified partition. That will come in a future change. This change also does not handle formatting the scratch disk. It it desired to be able to format it on the fly when creating the container, but that will also come in a future change. Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
|
I bypassed branch protection on the merge since the latest push was just a simple rebase on top of |
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 6/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.
This PR increases the flexibility of how we handle LCOW layers. This gives us greater ability to represent layers differently. For example, this PR also adds a new
lcow-partitioned-layertype which consists of a VHD path and a partition index on that VHD for each read-only layer.Please see individual commits for details.