add support syncfs

Signed-off-by: ningmingxiao <[email protected]>

Author: ningmingxiao

cmd/nerdctl/image/image_load.go

@@ -45,6 +45,7 @@ func NewLoadCommand() *cobra.Command {
 	loadCommand.Flags().StringSlice("platform", []string{}, "Import content for a specific platform")
 	loadCommand.RegisterFlagCompletionFunc("platform", completion.Platforms)
 	loadCommand.Flags().Bool("all-platforms", false, "Import content for all platforms")
+	loadCommand.Flags().BoolP("sync-fs", "s", true, "Synchronize the underlying filesystem containing files when unpack images")
 	// #endregion
 
 	return loadCommand
@@ -71,6 +72,10 @@ func processLoadCommandFlags(cmd *cobra.Command) (types.ImageLoadOptions, error)
 	if err != nil {
 		return types.ImageLoadOptions{}, err
 	}
+	syncfs, err := cmd.Flags().GetBool("sync-fs")
+	if err != nil {
+		return types.ImageLoadOptions{}, err
+	}
 	return types.ImageLoadOptions{
 		GOptions:     globalOptions,
 		Input:        input,
@@ -79,6 +84,7 @@ func processLoadCommandFlags(cmd *cobra.Command) (types.ImageLoadOptions, error)
 		Stdout:       cmd.OutOrStdout(),
 		Stdin:        cmd.InOrStdin(),
 		Quiet:        quiet,
+		SyncFs:       syncfs,
 	}, nil
 }
 

cmd/nerdctl/image/image_pull.go

@@ -66,6 +66,7 @@ func NewPullCommand() *cobra.Command {
 	// #endregion
 
 	pullCommand.Flags().BoolP("quiet", "q", false, "Suppress verbose output")
+	pullCommand.Flags().BoolP("sync-fs", "s", true, "Synchronize the underlying filesystem containing files when unpack images")
 
 	pullCommand.Flags().String("ipfs-address", "", "multiaddr of IPFS API (default uses $IPFS_PATH env variable if defined or local directory ~/.ipfs)")
 
@@ -114,6 +115,11 @@ func processPullCommandFlags(cmd *cobra.Command) (types.ImagePullOptions, error)
 		return types.ImagePullOptions{}, err
 	}
 
+	syncFs, err := cmd.Flags().GetBool("sync-fs")
+	if err != nil {
+		return types.ImagePullOptions{}, err
+	}
+
 	verifyOptions, err := helpers.ProcessImageVerifyOptions(cmd)
 	if err != nil {
 		return types.ImagePullOptions{}, err
@@ -123,6 +129,7 @@ func processPullCommandFlags(cmd *cobra.Command) (types.ImagePullOptions, error)
 		VerifyOptions:   verifyOptions,
 		OCISpecPlatform: ociSpecPlatform,
 		Unpack:          unpack,
+		SyncFs:          syncFs,
 		Mode:            "always",
 		Quiet:           quiet,
 		IPFSAddress:     ipfsAddressStr,

pkg/api/types/image_types.go

@@ -200,6 +200,7 @@ type ImagePullOptions struct {
 	// If nil, it will unpack automatically if only 1 platform is specified.
 	Unpack *bool
 	// Content for specific platforms. Empty if `--all-platforms` is true
+	SyncFs          bool
 	OCISpecPlatform []v1.Platform
 	// Pull mode
 	Mode string

pkg/api/types/load_types.go

@@ -30,5 +30,6 @@ type ImageLoadOptions struct {
 	// AllPlatforms import content for all platforms
 	AllPlatforms bool
 	// Quiet suppresses the load output.
-	Quiet bool
+	Quiet  bool
+	SyncFs bool
 }

pkg/imgutil/imgutil.go

@@ -29,6 +29,7 @@ import (
 
 	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/core/content"
+	"github.com/containerd/containerd/v2/core/diff"
 	"github.com/containerd/containerd/v2/core/images"
 	"github.com/containerd/containerd/v2/core/remotes"
 	"github.com/containerd/containerd/v2/core/snapshots"
@@ -59,7 +60,7 @@ type EnsuredImage struct {
 type PullMode = string
 
 // GetExistingImage returns the specified image if exists in containerd. Return errdefs.NotFound() if not exists.
-func GetExistingImage(ctx context.Context, client *containerd.Client, snapshotter, rawRef string, platform ocispec.Platform) (*EnsuredImage, error) {
+func GetExistingImage(ctx context.Context, client *containerd.Client, snapshotter string, syncfs bool, rawRef string, platform ocispec.Platform) (*EnsuredImage, error) {
 	var res *EnsuredImage
 	imgwalker := &imagewalker.ImageWalker{
 		Client: client,
@@ -82,7 +83,7 @@ func GetExistingImage(ctx context.Context, client *containerd.Client, snapshotte
 				Remote:      getSnapshotterOpts(snapshotter).isRemote(),
 			}
 			if unpacked, err := image.IsUnpacked(ctx, snapshotter); err == nil && !unpacked {
-				if err := image.Unpack(ctx, snapshotter); err != nil {
+				if err := image.Unpack(ctx, snapshotter, containerd.WithUnpackApplyOpts(diff.WithSyncFs(syncfs))); err != nil {
 					return err
 				}
 			}
@@ -115,7 +116,7 @@ func EnsureImage(ctx context.Context, client *containerd.Client, rawRef string,
 
 	// if not `always` pull and given one platform and image found locally, return existing image directly.
 	if options.Mode != "always" && len(options.OCISpecPlatform) == 1 {
-		if res, err := GetExistingImage(ctx, client, options.GOptions.Snapshotter, rawRef, options.OCISpecPlatform[0]); err == nil {
+		if res, err := GetExistingImage(ctx, client, options.GOptions.Snapshotter, options.SyncFs, rawRef, options.OCISpecPlatform[0]); err == nil {
 			return res, nil
 		} else if !errdefs.IsNotFound(err) {
 			return nil, err
@@ -204,6 +205,7 @@ func PullImage(ctx context.Context, client *containerd.Client, resolver remotes.
 		Resolver:   resolver,
 		RemoteOpts: []containerd.RemoteOpt{},
 		Platforms:  options.OCISpecPlatform, // empty for all-platforms
+		SyncFs:     options.SyncFs,
 	}
 	if !options.Quiet {
 		config.ProgressOutput = options.Stderr

pkg/imgutil/load/load.go

@@ -25,6 +25,7 @@ import (
 	"strings"
 
 	containerd "github.com/containerd/containerd/v2/client"
+	"github.com/containerd/containerd/v2/core/diff"
 	"github.com/containerd/containerd/v2/core/images"
 	"github.com/containerd/containerd/v2/core/images/archive"
 	"github.com/containerd/containerd/v2/pkg/archive/compression"
@@ -137,8 +138,7 @@ func unpackImage(ctx context.Context, client *containerd.Client, model images.Im
 	if !options.Quiet {
 		fmt.Fprintf(options.Stdout, "unpacking %s (%s)...\n", model.Name, model.Target.Digest)
 	}
-
-	err := image.Unpack(ctx, options.GOptions.Snapshotter)
+	err := image.Unpack(ctx, options.GOptions.Snapshotter, containerd.WithUnpackApplyOpts(diff.WithSyncFs(options.SyncFs)))
 	if err != nil {
 		return err
 	}

pkg/imgutil/pull/pull.go

@@ -46,6 +46,7 @@ type Config struct {
 	// RemoteOpts related to unpacking can be set only when len(Platforms) is 1.
 	RemoteOpts []containerd.RemoteOpt
 	Platforms  []ocispec.Platform // empty for all-platforms
+	SyncFs     bool
 }
 
 // Pull loads all resources into the content store and returns the image

pkg/ipfs/image.go

@@ -58,7 +58,7 @@ func EnsureImage(ctx context.Context, client *containerd.Client, scheme, ref, ip
 
 	// if not `always` pull and given one platform and image found locally, return existing image directly.
 	if options.Mode != "always" && len(options.OCISpecPlatform) == 1 {
-		if res, err := imgutil.GetExistingImage(ctx, client, options.GOptions.Snapshotter, ref, options.OCISpecPlatform[0]); err == nil {
+		if res, err := imgutil.GetExistingImage(ctx, client, options.GOptions.Snapshotter, options.SyncFs, ref, options.OCISpecPlatform[0]); err == nil {
 			return res, nil
 		} else if !errdefs.IsNotFound(err) {
 			return nil, err