Merge pull request #5638 from baude/v2containercheck

podmanv2 checkpoint and restore

4 files changed, 214 insertions, 1 deletions

diff --git a/pkg/domain/entities/containers.go b/pkg/domain/entities/containers.go
index d51124f55..45dea98bf 100644
--- a/pkg/domain/entities/containers.go
+++ b/pkg/domain/entities/containers.go
@@ -121,3 +121,35 @@ type CommitReport struct {
 type ContainerExportOptions struct {
 	Output string
 }
+
+type CheckpointOptions struct {
+	All            bool
+	Export         string
+	IgnoreRootFS   bool
+	Keep           bool
+	Latest         bool
+	LeaveRuninng   bool
+	TCPEstablished bool
+}
+
+type CheckpointReport struct {
+	Err error
+	Id  string
+}
+
+type RestoreOptions struct {
+	All             bool
+	IgnoreRootFS    bool
+	IgnoreStaticIP  bool
+	IgnoreStaticMAC bool
+	Import          string
+	Keep            bool
+	Latest          bool
+	Name            string
+	TCPEstablished  bool
+}
+
+type RestoreReport struct {
+	Err error
+	Id  string
+}
diff --git a/pkg/domain/entities/engine_container.go b/pkg/domain/entities/engine_container.go
index a122857cd..3aaa7136f 100644
--- a/pkg/domain/entities/engine_container.go
+++ b/pkg/domain/entities/engine_container.go
@@ -8,6 +8,8 @@ import (
 
 type ContainerEngine interface {
 	ContainerCommit(ctx context.Context, nameOrId string, options CommitOptions) (*CommitReport, error)
+	ContainerCheckpoint(ctx context.Context, namesOrIds []string, options CheckpointOptions) ([]*CheckpointReport, error)
+	ContainerRestore(ctx context.Context, namesOrIds []string, options RestoreOptions) ([]*RestoreReport, error)
 	ContainerExists(ctx context.Context, nameOrId string) (*BoolReport, error)
 	ContainerInspect(ctx context.Context, namesOrIds []string, options InspectOptions) ([]*ContainerInspectReport, error)
 	ContainerExport(ctx context.Context, nameOrId string, options ContainerExportOptions) error
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go
index d4c5ac311..3c38b2093 100644
--- a/pkg/domain/infra/abi/containers.go
+++ b/pkg/domain/infra/abi/containers.go
@@ -13,12 +13,42 @@ import (
 	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/libpod/image"
 	"github.com/containers/libpod/pkg/adapter/shortcuts"
+	"github.com/containers/libpod/pkg/checkpoint"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/containers/libpod/pkg/signal"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
 
+// getContainersByContext gets pods whether all, latest, or a slice of names/ids
+// is specified.
+func getContainersByContext(all, latest bool, names []string, runtime *libpod.Runtime) (ctrs []*libpod.Container, err error) {
+	var ctr *libpod.Container
+	ctrs = []*libpod.Container{}
+
+	switch {
+	case all:
+		ctrs, err = runtime.GetAllContainers()
+	case latest:
+		ctr, err = runtime.GetLatestContainer()
+		ctrs = append(ctrs, ctr)
+	default:
+		for _, n := range names {
+			ctr, e := runtime.LookupContainer(n)
+			if e != nil {
+				// Log all errors here, so callers don't need to.
+				logrus.Debugf("Error looking up container %q: %v", n, e)
+				if err == nil {
+					err = e
+				}
+			} else {
+				ctrs = append(ctrs, ctr)
+			}
+		}
+	}
+	return
+}
+
 // TODO: Should return *entities.ContainerExistsReport, error
 func (ic *ContainerEngine) ContainerExists(ctx context.Context, nameOrId string) (*entities.BoolReport, error) {
 	_, err := ic.Libpod.LookupContainer(nameOrId)
@@ -333,3 +363,82 @@ func (ic *ContainerEngine) ContainerExport(ctx context.Context, nameOrId string,
 	}
 	return ctr.Export(options.Output)
 }
+
+func (ic *ContainerEngine) ContainerCheckpoint(ctx context.Context, namesOrIds []string, options entities.CheckpointOptions) ([]*entities.CheckpointReport, error) {
+	var (
+		err     error
+		cons    []*libpod.Container
+		reports []*entities.CheckpointReport
+	)
+	checkOpts := libpod.ContainerCheckpointOptions{
+		Keep:           options.Keep,
+		TCPEstablished: options.TCPEstablished,
+		TargetFile:     options.Export,
+		IgnoreRootfs:   options.IgnoreRootFS,
+	}
+
+	if options.All {
+		running := func(c *libpod.Container) bool {
+			state, _ := c.State()
+			return state == define.ContainerStateRunning
+		}
+		cons, err = ic.Libpod.GetContainers(running)
+	} else {
+		cons, err = getContainersByContext(false, options.Latest, namesOrIds, ic.Libpod)
+	}
+	if err != nil {
+		return nil, err
+	}
+	for _, con := range cons {
+		err = con.Checkpoint(ctx, checkOpts)
+		reports = append(reports, &entities.CheckpointReport{
+			Err: err,
+			Id:  con.ID(),
+		})
+	}
+	return reports, nil
+}
+
+func (ic *ContainerEngine) ContainerRestore(ctx context.Context, namesOrIds []string, options entities.RestoreOptions) ([]*entities.RestoreReport, error) {
+	var (
+		cons        []*libpod.Container
+		err         error
+		filterFuncs []libpod.ContainerFilter
+		reports     []*entities.RestoreReport
+	)
+
+	restoreOptions := libpod.ContainerCheckpointOptions{
+		Keep:            options.Keep,
+		TCPEstablished:  options.TCPEstablished,
+		TargetFile:      options.Import,
+		Name:            options.Name,
+		IgnoreRootfs:    options.IgnoreRootFS,
+		IgnoreStaticIP:  options.IgnoreStaticIP,
+		IgnoreStaticMAC: options.IgnoreStaticMAC,
+	}
+
+	filterFuncs = append(filterFuncs, func(c *libpod.Container) bool {
+		state, _ := c.State()
+		return state == define.ContainerStateExited
+	})
+
+	switch {
+	case options.Import != "":
+		cons, err = checkpoint.CRImportCheckpoint(ctx, ic.Libpod, options.Import, options.Name)
+	case options.All:
+		cons, err = ic.Libpod.GetContainers(filterFuncs...)
+	default:
+		cons, err = getContainersByContext(false, options.Latest, namesOrIds, ic.Libpod)
+	}
+	if err != nil {
+		return nil, err
+	}
+	for _, con := range cons {
+		err := con.Restore(ctx, restoreOptions)
+		reports = append(reports, &entities.RestoreReport{
+			Err: err,
+			Id:  con.ID(),
+		})
+	}
+	return reports, nil
+}
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
index 8885ae7c7..5832d41be 100644
--- a/pkg/domain/infra/tunnel/containers.go
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -6,7 +6,8 @@ import (
 	"os"
 
 	"github.com/containers/image/v5/docker/reference"
-
+	"github.com/containers/libpod/libpod/define"
+	"github.com/containers/libpod/pkg/api/handlers/libpod"
 	"github.com/containers/libpod/pkg/bindings/containers"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/pkg/errors"
@@ -226,3 +227,72 @@ func (ic *ContainerEngine) ContainerExport(ctx context.Context, nameOrId string,
 	}
 	return containers.Export(ic.ClientCxt, nameOrId, w)
 }
+
+func (ic *ContainerEngine) ContainerCheckpoint(ctx context.Context, namesOrIds []string, options entities.CheckpointOptions) ([]*entities.CheckpointReport, error) {
+	var (
+		reports []*entities.CheckpointReport
+		err     error
+		ctrs    []libpod.ListContainer
+	)
+
+	if options.All {
+		allCtrs, err := getContainersByContext(ic.ClientCxt, true, []string{})
+		if err != nil {
+			return nil, err
+		}
+		// narrow the list to running only
+		for _, c := range allCtrs {
+			if c.State == define.ContainerStateRunning.String() {
+				ctrs = append(ctrs, c)
+			}
+		}
+
+	} else {
+		ctrs, err = getContainersByContext(ic.ClientCxt, false, namesOrIds)
+		if err != nil {
+			return nil, err
+		}
+	}
+	for _, c := range ctrs {
+		report, err := containers.Checkpoint(ic.ClientCxt, c.ID, &options.Keep, &options.LeaveRuninng, &options.TCPEstablished, &options.IgnoreRootFS, &options.Export)
+		if err != nil {
+			reports = append(reports, &entities.CheckpointReport{Id: c.ID, Err: err})
+		}
+		reports = append(reports, report)
+	}
+	return reports, nil
+}
+
+func (ic *ContainerEngine) ContainerRestore(ctx context.Context, namesOrIds []string, options entities.RestoreOptions) ([]*entities.RestoreReport, error) {
+	var (
+		reports []*entities.RestoreReport
+		err     error
+		ctrs    []libpod.ListContainer
+	)
+	if options.All {
+		allCtrs, err := getContainersByContext(ic.ClientCxt, true, []string{})
+		if err != nil {
+			return nil, err
+		}
+		// narrow the list to exited only
+		for _, c := range allCtrs {
+			if c.State == define.ContainerStateExited.String() {
+				ctrs = append(ctrs, c)
+			}
+		}
+
+	} else {
+		ctrs, err = getContainersByContext(ic.ClientCxt, false, namesOrIds)
+		if err != nil {
+			return nil, err
+		}
+	}
+	for _, c := range ctrs {
+		report, err := containers.Restore(ic.ClientCxt, c.ID, &options.Keep, &options.TCPEstablished, &options.IgnoreRootFS, &options.IgnoreStaticIP, &options.IgnoreStaticMAC, &options.Name, &options.Import)
+		if err != nil {
+			reports = append(reports, &entities.RestoreReport{Id: c.ID, Err: err})
+		}
+		reports = append(reports, report)
+	}
+	return reports, nil
+}