containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Options as exportCheckpoint() argument 

Instead of individual values from ContainerCheckpointOptions,
provide the options object.

This is a preparation for the next patch where one more value
of the options object is required in exportCheckpoint().

Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
This commit is contained in:
Radostin Stoyanov 2020-12-18 19:31:16 +00:00
parent 355e387692
commit 17f50fb4bf
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libpod/container_internal_linux.go
View File

@ -790,11 +790,11 @@ func (c *Container) addNamespaceContainer(g *generate.Generator, ns LinuxNS, ctr
return nil return nil
} }
func (c *Container) exportCheckpoint(dest string, ignoreRootfs bool) error { func (c *Container) exportCheckpoint(options ContainerCheckpointOptions) error {
if (len(c.config.NamedVolumes) > 0) || (len(c.Dependencies()) > 0) { if (len(c.config.NamedVolumes) > 0) || (len(c.Dependencies()) > 0) {
return errors.Errorf("Cannot export checkpoints of containers with named volumes or dependencies") return errors.Errorf("Cannot export checkpoints of containers with named volumes or dependencies")
} }
logrus.Debugf("Exporting checkpoint image of container %q to %q", c.ID(), dest) logrus.Debugf("Exporting checkpoint image of container %q to %q", c.ID(), options.TargetFile)
includeFiles := []string{ includeFiles := []string{
"checkpoint", "checkpoint",
@ -807,7 +807,7 @@ func (c *Container) exportCheckpoint(dest string, ignoreRootfs bool) error {
// Get root file-system changes included in the checkpoint archive // Get root file-system changes included in the checkpoint archive
rootfsDiffPath := filepath.Join(c.bundlePath(), "rootfs-diff.tar") rootfsDiffPath := filepath.Join(c.bundlePath(), "rootfs-diff.tar")
deleteFilesList := filepath.Join(c.bundlePath(), "deleted.files") deleteFilesList := filepath.Join(c.bundlePath(), "deleted.files")
if !ignoreRootfs { if !options.IgnoreRootfs {
// To correctly track deleted files, let's go through the output of 'podman diff' // To correctly track deleted files, let's go through the output of 'podman diff'
tarFiles, err := c.runtime.GetDiff("", c.ID()) tarFiles, err := c.runtime.GetDiff("", c.ID())
if err != nil { if err != nil {
@ -880,13 +880,13 @@ func (c *Container) exportCheckpoint(dest string, ignoreRootfs bool) error {
return errors.Wrapf(err, "error reading checkpoint directory %q", c.ID()) return errors.Wrapf(err, "error reading checkpoint directory %q", c.ID())
} }
outFile, err := os.Create(dest) outFile, err := os.Create(options.TargetFile)
if err != nil { if err != nil {
return errors.Wrapf(err, "error creating checkpoint export file %q", dest) return errors.Wrapf(err, "error creating checkpoint export file %q", options.TargetFile)
} }
defer outFile.Close() defer outFile.Close()
if err := os.Chmod(dest, 0600); err != nil { if err := os.Chmod(options.TargetFile, 0600); err != nil {
return err return err
} }
@ -963,7 +963,7 @@ func (c *Container) checkpoint(ctx context.Context, options ContainerCheckpointO
defer c.newContainerEvent(events.Checkpoint) defer c.newContainerEvent(events.Checkpoint)
if options.TargetFile != "" { if options.TargetFile != "" {
if err = c.exportCheckpoint(options.TargetFile, options.IgnoreRootfs); err != nil { if err = c.exportCheckpoint(options); err != nil {
return err return err
} }
} }