Support for Block CIMs #2261
Open
Support for Block CIMs #2261
+1,669
−274
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
Currently we have a map which maintains a mapping of CIM & containerd ID to the volume at which a CIM is mounted for the given container. This was required before the layer refactoring work when we needed to get the volume path from the layer cim path. However, this isn't needed anymore. As of now, this map doesn't provide much value and makes the code a bit complicated. Moreover, we will need to rewrite some of this code anyway when we do the work required for handling `shim delete` cleanups properly (containerd/containerd#9727). Signed-off-by: Amit Barve <ambarve@microsoft.com>
ambarve
force-pushed
the
blocked_cim_import
branch
3 times, most recently
from
ad3aed4
to
2afb976
Compare
kevpar
reviewed
Sep 16, 2024
kevpar
reviewed
Sep 16, 2024
pkg/cimfs/cimfs.go
Outdated
|
|
||
| // IsBlockedCimSupported returns true if block formatted CIMs (i.e block device CIM & | ||
| // single file CIM) are supported on the current OS build. | ||
| func IsBlockedCimSupported() bool { |
There was a problem hiding this comment.
Can we be consistent about if cim is written as Cim or CIM?
There was a problem hiding this comment.
I think we will have to modify some existing code for this too. I would prefer to do this in a separate PR to avoid making these commits larger. Is that okay?
kevpar
reviewed
Sep 16, 2024
kevpar
reviewed
Sep 24, 2024
| //sys CimMountImage(imagePath string, fsName string, flags uint32, volumeID *g) (hr error) = cimfs.CimMountImage? | ||
| //sys CimDismountImage(volumeID *g) (hr error) = cimfs.CimDismountImage? | ||
|
|
||
| //sys CimCreateImage(imagePath string, oldFSName *uint16, newFSName *uint16, cimFSHandle *FsHandle) (hr error) = cimfs.CimCreateImage? | ||
| //sys CimCloseImage(cimFSHandle FsHandle) = cimfs.CimCloseImage? | ||
| //sys CimCreateImage2(imagePath string, flags uint32, oldFSName *uint16, newFSName *uint16, cimFSHandle *FsHandle) (hr error) = cimfs.CimCreateImage2? | ||
| //sys CimCloseImage(cimFSHandle FsHandle) = cimfs.CimCloseImage |
There was a problem hiding this comment.
Yes. The CimCloseImage API doesn't return anything. However, if you keep the ? for an API that returns void, the mkwinsyscall still generates the function definition with a return value. Ideally, we should fix this bug in mkwinsyscall but I unblocked the CimFS work by removing that ?.
kevpar
reviewed
Sep 24, 2024
kevpar
reviewed
Sep 24, 2024
kevpar
reviewed
Sep 24, 2024
kevpar
reviewed
Sep 24, 2024
| return winapi.CimDeletePath(c.handle, path) | ||
| } | ||
|
|
||
| // Adds a tombstone at given path. This ensures that when the the CIMs are merged, the |
There was a problem hiding this comment.
There should be a description of what merging CIMs means somewhere. I may have missed it if it's already present though :)
There was a problem hiding this comment.
I have added a package documentation here , let me know if you want me to add any more details in there.
kevpar
reviewed
Sep 24, 2024
kevpar
reviewed
Sep 24, 2024
kevpar
reviewed
Sep 24, 2024
kevpar
reviewed
Sep 24, 2024
kevpar
reviewed
Sep 24, 2024
kevpar
reviewed
Sep 24, 2024
CimFS now supports a new format for storing CIMs, named BlockCIM. A block CIM format can store the entire CIM on a block device (like a VHD) or a file formatted like a block device. This commit adds Go wrappers for the new CimFS APIs that allow creation, merging and mounting of such Block CIMs. Some new flags required when creating and mounting these CIMs are added and some deprecated flags have been removed. New type has been introduced to represent a block CIM. Unit tests have been added to test the newly added CimFS functionality. Lastly, CimFS flags aren't a part of the hcs schema (only the CimMount request is), those flags are moved from the hcs/schema2 package to the cimfs package. Signed-off-by: Amit Barve <ambarve@microsoft.com>
This commit adds a layer writer that can be used for extracting an image layer tar into a Block CIM format. Existing forked CIM layer writer was renamed to a common base type `cimLayerWriter`. Forked CIM layer writer & Block CIM layer writer both now extend this common base type to write layers in that specific format. Signed-off-by: Amit Barve <ambarve@microsoft.com>
This commit adds the ability to parse block CIM layer mounts and to mount the merged block CIMs to be used as a rootfs for a container. Signed-off-by: Amit Barve <ambarve@microsoft.com>
ambarve
force-pushed
the
blocked_cim_import
branch
from
2afb976
to
cda4bee
Compare
# for free
to join this conversation on GitHub.
Already have an account?
# 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 PR adds support for creating, mounting and using block CIMs for running windows process isolated containers.
Individual commits provide additional details on what changes they bring in.