dilim/containerd
1
0
Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-06-30 19:58:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

cri: fix checkpoint failed with short id

Browse Source 
Signed-off-by: ningmingxiao <ning.mingxiao@zte.com.cn>
This commit is contained in:
ningmingxiao
2026-01-08 20:27:59 +08:00
committed by Mike Brown
parent 9d247a7993
commit 0dc9582295
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/cri/server/container_checkpoint_linux.go
View File

@@ -488,7 +488,7 @@ func (c *criService) CheckpointContainer(ctx context.Context, r *runtime.Checkpo
if state != runtime.ContainerState_CONTAINER_RUNNING {
return nil, fmt.Errorf(
"container %q is in %s state. only %s containers can be checkpointed",
r.GetContainerId(),
container.ID,
criContainerStateToString(state),
criContainerStateToString(runtime.ContainerState_CONTAINER_RUNNING),
)
@@ -515,11 +515,11 @@ func (c *criService) CheckpointContainer(ctx context.Context, r *runtime.Checkpo
task, err := container.Container.Task(ctx, nil)
if err != nil {
return nil, fmt.Errorf("failed to get task for container %q: %w", r.GetContainerId(), err)
return nil, fmt.Errorf("failed to get task for container %q: %w", container.ID, err)
}
img, err := task.Checkpoint(ctx, []client.CheckpointTaskOpts{withCheckpointOpts(i.Runtime.Name, c.getContainerRootDir(r.GetContainerId()))}...)
img, err := task.Checkpoint(ctx, []client.CheckpointTaskOpts{withCheckpointOpts(i.Runtime.Name, c.getContainerRootDir(container.ID))}...)
if err != nil {
return nil, fmt.Errorf("checkpointing container %q failed: %w", r.GetContainerId(), err)
return nil, fmt.Errorf("checkpointing container %q failed: %w", container.ID, err)
}
// the checkpoint image has been provided as an index with manifests representing the tar of criu data, the rw layer, and the config
@@ -542,7 +542,7 @@ func (c *criService) CheckpointContainer(ctx context.Context, r *runtime.Checkpo
return nil, fmt.Errorf("failed to unmarshall blob into checkpoint data OCI index: %w", err)
}
cpPath := filepath.Join(c.getContainerRootDir(r.GetContainerId()), "ctrd-checkpoint")
cpPath := filepath.Join(c.getContainerRootDir(container.ID), "ctrd-checkpoint")
if err := os.MkdirAll(cpPath, 0o700); err != nil {
return nil, err
}
@@ -551,7 +551,7 @@ func (c *criService) CheckpointContainer(ctx context.Context, r *runtime.Checkpo
// This internal containerd file is used by checkpointctl for
// checkpoint archive analysis.
if err := c.os.CopyFile(
filepath.Join(c.getContainerRootDir(r.GetContainerId()), crmetadata.StatusFile),
filepath.Join(c.getContainerRootDir(container.ID), crmetadata.StatusFile),
filepath.Join(cpPath, crmetadata.StatusFile),
0o600,
); err != nil {
@@ -561,7 +561,7 @@ func (c *criService) CheckpointContainer(ctx context.Context, r *runtime.Checkpo
// This file is created by CRIU and includes timing analysis.
// Also used by checkpointctl
if err := c.os.CopyFile(
filepath.Join(c.getContainerRootDir(r.GetContainerId()), stats.StatsDump),
filepath.Join(c.getContainerRootDir(container.ID), stats.StatsDump),
filepath.Join(cpPath, stats.StatsDump),
0o600,
); err != nil {
@@ -571,7 +571,7 @@ func (c *criService) CheckpointContainer(ctx context.Context, r *runtime.Checkpo
// The log file created by CRIU. This file could be missing.
// Let's ignore errors if the file is missing.
if err := c.os.CopyFile(
filepath.Join(c.getContainerRootDir(r.GetContainerId()), crmetadata.DumpLogFile),
filepath.Join(c.getContainerRootDir(container.ID), crmetadata.DumpLogFile),
filepath.Join(cpPath, crmetadata.DumpLogFile),
0o600,
); err != nil {
@@ -645,7 +645,7 @@ func (c *criService) CheckpointContainer(ctx context.Context, r *runtime.Checkpo
containerCheckpointTimer.WithValues(i.Runtime.Name).UpdateSince(start)
log.G(ctx).Infof("Wrote checkpoint archive to %s for %s", outFile.Name(), r.GetContainerId())
log.G(ctx).Infof("Wrote checkpoint archive to %s for %s", outFile.Name(), container.ID)
return &runtime.CheckpointContainerResponse{}, nil
}