opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-26 04:46:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

cmd/podman: add support for checkpoint images

Browse Source 
This patch extends the podman run command with support for checkpoint
images. When `podman run` is invoked with an image that contains
a checkpoint, it would restore the container from that checkpoint.

Example:
    podman run -d --name looper busybox /bin/sh -c \
	    'i=0; while true; do echo $i; i=$(expr $i + 1); sleep 1; done'

    podman container checkpoint --create-image checkpoint-image-1 looper

    podman run checkpoint-image-1

Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
This commit is contained in:
Radostin Stoyanov
2022-08-27 15:38:34 +02:00
parent b17d8ff46d
commit 9c3d8bb494
2 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/podman/containers/restore.go
View File

@ -93,7 +93,7 @@ func init() {
func restore(cmd *cobra.Command, args []string) error { func restore(cmd *cobra.Command, args []string) error {
var ( var (
e error err error
errs utils.OutputErrors errs utils.OutputErrors
) )
podmanStart := time.Now() podmanStart := time.Now()
@ -104,9 +104,9 @@ func restore(cmd *cobra.Command, args []string) error {
// Check if the container exists (#15055) // Check if the container exists (#15055)
exists := &entities.BoolReport{Value: false} exists := &entities.BoolReport{Value: false}
for _, ctr := range args { for _, ctr := range args {
exists, e = registry.ContainerEngine().ContainerExists(registry.GetContext(), ctr, entities.ContainerExistsOptions{}) exists, err = registry.ContainerEngine().ContainerExists(registry.GetContext(), ctr, entities.ContainerExistsOptions{})
if e != nil { if err != nil {
return e return err
} }
if exists.Value { if exists.Value {
break break
@ -115,9 +115,9 @@ func restore(cmd *cobra.Command, args []string) error {
if !exists.Value { if !exists.Value {
// Find out if this is an image // Find out if this is an image
restoreOptions.CheckpointImage, e = utils.IsCheckpointImage(context.Background(), args) restoreOptions.CheckpointImage, err = utils.IsCheckpointImage(context.Background(), args)
if e != nil { if err != nil {
return e return err
} }
} }

29
cmd/podman/containers/run.go
View File

@ -148,6 +148,35 @@ func run(cmd *cobra.Command, args []string) error {
imageName = name imageName = name
} }
// If this is a checkpoint image, invoke container restore.
// We do not return `err` when checkpointImage is false, because the value
// of `err` could be "image is not a checkpoint". In this case, the run
// command should continue as usual, preserving backwards compatibility.
checkpointImage, err := utils.IsCheckpointImage(registry.GetContext(), []string{imageName})
if checkpointImage {
if err != nil {
return err
}
var restoreOptions entities.RestoreOptions
responses, err := registry.ContainerEngine().ContainerRestore(registry.GetContext(), []string{imageName}, restoreOptions)
if err != nil {
return err
}
var errs utils.OutputErrors
for _, r := range responses {
switch {
case r.Err != nil:
errs = append(errs, r.Err)
case r.RawInput != "":
fmt.Println(r.RawInput)
default:
fmt.Println(r.Id)
}
}
return errs.PrintErrors()
}
if cliVals.Replace { if cliVals.Replace {
if err := replaceContainer(cliVals.Name); err != nil { if err := replaceContainer(cliVals.Name); err != nil {
return err return err