fix custom snapshotter for sandbox/container run

Related with containerd#6899 The patch fixs the handle of sandbox run and container create. Signed-off-by: Yan Song <[email protected]>
nydusaccelerator · Aug 14, 2023 · 0959cdb · 0959cdb
1 parent 1fbd703
commit 0959cdb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/pkg/cri/server/container_create.go b/pkg/cri/server/container_create.go
@@ -188,9 +188,14 @@ func (c *criService) CreateContainer(ctx context.Context, r *runtime.CreateConta
 		return nil, err
 	}
 
+	snapshotter, err := c.snapshotterFromPodSandboxConfig(ctx, image.ID, sandboxConfig)
+	if err != nil {
+		return nil, err
+	}
+
 	// Set snapshotter before any other options.
 	opts := []containerd.NewContainerOpts{
-		containerd.WithSnapshotter(c.runtimeSnapshotter(ctx, ociRuntime)),
+		containerd.WithSnapshotter(snapshotter),
 		// Prepare container rootfs. This is always writeable even if
 		// the container wants a readonly rootfs since we want to give
 		// the runtime (runc) a chance to modify (e.g. to create mount

diff --git a/pkg/cri/server/sandbox_run.go b/pkg/cri/server/sandbox_run.go
@@ -165,8 +165,13 @@ func (c *criService) RunPodSandbox(ctx context.Context, r *runtime.RunPodSandbox
 	}
 	sOpts = append(sOpts, extraSOpts...)
 
+	snapshotter, err := c.snapshotterFromPodSandboxConfig(ctx, image.ID, config)
+	if err != nil {
+		return nil, err
+	}
+
 	opts := []containerd.NewContainerOpts{
-		containerd.WithSnapshotter(c.runtimeSnapshotter(ctx, ociRuntime)),
+		containerd.WithSnapshotter(snapshotter),
 		customopts.WithNewSnapshot(id, containerdImage, sOpts...),
 		containerd.WithSpec(spec, specOpts...),
 		containerd.WithContainerLabels(sandboxLabels),