Skip to content

[pull] main from containerd:main #430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Jul 25, 2026
Merged

[pull] main from containerd:main #430

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c6b71c
core/runtime/v2: Drop checkpointctl module dependency
vvoland Jul 24, 2026
8496e9a
Merge pull request #13839 from vvoland/core-checkpointctl
mxpv Jul 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions core/runtime/v2/shim.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import (
"google.golang.org/grpc/connectivity"
"google.golang.org/grpc/credentials/insecure"

crmetadata "github.com/checkpoint-restore/checkpointctl/lib"
eventstypes "github.com/containerd/containerd/api/events"
bootapi "github.com/containerd/containerd/api/runtime/bootstrap/v1"
task "github.com/containerd/containerd/api/runtime/task/v3"
Expand Down Expand Up @@ -64,6 +63,11 @@ const (
loadTimeout = "io.containerd.timeout.shim.load"
cleanupTimeout = "io.containerd.timeout.shim.cleanup"
shutdownTimeout = "io.containerd.timeout.shim.shutdown"

// rootFsDiffTar is the name of the rootfs diff archive written next to a
// checkpoint. It is part of the checkpoint layout produced by CRIU tooling,
// so it must stay in sync with github.com/checkpoint-restore/checkpointctl/lib.RootFsDiffTar.
rootFsDiffTar = "rootfs-diff.tar"
)

func init() {
Expand Down Expand Up @@ -642,7 +646,7 @@ func (s *shimTask) Create(ctx context.Context, opts runtime.CreateOpts) (runtime
if opts.RestoreFromPath {
// Unpack rootfs-diff.tar if it exists.
// This needs to happen between the 'Create()' from above and before the 'Start()' from below.
rootfsDiff := filepath.Join(opts.Checkpoint, "..", crmetadata.RootFsDiffTar)
rootfsDiff := filepath.Join(opts.Checkpoint, "..", rootFsDiffTar)

_, err = os.Stat(rootfsDiff)
if err == nil {
Expand Down
Loading