Skip to content

Commit

Permalink
snapshot: support to handle kata volume for layer block
Browse files Browse the repository at this point in the history 
Support to handle kata volume for layer block and reconstruct functions
about handling kata virtual volumes.

Signed-off-by: ChengyuZhu6 <[email protected]>
  • Loading branch information
@ChengyuZhu6
ChengyuZhu6 committed Dec 7, 2023
1 parent 7ead21f commit 671c414
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 47 deletions.
91 changes: 49 additions & 42 deletions snapshot/mount_option.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@ import (

"github.com/containerd/containerd/log"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/snapshots"
"github.com/containerd/containerd/snapshots/storage"
"github.com/containerd/nydus-snapshotter/config/daemonconfig"
"github.com/containerd/nydus-snapshotter/pkg/label"
"github.com/containerd/nydus-snapshotter/pkg/layout"
"github.com/containerd/nydus-snapshotter/pkg/rafs"
"github.com/containerd/nydus-snapshotter/pkg/snapshot"
"github.com/pkg/errors"
)

Expand Down Expand Up @@ -101,7 +103,7 @@ func (o *snapshotter) remoteMountWithExtraOptions(ctx context.Context, s storage
}, nil
}

func (o *snapshotter) mountWithKataVolume(ctx context.Context, id string, overlayOptions []string) ([]mount.Mount, error) {
func (o *snapshotter) mountWithKataVolume(ctx context.Context, id string, overlayOptions []string, key string) ([]mount.Mount, error) {
hasVolume := false
rafs := rafs.RafsGlobalCache.Get(id)
if rafs == nil {
Expand All @@ -122,7 +124,7 @@ func (o *snapshotter) mountWithKataVolume(ctx context.Context, id string, overla

// Insert Kata volume for tarfs
if blobID, ok := rafs.Annotations[label.NydusTarfsLayer]; ok {
options, err := o.mountWithTarfsVolume(*rafs, blobID)
options, err := o.mountWithTarfsVolume(ctx, *rafs, blobID, key)
if err != nil {
return []mount.Mount{}, errors.Wrapf(err, "create kata volume for tarfs")
}
Expand Down Expand Up @@ -152,63 +154,68 @@ func (o *snapshotter) mountWithProxyVolume(rafs rafs.Rafs) ([]string, error) {
for k, v := range rafs.Annotations {
options = append(options, fmt.Sprintf("%s=%s", k, v))
}

volume := &KataVirtualVolume{
VolumeType: KataVirtualVolumeImageGuestPullType,
Source: "",
FSType: "",
Options: options,
ImagePull: &ImagePullVolume{Metadata: rafs.Annotations},
}
if !volume.Validate() {
return []string{}, errors.Errorf("got invalid kata volume, %v", volume)
}

info, err := EncodeKataVirtualVolumeToBase64(*volume)
opt, err := o.prepareKataVirtualVolume(label.NydusProxyMode, "", KataVirtualVolumeImageGuestPullType, "", options, rafs.Annotations)
if err != nil {
return []string{}, errors.Errorf("failed to encoding Kata Volume info %v", volume)
return options, errors.Wrapf(err, "failed to prepare KataVirtualVolume")
}
opt := fmt.Sprintf("%s=%s", KataVirtualVolumeOptionName, info)

return []string{opt}, nil
}

func (o *snapshotter) mountWithTarfsVolume(rafs rafs.Rafs, blobID string) ([]string, error) {
var volume *KataVirtualVolume

func (o *snapshotter) mountWithTarfsVolume(ctx context.Context, rafs rafs.Rafs, blobID, key string) ([]string, error) {
options := []string{}
if info, ok := rafs.Annotations[label.NydusImageBlockInfo]; ok {
path, err := o.fs.GetTarfsImageDiskFilePath(blobID)
if err != nil {
return []string{}, errors.Wrapf(err, "get tarfs image disk file path")
}
volume = &KataVirtualVolume{
VolumeType: KataVirtualVolumeImageRawBlockType,
Source: path,
FSType: "erofs",
Options: []string{"ro"},
log.L.Debugf("mountWithTarfsVolume info %v", info)
opt, err := o.prepareKataVirtualVolume(label.NydusImageBlockInfo, path, KataVirtualVolumeImageRawBlockType, "erofs", []string{"ro"}, rafs.Annotations)
if err != nil {
return options, errors.Wrapf(err, "failed to prepare KataVirtualVolume for image_raw_block")
}
if len(info) > 0 {
dmverity, err := parseTarfsDmVerityInfo(info)

options = append(options, opt)
log.L.Debugf("mountWithTarfsVolume type=%v, options %v", KataVirtualVolumeImageRawBlockType, options)
return options, nil
}

if _, ok := rafs.Annotations[label.NydusLayerBlockInfo]; ok {
for {
pID, pInfo, _, pErr := snapshot.GetSnapshotInfo(ctx, o.ms, key)
log.G(ctx).Debugf("mountWithKataVolume pID= %v, pInfo = %v", pID, pInfo)

if pErr != nil {
return options, errors.Wrapf(pErr, "failed to get snapshot info")
}
if pInfo.Kind == snapshots.KindActive {
key = pInfo.Parent
continue
}

blobID = pInfo.Labels[label.NydusTarfsLayer]
path, err := o.fs.GetTarfsLayerDiskFilePath(blobID)
if err != nil {
return []string{}, err
return options, errors.Wrapf(err, "get tarfs image disk file path")
}
volume.DmVerity = &dmverity
}
}

if volume != nil {
if !volume.Validate() {
return []string{}, errors.Errorf("got invalid kata volume, %v", volume)
}
info, err := EncodeKataVirtualVolumeToBase64(*volume)
if err != nil {
return []string{}, errors.Errorf("failed to encoding Kata Volume info %v", volume)
opt, err := o.prepareKataVirtualVolume(label.NydusLayerBlockInfo, path, KataVirtualVolumeLayerRawBlockType, "erofs", []string{"ro"}, pInfo.Labels)
if err != nil {
return options, errors.Wrapf(err, "failed to prepare KataVirtualVolume for layer_raw_block")
}

options = append(options, opt)

if pInfo.Parent == "" {
break
}
key = pInfo.Parent
}
opt := fmt.Sprintf("%s=%s", KataVirtualVolumeOptionName, info)
return []string{opt}, nil
log.L.Debugf("mountWithTarfsVolume type=%v, options %v", KataVirtualVolumeLayerRawBlockType, options)
return options, nil
}

return []string{}, nil
// If Neither image_raw_block or layer_raw_block, return empty strings
return options, nil
}

func (o *snapshotter) prepareKataVirtualVolume(blockType, source, volumeType, fsType string, options []string, labels map[string]string) (string, error) {
Expand Down
2 changes: 1 addition & 1 deletion snapshot/process.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func chooseProcessor(ctx context.Context, logger *logrus.Entry,
}

logger.Infof("Nydus remote snapshot %s is ready", id)
mounts, err := sn.mountRemote(ctx, labels, s, id)
mounts, err := sn.mountRemote(ctx, labels, s, id, key)
return false, mounts, err
}
}
Expand Down
8 changes: 4 additions & 4 deletions snapshot/snapshot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ func (o *snapshotter) Mounts(ctx context.Context, key string) ([]mount.Mount, er
}

if needRemoteMounts {
return o.mountRemote(ctx, info.Labels, *snap, metaSnapshotID)
return o.mountRemote(ctx, info.Labels, *snap, metaSnapshotID, key)
}

return o.mountNative(ctx, info.Labels, *snap)
Expand Down Expand Up @@ -531,7 +531,7 @@ func (o *snapshotter) View(ctx context.Context, key, parent string, opts ...snap
}

if needRemoteMounts {
return o.mountRemote(ctx, base.Labels, s, metaSnapshotID)
return o.mountRemote(ctx, base.Labels, s, metaSnapshotID, key)
}
return o.mountNative(ctx, base.Labels, s)
}
Expand Down Expand Up @@ -840,7 +840,7 @@ func overlayMount(options []string) []mount.Mount {

// `s` is the upmost snapshot and `id` refers to the nydus meta snapshot
// `s` and `id` can represent a different layer, it's useful when View an image
func (o *snapshotter) mountRemote(ctx context.Context, labels map[string]string, s storage.Snapshot, id string) ([]mount.Mount, error) {
func (o *snapshotter) mountRemote(ctx context.Context, labels map[string]string, s storage.Snapshot, id, key string) ([]mount.Mount, error) {
var overlayOptions []string
if _, ok := labels[label.OverlayfsVolatileOpt]; ok {
overlayOptions = append(overlayOptions, "volatile")
Expand Down Expand Up @@ -871,7 +871,7 @@ func (o *snapshotter) mountRemote(ctx context.Context, labels map[string]string,
log.G(ctx).Infof("remote mount options %v", overlayOptions)

if o.enableKataVolume {
return o.mountWithKataVolume(ctx, id, overlayOptions)
return o.mountWithKataVolume(ctx, id, overlayOptions, key)
}
// Add `extraoption` if NydusOverlayFS is enable or daemonMode is `None`
if o.enableNydusOverlayFS || config.GetDaemonMode() == config.DaemonModeNone {
Expand Down

0 comments on commit 671c414

Please sign in to comment.